Bug 159687 - attachment/*.tmpl should use <label>. Patch by burnus; r=gerv.

2 files changed, 30 insertions, 11 deletions

diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 15f2e9e22..86d418525 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -63,17 +63,26 @@
       <th>Content Type:</th>
       <td>
         <em>If the attachment is a patch, check the box below.</em><br>
-        <input type="checkbox" name="ispatch" value="1" onchange="setContentTypeDisabledState();"> patch<br><br>
+        <input type="checkbox" id="ispatch" name="ispatch" value="1"
+               onchange="setContentTypeDisabledState();"> 
+        <label for="ispatch">patch</label><br><br>
 
         <em>Otherwise, choose a method for determining the content type.</em><br>
-        <input type="radio" name="contenttypemethod" value="autodetect"> 
-          auto-detect<br>
-        <input type="radio" name="contenttypemethod" value="list"> 
-          select from list: <select name="contenttypeselection" onchange="this.form.contenttypemethod[1].checked = true;">
+        <input type="radio" id="autodetect"
+               name="contenttypemethod" value="autodetect"> 
+          <label for="autodetect">auto-detect</label><br>
+        <input type="radio" id="list"
+               name="contenttypemethod" value="list"> 
+          <label for="list">select from list:</label>
+          <select name="contenttypeselection"
+                  onchange="this.form.contenttypemethod[1].checked = true;">
             [% PROCESS "attachment/content-types.html.tmpl" %]
           </select><br>
-        <input type="radio" name="contenttypemethod" value="manual">
-          enter manually: <input type="text" name="contenttypeentry" size="30" maxlength="200" onchange="if (this.value) this.form.contenttypemethod[2].checked = true;">
+        <input type="radio" id="manual"
+                     name="contenttypemethod" value="manual">
+          <label for="manual">enter manually:</label>
+          <input type="text" name="contenttypeentry" size="30" maxlength="200"
+                 onchange="if (this.value) this.form.contenttypemethod[2].checked = true;">
       </td>
     </tr>
     <tr>
@@ -82,7 +91,8 @@
         <em>(optional) Check each existing attachment made obsolete by your new attachment.</em><br>
         [% IF attachments.size %]
           [% FOREACH attachment = attachments %]
-            <input type="checkbox" name="obsolete" value="[% attachment.id %]">
+            <input type="checkbox" id="[% attachment.id %]"
+                   name="obsolete" value="[% attachment.id %]">
             <a href="attachment.cgi?id=[% attachment.id %]&amp;action=edit">[% attachment.id %]: [% attachment.description FILTER html %]</a><br>
           [% END %]
         [% ELSE %]
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index ca72647dd..d09a37902 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -159,13 +159,22 @@
           <input type="text" size="20" name="contenttypeentry" value="[% contenttype FILTER html %]"><br>
 
         <b>Flags:</b><br>
-          <input type="checkbox" name="ispatch" value="1"[% " checked" IF ispatch %]>patch
-          <input type="checkbox" name="isobsolete" value="1"[% " checked" IF isobsolete %]>obsolete<br>
+          <input type="checkbox" id="ispatch" name="ispatch" value="1"
+                 [% 'checked="checked"' IF ispatch %]>
+          <label for="ispatch">patch</label>
+          <input type="checkbox" id="isobsolete" name="isobsolete" value="1"
+                 [% 'checked="checked"' IF isobsolete %]>
+          <label for="isobsolete">obsolete</label><br>
 
         [% IF statusdefs.size %]
           <b>Status:</b><br>
             [% FOREACH def = statusdefs %]
-                <input type="checkbox" name="status" value="[% def.id %]"[% " checked" IF statuses.${def.id} %]>[% def.name FILTER html %]<br>
+                <input type="checkbox" id="status-[% def.id %]" name="status"
+                       value="[% def.id %]"
+                       [% 'checked="checked"' IF statuses.${def.id} %]>
+                <label for="status-[% def.id %]">
+                  [% def.name FILTER html %]
+                </label><br>
             [% END %]
         [% END %]