diff options
| author |  Julien-Pierre Avérous <github@sourcemac.com>
| 2020-04-20 23:27:17 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-04-20 23:27:17 +0200 |
| commit | acca89505be6ec062ba1acd9cc7df49aac1711fe (patch) | |
| tree | 092daf0e3577aae7f7d80fb7a5267d55599b9dd8 /app/views/user | |
| parent | bd9a72726dbaf26854994e9726091477548a991f (diff) | |
Enhance the way help elements are displayed (#2911)
* - Always display help under the targeted element.
- Use same help place for HTTP authentication in 'add' feed view than in 'update' feed view.
- Move help under input field in register view, as all other places (homogeneity).
* - Don't use "!important" as suggested by @Alkarex.
Diffstat (limited to 'app/views/user')
| -rw-r--r-- | app/views/user/details.phtml | 2 | ||||
| -rw-r--r-- | app/views/user/manage.phtml | 2 | ||||
| -rw-r--r-- | app/views/user/profile.phtml | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/user/details.phtml b/app/views/user/details.phtml index e23e645ae..ee5e381fd 100644 --- a/app/views/user/details.phtml +++ b/app/views/user/details.phtml @@ -51,7 +51,7 @@ <input type="password" id="newPasswordPlain" name="newPasswordPlain" autocomplete="new-password" pattern=".{7,}" <?= cryptAvailable() ? '' : 'disabled="disabled" ' ?>/> <a class="btn toggle-password" data-toggle="password-<?= $this->username; ?>"><?= _i('key') ?></a> </div> - <?= _i('help'); ?> <?= _t('admin.user.password_format') ?> + <p class="help"><?= _i('help'); ?> <?= _t('admin.user.password_format') ?></p> </div> </div> diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml index 6ab31e6c6..627d229d2 100644 --- a/app/views/user/manage.phtml +++ b/app/views/user/manage.phtml @@ -53,7 +53,7 @@ <input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="new-password" pattern=".{7,}" /> <a class="btn toggle-password" data-toggle="new_user_passwordPlain"><?= _i('key') ?></a> </div> - <?= _i('help') ?> <?= _t('admin.user.password_format') ?> + <p class="help"><?= _i('help') ?> <?= _t('admin.user.password_format') ?></p> <noscript><b><?= _t('gen.js.should_be_activated') ?></b></noscript> </div> </div> diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml index 5357c2bfd..9e272b20a 100644 --- a/app/views/user/profile.phtml +++ b/app/views/user/profile.phtml @@ -43,7 +43,7 @@ <input type="password" id="newPasswordPlain" name="newPasswordPlain" autocomplete="new-password" pattern=".{7,}" <?= cryptAvailable() ? '' : 'disabled="disabled" ' ?>/> <a class="btn toggle-password" data-toggle="newPasswordPlain"><?= _i('key') ?></a> </div> - <?= _i('help') ?> <?= _t('conf.profile.password_format') ?> + <p class="help"><?= _i('help') ?> <?= _t('conf.profile.password_format') ?></p> <noscript><b><?= _t('gen.js.should_be_activated') ?></b></noscript> </div> </div> @@ -55,7 +55,7 @@ <div class="group-controls"> <input type="text" id="token" name="token" value="<?= $token ?>" placeholder="<?= _t('gen.short.blank_to_disable') ?>"<?php echo FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="<?= $token ?>"/> - <?= _i('help') ?> <?= _t('admin.auth.token_help') ?> + <p class="help"><?= _i('help') ?> <?= _t('admin.auth.token_help') ?></p> <kbd><?= Minz_Url::display(array('a' => 'rss', 'params' => array('user' => Minz_Session::param('currentUser'), 'token' => $token, 'hours' => FreshRSS_Context::$user_conf->since_hours_posts_per_rss)), 'html', true) ?></kbd> </div> </div> @@ -81,7 +81,7 @@ <input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="new-password" pattern=".{7,}" <?= cryptAvailable() ? '' : 'disabled="disabled" ' ?>/> <a class="btn toggle-password" data-toggle="apiPasswordPlain"><?= _i('key') ?></a> </div> - <?= _i('help') ?> <kbd><a href="../api/"><?= Minz_Url::display('/api/', 'html', true) ?></a></kbd> + <p class="help"><?= _i('help') ?> <kbd><a href="../api/"><?= Minz_Url::display('/api/', 'html', true) ?></a></kbd></p> </div> </div> |