diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2013-08-10 02:45:28 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2013-08-10 02:45:28 +0200 |
| commit | e651ee9c34ca40afdd4582902c1656ea577a4fc3 (patch) | |
| tree | a948d4c3bf9e7df051c1d67e9d1f969677d9f142 | |
| parent | 340442e3d77fb2e8e180e1a541bae293d5cd6b18 (diff) | |
| download | bugzilla-e651ee9c34ca40afdd4582902c1656ea577a4fc3.tar.gz bugzilla-e651ee9c34ca40afdd4582902c1656ea577a4fc3.tar.xz | |
Back out bug 868330 for the 4.2 branch. This is not a security fix
| -rw-r--r-- | template/en/default/account/password/set-forgotten-password.html.tmpl | 15 | ||||
| -rw-r--r-- | template/en/default/admin/params/auth.html.tmpl | 2 |
2 files changed, 4 insertions, 13 deletions
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 3bc16cbc0..a2ae517c8 100644 --- a/template/en/default/account/password/set-forgotten-password.html.tmpl +++ b/template/en/default/account/password/set-forgotten-password.html.tmpl @@ -20,20 +20,10 @@ [% title = "Change Password" %] [% PROCESS global/header.html.tmpl %] -[% password_complexity = Param('password_complexity') %] + <p> - To change your password, enter a new password twice:<br> + To change your password, enter a new password twice: </p> -<ul> - <li>Password must be at least [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters long.</li> - [% IF password_complexity == "mixed_letters" %] - <li>Password must contain at least one UPPER and one lowercase letter.</li> - [% ELSIF password_complexity == "letters_numbers" %] - <li>Password must contain at least one UPPER and one lower case letter and a number.</li> - [% ELSIF password_complexity == "letters_numbers_specialchars" %] - <li>Password must contain at least one letter, a number and a special character.</li> - [% END %] -</ul> <form method="post" action="token.cgi"> <input type="hidden" name="t" value="[% token FILTER html %]"> @@ -43,6 +33,7 @@ <th align="right">New Password:</th> <td> <input type="password" name="password"> + (minimum [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters) </td> </tr> diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl index c757d9140..2e11dffbc 100644 --- a/template/en/default/admin/params/auth.html.tmpl +++ b/template/en/default/admin/params/auth.html.tmpl @@ -136,6 +136,6 @@ "<li>letters_numbers - Passwords must contain at least one UPPER and one " _ "lower case letter and a number.</li>" _ "<li>letters_numbers_specialchars - Passwords must contain at least one " _ - "letter, a number and a special character.</li></ul>" + "UPPER or one lower case letter, a number and a special character.</li></ul>" } %] |