summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorSunil Joshi <joshi_sunil@in.com>2013-08-09 06:02:41 +0200
committerSimon Green <sgreen@redhat.com>2013-08-09 06:02:41 +0200
commit6161e5ca40d5aeca9005a4d85e950f9ef8bdf7ec (patch)
treec23cca7eccc6f7af0d7527fcb3ec810adfb1c15f /template
parent2322f835d1f43ad8f709d784bfcf140710ae2bae (diff)
downloadbugzilla-6161e5ca40d5aeca9005a4d85e950f9ef8bdf7ec.tar.gz
bugzilla-6161e5ca40d5aeca9005a4d85e950f9ef8bdf7ec.tar.xz
Bug 868330 - Password creation directions incomplete
r=sgreen, a=sgreen
Diffstat (limited to 'template')
-rw-r--r--template/en/default/account/password/set-forgotten-password.html.tmpl15
-rw-r--r--template/en/default/admin/params/auth.html.tmpl2
2 files changed, 13 insertions, 4 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 a2ae517c8..3bc16cbc0 100644
--- a/template/en/default/account/password/set-forgotten-password.html.tmpl
+++ b/template/en/default/account/password/set-forgotten-password.html.tmpl
@@ -20,10 +20,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 %]">
@@ -33,7 +43,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 2e11dffbc..c757d9140 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 " _
- "UPPER or one lower case letter, a number and a special character.</li></ul>"
+ "letter, a number and a special character.</li></ul>"
}
%]