From 794419cacad6de57a10228a4f839a4ed5c44d9ed Mon Sep 17 00:00:00 2001
From: "wurblzap%gmail.com" <>
Date: Tue, 18 Apr 2006 14:58:44 +0000
Subject: Bug 281691: Misused <label>'s cause screen reader problems. Patch by
 Marc Schumann <wurblzap@gmail.com>, r=LpSolit, a=justdave

---
 template/en/default/reports/create-chart.html.tmpl | 44 +++++++++++-----------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'template/en/default/reports/create-chart.html.tmpl')

diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl
index 005d14752..c02e8db04 100644
--- a/template/en/default/reports/create-chart.html.tmpl
+++ b/template/en/default/reports/create-chart.html.tmpl
@@ -70,11 +70,11 @@ function subcatSelected() {
       </tr>
     [% ELSE %]
       <tr>
-        <th>Category:</th>
+        <th><label for="category">Category</label>:</th>
         <th></th>
-        <th>Sub-category:</th>
+        <th><label for="subcategory">Sub-category</label>:</th>
         <th></th>
-        <th>Name:</th>
+        <th><label for="name" accesskey="N">Name</label>:</th>
         <th><br>
         </th>
       </tr>
@@ -102,19 +102,17 @@ function subcatSelected() {
         </td>
         
         <td align="left">
-          <label for="name" accesskey="N">
-            <select name="name" id="name" style="width: 15em"
-                    size="5" multiple="multiple"
-                    [%+ "disabled=\"disabled\"" UNLESS name.keys.size %]>
-              [% FOREACH x = name.keys.sort %]
-                <option value="[% name.$x FILTER html %]">
-                  [% x FILTER html %]</option>
-              [% END %]
-              [% UNLESS name.keys.size %]
-                <option value="" disabled="disabled"></option>
-              [% END %]
-            </select>
-          </label>
+          <select name="name" id="name" style="width: 15em"
+                  size="5" multiple="multiple"
+                  [%+ "disabled=\"disabled\"" UNLESS name.keys.size %]>
+            [% FOREACH x = name.keys.sort %]
+              <option value="[% name.$x FILTER html %]">
+                [% x FILTER html %]</option>
+            [% END %]
+            [% UNLESS name.keys.size %]
+              <option value="" disabled="disabled"></option>
+            [% END %]
+          </select>
         </td>
 
         <td align="center" valign="middle"> 
@@ -233,18 +231,18 @@ function subcatSelected() {
         </td>
 
         <td style="text-align: right; vertical-align: bottom;">
-          <b>Cumulate:</b> 
-          <input type="checkbox" name="cumulate" value="1"
+          <label for="cumulate"><b>Cumulate</b></label>:
+          <input type="checkbox" name="cumulate" id="cumulate" value="1"
           [% " checked" IF chart.cumulate %]>
         </td>
 
         <td></td>
-        <td valign="bottom"> 
-          <b>Date Range:</b> 
-          <input type="text" size="12" name="datefrom" 
+        <td valign="bottom">
+          <label for="datefrom"><b>Date Range</b></label>:
+          <input type="text" size="12" name="datefrom" id="datefrom"
             value="[% time2str("%Y-%m-%d", chart.datefrom) IF chart.datefrom%]">
-          <b>to</b> 
-          <input type="text" size="12" name="dateto" 
+          <label for="dateto"><b>to</b></label>
+          <input type="text" size="12" name="dateto" id="dateto"
             value="[% time2str("%Y-%m-%d", chart.dateto) IF chart.dateto %]">
         </td>
 
-- 
cgit v1.2.3-24-g4f1b