From f559b688e6ead9ab61062b63ae7c8a48b21ee676 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Wed, 7 Aug 2013 15:21:12 +1000
Subject: Bug 868330 - Password creation directions incomplete r=sgreen,
 a=sgreen

---
 .../account/password/set-forgotten-password.html.tmpl     | 15 ++++++++++++---
 template/en/default/admin/params/auth.html.tmpl           |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'template')

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 55b97addc..b203e66e9 100644
--- 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>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 57db6025a..41acc1a7f 100644
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -132,6 +132,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>"
   }
 %]
-- 
cgit v1.2.3-24-g4f1b