diff options
| author | David Lawrence <dkl@mozilla.com> | 2014-12-22 20:44:41 +0100 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2014-12-22 20:44:41 +0100 |
| commit | 89e09eb00b896f41ba6e82ce758cd7ea3905f0db (patch) | |
| tree | f30028505f24fe2e6ff7224d804f857324c70fa6 /template/en/default/account | |
| parent | b7062fb466bbb9509a0d96dea35653560326584d (diff) | |
| download | bugzilla-89e09eb00b896f41ba6e82ce758cd7ea3905f0db.tar.gz bugzilla-89e09eb00b896f41ba6e82ce758cd7ea3905f0db.tar.xz | |
Bug 1113286: backport upstream bug 686333 to bmo/4.2 to convert Bugzilla login fields to <input type=email>
Diffstat (limited to 'template/en/default/account')
| -rw-r--r-- | template/en/default/account/auth/login.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/account/create.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/account/prefs/account.html.tmpl | 19 |
3 files changed, 17 insertions, 8 deletions
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl index 0aac403a5..dac24bcdc 100644 --- a/template/en/default/account/auth/login.html.tmpl +++ b/template/en/default/account/auth/login.html.tmpl @@ -46,7 +46,8 @@ <tr> <th align="right"><label for="Bugzilla_login">Email Address:</label></th> <td> - <input size="35" id="Bugzilla_login" name="Bugzilla_login"> + <input size="35" id="Bugzilla_login" name="Bugzilla_login" + [%- ' type="email"' UNLESS Param('emailsuffix') %]> [% Param('emailsuffix') FILTER html %] </td> </tr> diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl index 985a54841..914fe05b4 100644 --- a/template/en/default/account/create.html.tmpl +++ b/template/en/default/account/create.html.tmpl @@ -67,7 +67,8 @@ <b>Email address:</b> </td> <td> - <input size="35" id="login" name="login"> + <input size="35" id="login" name="login" + [%- ' type="email"' UNLESS Param('emailsuffix') %]> [% Param('emailsuffix') FILTER html %] </td> </tr> diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl index 0457ff892..95819e451 100644 --- a/template/en/default/account/prefs/account.html.tmpl +++ b/template/en/default/account/prefs/account.html.tmpl @@ -36,7 +36,7 @@ <input type="hidden" name="old_login" value="[% user.login FILTER html %]"> <input type="password" name="old_password"> </td> - </tr> + </tr> <tr> <td colspan="2"><hr></td> </tr> @@ -46,14 +46,14 @@ <td> <input type="password" name="new_password1"> </td> - </tr> + </tr> <tr> <th align="right">Confirm new password:</th> <td> <input type="password" name="new_password2"> </td> - </tr> + </tr> [% END %] <tr> @@ -61,7 +61,7 @@ <td> <input size="35" name="realname" value="[% realname FILTER html %]"> </td> - </tr> + </tr> [% IF user.authorizer.can_change_email && Param('allowemailchange') %] [% IF login_change_date %] @@ -86,9 +86,16 @@ [% END %] [% ELSE %] <tr> - <th align="right">New email address:</th> + <th> + [% IF Param('emailsuffix') %] + New login: + [% ELSE %] + New email address: + [% END %] + </th> <td> - <input size="35" name="new_login_name"> + <input size="35" id="new_login_name" name="new_login_name" + [%- ' type="email"' UNLESS Param('emailsuffix') %]> </td> </tr> [% END %] |