summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
Diffstat (limited to 'template')
-rw-r--r--template/en/default/account/email/confirm-new.html.tmpl9
-rw-r--r--template/en/default/account/password/set-forgotten-password.html.tmpl1
-rw-r--r--template/en/default/global/user-error.html.tmpl8
3 files changed, 15 insertions, 3 deletions
diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl
index ed0ff3405..36bd52d09 100644
--- a/template/en/default/account/email/confirm-new.html.tmpl
+++ b/template/en/default/account/email/confirm-new.html.tmpl
@@ -24,11 +24,11 @@
title = title
onload = "document.forms['confirm_account_form'].realname.focus();" %]
-<div>
+<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.
-</div>
+</p>
<form id="confirm_account_form" method="post" action="token.cgi">
<input type="hidden" name="t" value="[% token FILTER html %]">
@@ -44,7 +44,10 @@
</tr>
<tr>
<th align="right"><label for="passwd1">Type your password</label>:</th>
- <td><input type="password" id="passwd1" name="passwd1" value=""></td>
+ <td>
+ <input type="password" id="passwd1" name="passwd1" value="">
+ (minimum [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters)
+ </td>
</tr>
<tr>
<th align="right"><label for="passwd2">Confirm your password</label>:</th>
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 ca134a486..a2ae517c8 100644
--- a/template/en/default/account/password/set-forgotten-password.html.tmpl
+++ b/template/en/default/account/password/set-forgotten-password.html.tmpl
@@ -33,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/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 5dd0c6a0a..4e3ffae50 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1301,6 +1301,14 @@
[% title = "Passwords Don't Match" %]
The two passwords you entered did not match.
+ [% ELSIF error == "password_current_too_short" %]
+ [% title = "New Password Required" %]
+ Your password is currently less than
+ [%+ constants.USER_PASSWORD_MIN_LENGTH FILTER html %] characters long,
+ which is the new minimum length required for passwords.
+ You must <a href="token.cgi?a=reqpw&loginname=[% locked_user.email FILTER html %]">
+ request a new password</a> in order to log in again.
+
[% ELSIF error == "password_too_short" %]
[% title = "Password Too Short" %]
The password must be at least