Bug 1041959: Turn all labels for input fields in user preferences into <label> elements

r=LpSolit

4 files changed, 30 insertions, 19 deletions

diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl
index af1df315e..ddfc79aaf 100644
--- a/template/en/default/account/prefs/account.html.tmpl
+++ b/template/en/default/account/prefs/account.html.tmpl
@@ -21,10 +21,10 @@
       </td>
     </tr>
     <tr>
-      <th>Password:</th>
+      <th><label for="old_password">Password:</label></th>
       <td>
         <input type="hidden" name="old_login" value="[% user.login FILTER html %]">
-        <input type="password" name="old_password">
+        <input type="password" name="old_password" id="old_password">
       </td>
     </tr>
     <tr>
@@ -34,24 +34,26 @@
 
   [% IF user.authorizer.can_change_password %]
     <tr>
-      <th>New password:</th>
+      <th><label for="new_password1">New password:</label></th>
       <td>
-        <input type="password" name="new_password1">
+        <input type="password" name="new_password1" id="new_password1">
       </td>
     </tr>
 
     <tr>
-      <th>Confirm new password:</th>
+      <th><label for="new_password2">Confirm new password:</label></th>
       <td>
-        <input type="password" name="new_password2">
+        <input type="password" name="new_password2" id="new_password2">
       </td>
     </tr>
   [% END %]
 
   <tr>
-    <th>Your real name (optional, but encouraged):</th>
+    <th>
+      <label for="realname">Your real name (optional, but encouraged):</label>
+    </th>
     <td>
-      <input size="35" name="realname" value="[% realname FILTER html %]">
+      <input size="35" name="realname" id="realname" value="[% realname FILTER html %]">
     </td>
   </tr>  
 
@@ -79,11 +81,13 @@
     [% ELSE %]
       <tr>
         <th>
-          [% IF Param('emailsuffix') %]
-            New login:
-          [% ELSE %]
-            New email address:
-          [% END %]
+          <label for="new_login_name">
+            [% IF Param('emailsuffix') %]
+              New login:
+            [% ELSE %]
+              New email address:
+            [% END %]
+          </label>
         </th>
         <td>
           <input size="35" id="new_login_name" name="new_login_name"
diff --git a/template/en/default/account/prefs/apikey.html.tmpl b/template/en/default/account/prefs/apikey.html.tmpl
index 71d4ac854..890c71694 100644
--- a/template/en/default/account/prefs/apikey.html.tmpl
+++ b/template/en/default/account/prefs/apikey.html.tmpl
@@ -78,7 +78,8 @@ generated for you.</p>
 
 <p>
   <input type="checkbox" name="new_key" id="new_key">
-  Generate a new API key with optional description
+  <label for="new_key">Generate a new API key</label> with
+  <label for="new_description">optional description</label>
   <input name="new_description" id="new_description">
 </p>
 
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index 444447a9a..f228f96e7 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -222,7 +222,9 @@ preferences for <em>their</em> relationship to the [% terms.bug %]
 </p>
 
 [% IF watchedusers.size %]
-  <p>You are watching everyone in the following list:</p>
+  <p>
+    <label for="watched_by_you">You are watching everyone in the following list:</label>
+  </p>
   <p>
     <select id="watched_by_you" name="watched_by_you" multiple="multiple" size="5">
         [% FOREACH w = watchedusers %]
@@ -238,7 +240,8 @@ preferences for <em>their</em> relationship to the [% terms.bug %]
 [% END %]
 
 
-<p id="new_watched_by_you">Add users to my watch list (comma separated list):
+<p id="new_watched_by_you">
+  <label for="new_watchedusers">Add users to my watch list (comma separated list):</label>
   [% INCLUDE global/userselect.html.tmpl
      id => "new_watchedusers"
      name => "new_watchedusers"
@@ -279,7 +282,8 @@ preferences for <em>their</em> relationship to the [% terms.bug %]
         <td>
           <input type="checkbox" name="remove_ignored_bug_[% bug.id FILTER html %]" value="1">
         </td>
-        <td><a href="[% urlbase FILTER html %]show_bug.cgi?id=[% bug.id FILTER uri %]">
+        <td>
+          <a href="[% urlbase FILTER html %]show_bug.cgi?id=[% bug.id FILTER uri %]">
           [% bug.id FILTER html %]</a>
         </td>
         <td>[% bug.status FILTER html %]</td>
@@ -297,7 +301,7 @@ preferences for <em>their</em> relationship to the [% terms.bug %]
 [% END %]
 
 <p>
-  Add [% terms.bugs %]:<br>
+  <label for="add_ignored_bugs">Add [% terms.bugs %]:</label>
   <input type="text" id="add_ignored_bugs"
          name="add_ignored_bugs" size="60">
 </p>
diff --git a/template/en/default/account/prefs/settings.html.tmpl b/template/en/default/account/prefs/settings.html.tmpl
index a7055c67f..a3c44095a 100644
--- a/template/en/default/account/prefs/settings.html.tmpl
+++ b/template/en/default/account/prefs/settings.html.tmpl
@@ -35,7 +35,9 @@
       [% default_val = settings.${name}.default_value %]
       <tr>
         <td class="right">
-          [% setting_descs.$name OR name FILTER html %]
+          <label for="[% name FILTER html %]">
+            [% setting_descs.$name OR name FILTER html %]
+          </label>
         </td>
         <td>
           [% IF settings.${name}.is_enabled %]