Bug 868330 - Password creation directions incomplete

r=sgreen, a=sgreen

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 ff5114a25c2fb4fbce6589574136a89a5bd58dff..95e4d3fcf3ef2c79acc5863338f4efeb0d83f483 100644 (file)
--- a/template/en/default/account/password/set-forgotten-password.html.tmpl
+++ b/template/en/default/account/password/set-forgotten-password.html.tmpl
@@ -8,10 +8,20 @@
 
 [% title = "Change Password" %]
 [% PROCESS global/header.html.tmpl %]
-
+[% password_complexity = Param('password_complexity') %]
 <p>
-  To change your password, enter a new password twice:
+  To change your password, enter a new password twice:<br>
 </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 %]">
@@ -21,7 +31,6 @@
       <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 96aba3c1d948cf598242d589b66d5e224e1786e1..38090915e5bd08c926932829a3984df26dc9d01b 100644 (file)
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -125,6 +125,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 " _
-    "UPPER or one lower case letter, a number and a special character.</li></ul>"
+    "letter, a number and a special character.</li></ul>"
   }
 %]