diff options
Diffstat (limited to 'template/en/default')
6 files changed, 26 insertions, 23 deletions
diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl index f505268f5..41c2b09a9 100644 --- a/template/en/default/account/email/confirm-new.html.tmpl +++ b/template/en/default/account/email/confirm-new.html.tmpl @@ -26,13 +26,14 @@ javascript_urls = ['js/account.js'] onload = "document.forms['confirm_account_form'].realname.focus();" %] -[% password_complexity = Param('password_complexity') %] - <p> To create your account, you must enter a password in the form below. Your email address and Real Name (if provided) will be shown with changes you make. </p> +<p> + [% Param('passwdqc_desc') FILTER html_light %] +</p> <form id="confirm_account_form" method="post" action="token.cgi"> <input type="hidden" name="t" value="[% token FILTER html %]"> diff --git a/template/en/default/account/password/set-forgotten-password.html.tmpl b/template/en/default/account/password/set-forgotten-password.html.tmpl index 68119252e..b17bd510d 100644 --- a/template/en/default/account/password/set-forgotten-password.html.tmpl +++ b/template/en/default/account/password/set-forgotten-password.html.tmpl @@ -25,7 +25,10 @@ %] <p> - To change your password, enter a new password twice: + To change your password, enter a new password twice. +</p> +<p> + [% Param('passwdqc_desc') FILTER html_light %] </p> <div class="flex"> diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl index c41ea116f..1e7bc25db 100644 --- a/template/en/default/account/prefs/account.html.tmpl +++ b/template/en/default/account/prefs/account.html.tmpl @@ -71,6 +71,12 @@ </tr> [% IF user.authorizer.can_change_password %] <tr> + <td> </td> + <td> + [% Param('passwdqc_desc') FILTER html_light %] + </td> + </tr> + <tr> <th align="right">New password:</th> <td> <input type="password" name="new_password1" id="new_password1"> diff --git a/template/en/default/account/reset-password.html.tmpl b/template/en/default/account/reset-password.html.tmpl index ec57f19dd..ca60c5772 100644 --- a/template/en/default/account/reset-password.html.tmpl +++ b/template/en/default/account/reset-password.html.tmpl @@ -75,6 +75,10 @@ $(function() { [% user.password_change_reason || "You are required to update your password." FILTER html %] </p> +<p> + [% Param('passwdqc_desc') FILTER html_light %] +</p> + <form method="POST" action="reset_password.cgi"> <input type="hidden" name="token" value="[% token FILTER html %]"> <input type="hidden" name="do_save" value="1"> diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl index e19712351..72fcc7e55 100644 --- a/template/en/default/admin/params/auth.html.tmpl +++ b/template/en/default/admin/params/auth.html.tmpl @@ -87,6 +87,10 @@ The size of randomly-generated passphrases in bits (24 to 85). [% END %] +[% desc_passwdqc_desc = BLOCK %] + This should be a short paragraph describing the password requirements in plain English. + Limited HTML allowed. +[% END %] [% param_descs = { auth_env_id => "Environment variable used by external authentication system " _ @@ -197,11 +201,12 @@ "will be permitted to create their own accounts and all accounts " _ "will have to be created by an administrator.", - passwdqc_min => desc_passwdqc_min, + passwdqc_min => desc_passwdqc_min, passwdqc_max => desc_passwdqc_max passwdqc_passphrase_words => desc_passwdqc_passphrase_words, passwdqc_match_length => desc_passwdqc_match_length, passwdqc_random_bits => desc_random_bits, + passwdqc_desc => desc_passwdqc_desc, password_complexity => "Set the complexity required for passwords. In all cases must the passwords " _ diff --git a/template/en/default/global/password-features.html.tmpl b/template/en/default/global/password-features.html.tmpl index ab7ae1d81..60196568f 100644 --- a/template/en/default/global/password-features.html.tmpl +++ b/template/en/default/global/password-features.html.tmpl @@ -6,22 +6,6 @@ # defined by the Mozilla Public License, v. 2.0. #%] -<div id="password-features" - style="display: none" - class="[% class FILTER html %]" - data-password-page="[% password_page FILTER html %]" - data-password-complexity="no_constraints"> - Password must be 8 characters or longer, - and match at least 3 of the following requirements: - - <ul> - <li id="password-feature-upper">uppercase letters</li> - <li id="password-feature-lower">lowercase letters</li> - <li id="password-feature-numbers">numbers</li> - <li id="password-feature-symbols">symbols</li> - <li id="password-feature-length12">longer than 12 characters</li> - </ul> - <div id="password-msg"></div> - - <div id="password-meter-label" style="display: none">Strength: <span id="password-meter" class="meter"></span></div> -</div> +<span id="password-features" + data-password-page="[% password_page FILTER html %]"> +</span> |