From ec84eeb8a8072a71cb3938747a88cfc36da42368 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 16 Jan 2014 19:16:24 +0100
Subject: [PATCH] Bug 686333: Bugzilla login field should be <input type=email>
 r/a=justdave

---
 template/en/default/account/auth/login.html.tmpl  |  3 ++-
 template/en/default/account/create.html.tmpl      |  4 +++-
 .../en/default/account/prefs/account.html.tmpl    | 15 +++++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index 266d778422..2d6a71f2d0 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -39,7 +39,8 @@
         </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 15896ef55f..21d9251b5f 100644
--- a/template/en/default/account/create.html.tmpl
+++ b/template/en/default/account/create.html.tmpl
@@ -75,7 +75,9 @@
       Email address:
     [% END %]
   </span>
-  <input size="35" id="login" name="login"> [% Param('emailsuffix') FILTER html %]
+  <input size="35" id="login" name="login"
+         [%- ' type="email"' UNLESS Param('emailsuffix') %]>
+  [% Param('emailsuffix') FILTER html %]
   <input type="hidden" id="token" name="token" value="[% issue_hash_token(['create_account']) FILTER html %]">
   <input type="submit" id="send" value="Send">
 </form>
diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl
index b6c1ce1f89..af1df315ea 100644
--- a/template/en/default/account/prefs/account.html.tmpl
+++ b/template/en/default/account/prefs/account.html.tmpl
@@ -38,14 +38,14 @@
       <td>
         <input type="password" name="new_password1">
       </td>
-    </tr>              
+    </tr>
 
     <tr>
       <th>Confirm new password:</th>
       <td>
         <input type="password" name="new_password2">
       </td>
-    </tr>              
+    </tr>
   [% END %]
 
   <tr>
@@ -78,9 +78,16 @@
       [% END %]
     [% ELSE %]
       <tr>
-        <th>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 %]
-- 
2.47.3