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

r/a=justdave

5 files changed, 56 insertions, 61 deletions

diff --git a/template/en/default/reports/chart.html.tmpl b/template/en/default/reports/chart.html.tmpl
index 3276f31e0..dfab725e6 100644
--- a/template/en/default/reports/chart.html.tmpl
+++ b/template/en/default/reports/chart.html.tmpl
@@ -20,7 +20,7 @@
   header_addl_info = time
 %]
 
-<div align="center">
+<div class="center">
 
   [% imageurl = BLOCK %]chart.cgi?
     [% imagebase FILTER html %]&amp;ctype=png&amp;action=plot&amp;width=
diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl
index 948939e7a..c4e554210 100644
--- a/template/en/default/reports/create-chart.html.tmpl
+++ b/template/en/default/reports/create-chart.html.tmpl
@@ -134,11 +134,11 @@ function subcatSelected() {
           [% labelidx = labelidx + 1 %]
           [% NEXT %]
         [% END %]
-        
+
         [% FOREACH series = line %]
           <tr>
             [% IF loop.first %]
-              <td align="center" rowspan="[% line.size %]">
+              <td class="center" rowspan="[% line.size %]">
                 <input type="checkbox" value="1" name="select[% newidx %]">
               </td>
               <td rowspan="[% line.size %]">
@@ -160,7 +160,7 @@ function subcatSelected() {
                      value="[% series.series_id %]">
             </td>
 
-            <td align="center">
+            <td>
               [% IF user.id == series.creator_id OR user.in_group("admin") %]
                <a href="chart.cgi?action=edit&amp;series_id=
                        [% series.series_id %]">Edit</a> |
@@ -172,7 +172,7 @@ function subcatSelected() {
                 [% series.subcategory FILTER uri %]%20/%20
                 [% series.name FILTER uri -%]&amp;series_id=
                 [% series.series_id %]&amp;remaction=runseries">Run Search</a>
-            </td>        
+            </td>
           </tr>
         [% END %]
         [% labelidx = labelidx + 1 %]
@@ -181,7 +181,7 @@ function subcatSelected() {
 
       [% IF chart.gt %]
         <tr>
-          <td align="center">
+          <td class="center">
             <input type="checkbox" value="1" name="select65536">
             <input type="hidden" value="1" name="gt">
           </td>
diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl
index 4efdcf9f5..9d3fc698b 100644
--- a/template/en/default/reports/duplicates.html.tmpl
+++ b/template/en/default/reports/duplicates.html.tmpl
@@ -52,6 +52,19 @@
   <input type="hidden" name="bug_id" value="[% bug_ids_string FILTER html %]">
   <table>
     <tr>
+      <td>Restrict to products:</td>
+      <td>
+        <select name="product" size="5" multiple="multiple">
+          [% FOREACH p = user.get_selectable_products %]
+            <option name="[% p.name FILTER html %]"
+            [% ' selected="selected"' IF product.contains(p.name) %]
+            >[% p.name FILTER html %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+
+    <tr>
       <td>When sorting or restricting, work with:</td>
       <td>
         <input type="radio" name="sortvisible" id="entirelist" value="0"
@@ -66,16 +79,6 @@
           currently visible list
         </label>
       </td>
-      <td rowspan="4" valign="top">Restrict to products:</td>
-      <td rowspan="4" valign="top">
-        <select name="product" size="5" multiple="multiple">
-          [% FOREACH p = user.get_selectable_products %]
-            <option name="[% p.name FILTER html %]"
-            [% ' selected="selected"' IF product.contains(p.name) %]
-            >[% p.name FILTER html %]</option>
-          [% END %]
-        </select>
-      </td>
      </tr>
 
     <tr>
diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index abf770f29..57e998b1d 100644
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -116,7 +116,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
       return parseFloat(res[1]);
   };
 
-  this.myDataSource = new YAHOO.util.DataSource(YAHOO.util.Dom.get("tabular_report"));
+  this.myDataSource = new YAHOO.util.DataSource(YAHOO.util.Dom.get("tabular_report_[% tbl FILTER html FILTER js %]"));
   this.myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
   this.myDataSource.responseSchema = {
     fields: [
@@ -137,7 +137,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
   <h2>[% tbl_disp FILTER email FILTER html %]</h2>
 [% END %]
 
-<table>
+<table class="tabular_report_container">
   <tr>
     <td>
     </td>
@@ -147,7 +147,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
   </tr>
 
   <tr>
-    <td valign="middle">
+    <td class="middle">
       <strong>[% row_field_disp FILTER html %]</strong>
     </td>
     <td>
@@ -158,7 +158,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
 [% row_idx = 0 %]
 [% total_key = '-total-' %]
 <div id="tabular_report_container_[% tbl FILTER html %]">
-<table id="tabular_report">
+<table id="tabular_report_[% tbl FILTER html %]" class="tabular_report">
   [% IF col_field %]
     <thead>
     <tr>
@@ -234,7 +234,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
   </tbody>
 </table>
 </div>
-      
+
     </td>
   </tr>
 </table>
diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index 2ca5dd90f..195e92e89 100644
--- a/template/en/default/reports/report.html.tmpl
+++ b/template/en/default/reports/report.html.tmpl
@@ -66,9 +66,8 @@
   [% END %]
 [% END %]
 
-<div align="center">
-
-  [% FOREACH tbl = tbl_names %]    
+<div class="center">
+  [% FOREACH tbl = tbl_names %]
     [% IF tbl == "-total-" %]
       [% tbl_disp = "Total" %]
     [% ELSE %]
@@ -108,45 +107,38 @@
                  { name => "table", description => "Table" } ] %]
 
   [% formaturl = "report.cgi?$switchbase&amp;width=$width&amp;height=$height&amp;action=wrap" %]
-  [% FOREACH other_format = formats %]
-    [% NEXT IF other_format.name == "pie" AND row_field AND col_field %]
-    [% UNLESS other_format.name == format %]
-      <a href="[% formaturl %]&amp;format=[% other_format.name %]">
+  <p>
+    [% FOREACH other_format = formats %]
+      [% NEXT IF other_format.name == "pie" AND row_field AND col_field %]
+      [% UNLESS other_format.name == format %]
+        <a href="[% formaturl %]&amp;format=[% other_format.name %]">
+      [% END %]
+      [% other_format.description FILTER html %]
+      [% "</a>" UNLESS other_format.name == format %] |
     [% END %]
-    [% other_format.description FILTER html %]
-    [% "</a>" UNLESS other_format.name == format %] |
+    <a href="[% formaturl %]&amp;ctype=csv&amp;format=table">CSV</a>
+  </p>
+
+  [% IF format == "table" %]
+    <a href="query.cgi?[% switchbase %]&amp;format=report-table">Edit this report</a>
+  [% ELSE %]
+    <a href="query.cgi?[% switchbase %]&amp;chart_format=
+             [%~ format FILTER uri %]&amp;format=report-graph&amp;cumulate=[% cumulate %]">
+      Edit this report</a>
+  [% END %]
+  |
+  [% IF saved_report_id %]
+    <a href="report.cgi?action=del&amp;saved_report_id=[% saved_report_id FILTER uri %]&amp;token=
+             [%~ issue_hash_token(['delete_report', saved_report_id]) FILTER uri %]">Forget this report</a>
+  [% ELSE %]
+    <form method="get" action="report.cgi" class="inline">
+      <input type="submit" id="remember" value="Remember report"> as
+      <input type="hidden" name="query" value="[% switchbase %]&amp;format=[% format FILTER uri %]&amp;action=wrap">
+      <input type="hidden" name="action" value="add">
+      <input type="hidden" name="token" value="[% issue_hash_token(['save_report']) FILTER html %]">
+      <input type="text" id="name" name="name" size="20" value="" maxlength="64">
+    </form>
   [% END %]
-  <a href="[% formaturl %]&amp;ctype=csv&amp;format=table">CSV</a>
-
-  <table>
-    <tr>
-      <td>
-        [% IF format == "table" %]
-          <a href="query.cgi?[% switchbase %]&amp;format=report-table">Edit this report</a>
-        [% ELSE %]
-          <a href="query.cgi?[% switchbase %]&amp;chart_format=
-                  [%~ format FILTER uri %]&amp;format=report-graph&amp;cumulate=[% cumulate %]">
-          Edit this report</a>
-        [% END %]
-      </td>
-      <td>|</td>
-      <td>
-        [% IF saved_report_id %]
-          <a href="report.cgi?action=del&amp;saved_report_id=[% saved_report_id FILTER uri %]&amp;token=
-                  [%~ issue_hash_token(['delete_report', saved_report_id]) FILTER uri %]">Forget this report</a>
-        [% ELSE %]
-          <form method="get" action="report.cgi">
-            <input type="submit" id="remember" value="Remember report"> as
-            <input type="hidden" name="query" value="[% switchbase %]&amp;format=[% format FILTER uri %]&amp;action=wrap">
-            <input type="hidden" name="action" value="add">
-            <input type="hidden" name="token" value="[% issue_hash_token(['save_report']) FILTER html %]">
-            <input type="text" id="name" name="name" size="20" value="" maxlength="64">
-          </form>
-        [% END %]
-      </td>
-    </tr>
-  </table>
-
 </div>
 
 [% PROCESS global/footer.html.tmpl %]