Bug 840407: Remove the "align" and "valign" attributes

r/a=justdave

2 files changed, 77 insertions, 93 deletions

diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl
index 698132ee6..71876ef42 100644
--- a/template/en/default/search/search-report-graph.html.tmpl
+++ b/template/en/default/search/search-report-graph.html.tmpl
@@ -52,71 +52,63 @@ var queryform = "reportform"
 [% button_name = "Generate Report" %]
 
 <form method="get" action="report.cgi" name="reportform" id="reportform">
-
-<table align="center">
-  <tr>
-    <td valign="middle">
-      <b>Vertical Axis:</b><br>
-      <noscript><small>(not for pie charts)</small><br></noscript>
-      [% PROCESS select name = 'y_axis_field' %]<br>
-      <br>
-        <b>Plot Data Sets:</b><br>
-        <input type="radio" name="cumulate" value="0"
-        [% " checked" IF default.cumulate.0 != "1" %]>
-        Individually<br>
-        <input type="radio" name="cumulate" value="1"
-        [% " checked" IF default.cumulate.0 == "1" %]>
-        Stacked
-    </td>
-    <td width="150" height="150">
-      <table border="1" width="100%" height="100%">
-        <tr>
-          <td align="center" valign="middle">
-            <b>Multiple Images:</b><br>
-            [% PROCESS select name = 'z_axis_field' %]
-          </td>
-        </tr>
-      </table>
-    </td>
-    <td rowspan="2">
-      <b>Format:</b><br>
-      [% chart_formats = [
-        { name => "line", description => "Line Graph" },
-        { name => "bar",  description => "Bar Chart" },
-        { name => "pie",  description => "Pie Chart" } ] %]
-      [% default.chart_format.0 = default.chart_format.0 || "bar" %]
-
-      [% FOREACH chart_format = chart_formats %]
-        <input type="radio" name="format"
-               value="[% chart_format.name FILTER html %]"
-               onchange="chartTypeChanged()"
-          [% " checked" IF default.chart_format.0 == chart_format.name %]>
-          [% chart_format.description FILTER html %]<br>
-      [% END %]
-    </td>
-  </tr>
-
-  <tr>
-    <td>
-    </td>
-    <td align="left">
-      <b>Horizontal Axis:</b>
-      [% PROCESS select name = 'x_axis_field' %]<br>
-      <label for="x_labels_vertical"><b>Vertical labels:</b></label>
-      <input type="checkbox" name="x_labels_vertical" id="x_labels_vertical"
-             value="1"
-         [% " checked" IF default.x_labels_vertical.0 == "1" %]>
-     </td>
-    <td>
-    </td>
-  </tr>
-</table>
-
-<hr>
-
-[% PROCESS search/form.html.tmpl %]
-
-[% PROCESS "search/boolean-charts.html.tmpl" %]
+  <table id="graphical_reports_menu">
+    <tr>
+      <th id="reports_menu_vertical_axis">
+        Vertical Axis:<br>
+        [% PROCESS select name = 'y_axis_field' %]<br>
+        <br>
+        Plot Data Sets:<br>
+        <input type="radio" id="cumulate_indiv" name="cumulate" value="0"
+        [%+ 'checked="checked"' IF default.cumulate.0 != "1" %]>
+        <label for="cumulate_indiv">Individually</label><br>
+        <input type="radio" id="cumulate_stacked" name="cumulate" value="1"
+        [%+ 'checked="checked"' IF default.cumulate.0 == "1" %]>
+        <label for="cumulate_stacked">Stacked</label>
+      </th>
+      <th id="reports_menu_multiple_tables">
+        Multiple Images:<br>
+        [% PROCESS select name = 'z_axis_field' %]
+      </th>
+      <th id="reports_menu_format">
+        Format:<br>
+        [% chart_formats = [
+             { name => "line", description => "Line Graph" },
+             { name => "bar",  description => "Bar Chart" },
+             { name => "pie",  description => "Pie Chart" } ] %]
+        [% default.chart_format.0 = default.chart_format.0 || "bar" %]
+
+        [% FOREACH chart_format = chart_formats %]
+          <input type="radio" id="format_[% chart_format.name FILTER html %]"
+                 name="format" value="[% chart_format.name FILTER html %]"
+                 onchange="chartTypeChanged()"
+                 [%+ 'checked="checked"' IF default.chart_format.0 == chart_format.name %]>
+          <label for="format_[% chart_format.name FILTER html %]">
+            [% chart_format.description FILTER html %]
+          </label><br>
+        [% END %]
+      </th>
+    </tr>
+
+    <tr>
+      <th></th>
+      <th id="reports_menu_horizontal_axis">
+        Horizontal Axis:<br>
+        [% PROCESS select name = 'x_axis_field' %]<br>
+        <input type="checkbox" name="x_labels_vertical" id="x_labels_vertical"
+               value="1"
+               [%+ 'checked="checked"' IF default.x_labels_vertical.0 == "1" %]>
+        <label for="x_labels_vertical">Vertical labels</label>
+      </th>
+      <th></th>
+    </tr>
+  </table>
+
+  <hr>
+
+  [% PROCESS search/form.html.tmpl %]
+
+  [% PROCESS "search/boolean-charts.html.tmpl" %]
 
   <div id="knob">
     <input type="submit" id="[% button_name FILTER css_class_quote %]"
diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl
index 7e0a0022d..d5a1ba527 100644
--- a/template/en/default/search/search-report-table.html.tmpl
+++ b/template/en/default/search/search-report-table.html.tmpl
@@ -35,36 +35,28 @@ var queryform = "reportform"
 [% button_name = "Generate Report" %]
 
 <form method="get" action="report.cgi" name="reportform" id="reportform">
+  <table id="tabular_reports_menu">
+    <tr>
+      <th></th>
+      <th id="reports_menu_horizontal_axis">
+        Horizontal Axis:<br>
+        [% PROCESS select name = 'x_axis_field' %]
+      </th>
+    </tr>
 
-<table align="center">
-  <tr>
-    <td>
-    </td>
-    <td align="center">
-      <b>Horizontal Axis:</b>
-      [% PROCESS select name = 'x_axis_field' %]
-    </td>
-  </tr>
+    <tr>
+      <th id="reports_menu_vertical_axis">
+        Vertical Axis:<br>
+        [% PROCESS select name = 'y_axis_field' %]
+      </th>
+      <th id="reports_menu_multiple_tables">
+        Multiple Tables:<br>
+        [% PROCESS select name = 'z_axis_field' %]
+      </th>
+    </tr>
+  </table>
 
-  <tr>
-    <td valign="middle" align="center">
-      <b>Vertical Axis:</b><br>
-      [% PROCESS select name = 'y_axis_field' %]
-    </td>
-    <td width="150" height="150">
-      <table border="1" width="100%">
-        <tr>
-          <td align="center" valign="middle" height="150">
-            <b>Multiple Tables:</b><br>
-            [% PROCESS select name = 'z_axis_field' %]
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-<hr>
+  <hr>
 
   [% PROCESS search/form.html.tmpl %]