summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/account/auth/ldap-error.html.tmpl48
-rw-r--r--template/en/default/account/auth/login.html.tmpl (renamed from template/en/default/account/login.html.tmpl)60
-rw-r--r--template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl2
-rw-r--r--template/en/default/bug/process/confirm-duplicate.html.tmpl2
-rw-r--r--template/en/default/bug/process/midair.html.tmpl2
-rw-r--r--template/en/default/global/code-error.html.tmpl10
-rw-r--r--template/en/default/global/confirm-user-match.html.tmpl2
-rw-r--r--template/en/default/global/user-error.html.tmpl11
8 files changed, 88 insertions, 49 deletions
diff --git a/template/en/default/account/auth/ldap-error.html.tmpl b/template/en/default/account/auth/ldap-error.html.tmpl
new file mode 100644
index 000000000..7615fb326
--- /dev/null
+++ b/template/en/default/account/auth/ldap-error.html.tmpl
@@ -0,0 +1,48 @@
+[%# 1.0@bugzilla.org %]
+[%# The contents of this file are subject to the Mozilla Public
+ # License Version 1.1 (the "License"); you may not use this file
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.mozilla.org/MPL/
+ #
+ # Software distributed under the License is distributed on an "AS
+ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ # implied. See the License for the specific language governing
+ # rights and limitations under the License.
+ #
+ # The Original Code is the Bugzilla Bug Tracking System.
+ #
+ # The Initial Developer of the Original Code is Netscape Communications
+ # Corporation. Portions created by Netscape are
+ # Copyright (C) 1998 Netscape Communications Corporation. All
+ # Rights Reserved.
+ #
+ # Contributor(s): Bradley Baetz <bbaetz@acm.org>
+ #%]
+
+[%# INTERFACE:
+ # auth_err_tag: string. The tag for the error
+ # info: hash. Additional variables which may be used when printing details
+ # of the error.
+ #%]
+
+[% SWITCH auth_err_tag %]
+ [% CASE "cannot_retreive_attr" %]
+ The specified LDAP attribute [% info.attr FILTER html %] was not found.
+
+ [% CASE "connect_failed" %]
+ An error occurred while trying to connect to the LDAP server.
+ [% IF info.errstr %]
+ The error from the server was: <tt>[% info.errstr FILTER html %]</tt>.
+ [% END %]
+
+ [% CASE "no_userid" %]
+ Bugzilla created a new account for you, but then could not find the
+ new userid.
+
+ [% CASE "server_not_defined" %]
+ The LDAP server for authentication has not been defined.
+
+ [% CASE %]
+ Unhandled authentication error: [% auth_err_tag FILTER html %]
+
+[% END %]
diff --git a/template/en/default/account/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index 7d6e298d2..6dbd6531f 100644
--- a/template/en/default/account/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -31,45 +31,26 @@
%]
<p>
- I need a legitimate
- [% Param('useLDAP') ? "LDAP username" : "email address" %]
- and password to continue.
-</p>
+ I need a legitimate login and password to continue.
+</p>
<form action="[% target %]" method="POST">
<table>
<tr>
- [% IF Param("useLDAP") %]
- <td align="right">
- <b>Username:</b>
- </td>
- <td>
- <input size="10" name="LDAP_login">
- </td>
- </tr>
- <tr>
- <td align="right">
- <b>Password:</b>
- </td>
- <td>
- <input type="password" size="10" name="LDAP_password">
- </td>
- [% ELSE %]
- <td align="right">
- <b>E-mail address:</b>
- </td>
- <td>
- <input size="35" name="Bugzilla_login">
- </td>
- </tr>
- <tr>
- <td align="right">
- <b>Password:</b>
- </td>
- <td>
- <input type="password" size="35" name="Bugzilla_password">
- </td>
- [% END %]
+ <td align="right">
+ <b>Login:</b>
+ </td>
+ <td>
+ <input size="35" name="Bugzilla_login">
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
+ <b>Password:</b>
+ </td>
+ <td>
+ <input type="password" size="35" name="Bugzilla_password">
+ </td>
[% IF Param('loginnetmask') < 32 %]
<tr>
<td align="right">
@@ -88,18 +69,17 @@
</tr>
</table>
- [% PROCESS "global/hidden-fields.html.tmpl"
- exclude="^(Bugzilla|LDAP)_(login|password)$" %]
+ [% PROCESS "global/hidden-fields.html.tmpl"
+ exclude="^Bugzilla_(login|password|restrictlogin)$" %]
<input type="submit" name="GoAheadAndLogIn" value="Login">
</form>
[%# Allow the user to create a new account, or request a token to change
- # their password (unless we are using LDAP, in which case the user must
- # use LDAP to change it).
+ # their password, assuming that our auth method allows that.
#%]
-[% UNLESS Param("useLDAP") %]
+[% IF caneditaccount %]
<hr>
[% IF Param("createemailregexp") %]
diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
index 85f89e6e8..cf8fcca9c 100644
--- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
+++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
@@ -36,7 +36,7 @@ group '[% group.name FILTER html %]' impacts [% group.count %] bugs for which th
[% END %]
<form method="post" >
- [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %]
+ [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
<br>
Click "Continue" to proceed with the change including the changes
diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl
index 22ae57b75..72472a83b 100644
--- a/template/en/default/bug/process/confirm-duplicate.html.tmpl
+++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl
@@ -52,7 +52,7 @@
<form method="post" action="process_bug.cgi">
-[% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %]
+[% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
<p>
<input type="radio" name="confirm_add_duplicate" value="1">
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index 85a5c1fff..e3698a640 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -65,7 +65,7 @@ You have the following choices:
<ul>
<li>
<form method="post" action="process_bug.cgi">
- [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %]
+ [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
<input type="submit" value="Submit my changes anyway">
This will cause all of the above changes to be overwritten
[% ", except for the added comment(s)" IF comments.size > start_at %].
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index a29cb1e1c..b35bbb064 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -48,6 +48,16 @@
Attachment #[% attachid FILTER html %] ([% description FILTER html %])
is already obsolete.
+ [% ELSIF error == "auth_err" %]
+ [% title = "Internal Authentication Error" %]
+ [%# Authentication errors are in a template depending on the auth method,
+ for pluggability.
+ #%]
+ [% INCLUDE "account/auth/$authmethod-error.html.tmpl" %]
+
+ [% ELSIF error == "authres_unhandled" %]
+ An authorization handler return value was not handled by the login code.
+
[% ELSIF error == "bug_error" %]
Trying to retrieve bug [% bug.bug_id %] returned the error
[% bug.error FILTER html %]
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 92fa47a53..037f7385c 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -155,7 +155,7 @@
[% IF matchsuccess == 1 %]
- [% PROCESS "global/hidden-fields.html.tmpl" exclude="^(Bugzilla|LDAP)_(login|password)$" %]
+ [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
<p>
<input type="submit" value="Continue">
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 89f8cb7f3..11899fe70 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -92,6 +92,12 @@
Bug aliases cannot be longer than 20 characters.
Please choose a shorter alias.
+ [% ELSIF error == "auth_cant_create_account" %]
+ [% title = "Can't create accounts" %]
+ This site is using an authentication scheme which does not permit
+ account creation. Please contact an administrator to get a new account
+ created.
+
[% ELSIF error == "authorization_failure" %]
[% title = "Authorization Failed" %]
You are not allowed to [% action %].
@@ -312,11 +318,6 @@
[% ELSIF error == "invalid_username_or_password" %]
[% title = "Invalid Username Or Password" %]
The username or password you entered is not valid.
-
- [% ELSIF error == "ldap_cant_create_account" %]
- [% title = "Can't create LDAP accounts" %]
- This site is using LDAP for authentication. Please contact
- an LDAP administrator to get a new account created.
[% ELSIF error == "login_needed_for_password_change" %]
[% title = "Login Name Required" %]