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

r/a=justdave

1 files changed, 32 insertions, 40 deletions

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 %]