aboutsummaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2015-08-06 16:52:59 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2015-08-06 16:52:59 +0200
commita2ae154592af0131e13f935802839679e4e88924 (patch)
treebe503bd90904d759dc0c2698badb1550efd95a6d /template/en/default
parentae716b289708e3b57943d18a5a9169cdaaf4993d (diff)
downloadbugs-a2ae154592af0131e13f935802839679e4e88924.tar
bugs-a2ae154592af0131e13f935802839679e4e88924.tar.gz
bugs-a2ae154592af0131e13f935802839679e4e88924.tar.bz2
bugs-a2ae154592af0131e13f935802839679e4e88924.tar.xz
bugs-a2ae154592af0131e13f935802839679e4e88924.zip
Bug 1179160: The login form should not use type="email" when LDAP has LDAPmailattribute set
r=gerv a=dkl
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/account/auth/login-small.html.tmpl4
-rw-r--r--template/en/default/account/auth/login.html.tmpl4
2 files changed, 4 insertions, 4 deletions
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index 790c135bf..65aa861a1 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -34,7 +34,7 @@
id="mini_login[% qs_suffix FILTER html %]">
<input id="Bugzilla_login[% qs_suffix FILTER html %]" required
name="Bugzilla_login" class="bz_login"
- [% IF Param('emailsuffix') %]
+ [% IF login_not_email %]
placeholder="Login"
[% ELSE %]
type="email" placeholder="Email Address"
@@ -64,7 +64,7 @@
class="mini_forgot bz_default_hidden">
<label for="login[% qs_suffix FILTER html %]">Login:</label>
<input name="loginname" size="20" id="login[% qs_suffix FILTER html %]" required
- [% IF Param('emailsuffix') %]
+ [% IF login_not_email %]
placeholder="Your Login"
[% ELSE %]
type="email" placeholder="Your Email Address"
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index 0af84542d..32ab14c9e 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -30,7 +30,7 @@
<tr>
<th>
<label for="Bugzilla_login">
- [% IF Param('emailsuffix') %]
+ [% IF login_not_email %]
Login:
[% ELSE %]
Your Email Address:
@@ -39,7 +39,7 @@
</th>
<td>
<input size="35" id="Bugzilla_login" name="Bugzilla_login"
- [%- ' type="email"' UNLESS Param('emailsuffix') %] autofocus required>
+ [%- ' type="email"' UNLESS login_not_email %] autofocus required>
[% Param('emailsuffix') FILTER html %]
</td>
</tr>