summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/account/auth/login.html.tmpl28
-rw-r--r--template/en/default/global/user-error.html.tmpl4
2 files changed, 23 insertions, 9 deletions
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index a4757bc1c..f8e54f36f 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -25,6 +25,7 @@
# form: hash; the form values which need to be submitted to the target script
# mform: hash; the form values with multiple values which need to be
# submitted to the target script
+ # has_db: true if DB is one of the available authentication mechanisms
#%]
[% PROCESS global/variables.none.tmpl %]
@@ -101,23 +102,32 @@
#%]
[% IF caneditaccount %]
- <hr>
[% IF Param("createemailregexp") %]
+ <hr>
+
<p>
If you don't have a [% terms.Bugzilla %] account, you can
<a href="createaccount.cgi">create a new account</a>.
</p>
[% END %]
- <form method="get" action="token.cgi">
- <input type="hidden" name="a" value="reqpw">
- If you have an account, but have forgotten your password,
- enter your login name below and submit a request
- to change your password.<br>
- <input size="35" name="loginname">
- <input type="submit" value="Submit Request">
- </form>
+ [%# For now, password change requests only apply to the DB
+ # verification method #%]
+
+ [% IF has_db != 0 %]
+ <hr>
+
+ <form method="get" action="token.cgi">
+ <input type="hidden" name="a" value="reqpw">
+ If you have an account, but have forgotten your password,
+ enter your login name below and submit a request
+ to change your password.<br>
+ <input size="35" name="loginname">
+ <input type="submit" value="Submit Request">
+ </form>
+
+ [% END %]
<hr>
[% END %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 97987b786..ed95724fb 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -613,6 +613,10 @@
[% title = "Old Password Required" %]
You must enter your old password to change your email address.
+ [% ELSIF error == "password_change_requests_not_allowed" %]
+ [% title = "Password Change Requests Not Allowed" %]
+ The system is not configured to allow password change requests.
+
[% ELSIF error == "passwords_dont_match" %]
[% title = "Passwords Don't Match" %]
The two passwords you entered did not match.