Bug 952795: Remove all style="..." attributes from HTML elements

r/a=justdave

4 files changed, 48 insertions, 52 deletions

diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl
index 471a9cb55..948939e7a 100644
--- a/template/en/default/reports/create-chart.html.tmpl
+++ b/template/en/default/reports/create-chart.html.tmpl
@@ -15,6 +15,7 @@
 
 [% PROCESS global/header.html.tmpl 
   title = "Create Chart"
+  style_urls = [ "skins/standard/reports.css"]
 %]
 
 [% PROCESS "reports/series-common.html.tmpl" 
@@ -47,9 +48,9 @@ function subcatSelected() {
   
 [% gttext = "Grand Total" %]
 
-<form method="get" action="chart.cgi" name="chartform">  
-  
-  <table cellpadding="2" cellspacing="2" border="0">
+<form method="get" action="chart.cgi" name="chartform">
+
+  <table id="create_chart">
     [% IF NOT category OR category.size == 0 %]
       <tr>
         <td>
@@ -58,39 +59,38 @@ function subcatSelected() {
       </tr>
     [% ELSE %]
       <tr>
-        <th><label for="category">Category</label>:</th>
+        <th><label for="category">Category</label></th>
+        <th></th>
+        <th><label for="subcategory">Sub-category</label></th>
         <th></th>
-        <th><label for="subcategory">Sub-category</label>:</th>
+        <th><label for="name" accesskey="N">Name</label></th>
         <th></th>
-        <th><label for="name" accesskey="N">Name</label>:</th>
-        <th><br>
-        </th>
       </tr>
       <tr>
-      
+
         [% PROCESS series_select sel = { name => 'category', 
                                          size => 5,
                                          onchange = "catSelected();
                                                      subcatSelected();" } %]
-                                   
+
         <td>
           <noscript>
             <input type="submit" name="action-assemble" value="Update --&gt;"
                    id="action-assemble">
           </noscript>
         </td>
-        
+
         [% PROCESS series_select sel = { name => 'subcategory', 
                                          size => 5,
                                          onchange = "subcatSelected()" } %]
-                                   
+
         <td>
           <noscript>
             <input type="submit" name="action-assemble" value="Update --&gt;"
                    id="action-assemble2">
           </noscript>
         </td>
-        
+
         [% PROCESS series_select sel = { name => 'name',
                                          size => 5,
                                          multiple => 1,
@@ -98,7 +98,7 @@ function subcatSelected() {
                                          # not its name.
                                          value_in_hash => 1 } %]
 
-        <td align="center" valign="middle"> 
+        <td>
           <input type="submit" name="action-add" value="Add To List"
                  id="action-add"><br>
         </td>
@@ -109,15 +109,15 @@ function subcatSelected() {
   <h3>List Of Data Sets To Plot</h3>
 
   [% IF chart.lines.size %]
-    <table cellspacing="2" cellpadding="2">
+    <table id="edit_charts">
       <tr>
-        <th style="width: 5em;">Select</th>
+        <th>Select</th>
         <th>Label</th>
         <th></th>
         <th>Data Set</th>
         <th></th>
       </tr>
-      
+
       [%# The external loop has two counters; one which keeps track of where we
         #  are in the old labels array, and one which keeps track of the new
         #  indexes for the form elements. They are different if chart.lines has
@@ -201,21 +201,19 @@ function subcatSelected() {
       </tr>
 
       <tr>
-        <td valign="bottom" style="text-align: center;">
-          <input type="submit" name="action-sum" value="Sum" 
-                 style="width: 5em;" id="action-sum"><br>
-          <input type="submit" name="action-remove" value="Remove"
-                 style="width: 5em;" id="action-remove">
+        <td>
+          <input type="submit" id="action-sum" name="action-sum" value="Sum"><br>
+          <input type="submit" id="action-remove" name="action-remove" value="Remove">
         </td>
 
-        <td style="text-align: right; vertical-align: bottom;">
+        <td class="right">
           <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">
+        <td>
           <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%]">
@@ -224,7 +222,7 @@ function subcatSelected() {
             value="[% time2str("%Y-%m-%d", chart.dateto) IF chart.dateto %]">
         </td>
 
-        <td style="text-align: right" valign="bottom">
+        <td>
           <input type="submit" name="action-wrap" value="Chart This List"
                  id="action-wrap">
         </td>
diff --git a/template/en/default/reports/edit-series.html.tmpl b/template/en/default/reports/edit-series.html.tmpl
index ac0b1ea30..33fa40aba 100644
--- a/template/en/default/reports/edit-series.html.tmpl
+++ b/template/en/default/reports/edit-series.html.tmpl
@@ -13,7 +13,9 @@
   [%+ default.name FILTER html %]
 [% END %]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+  style_urls = [ "skins/standard/reports.css" ]
+%]
 
 <form method="get" action="chart.cgi" name="chartform">
   
diff --git a/template/en/default/reports/series-common.html.tmpl b/template/en/default/reports/series-common.html.tmpl
index 35d3c04af..07b3888f3 100644
--- a/template/en/default/reports/series-common.html.tmpl
+++ b/template/en/default/reports/series-common.html.tmpl
@@ -85,9 +85,9 @@ function checkNewState() {
 [%###########################################################################%]
 
 [% BLOCK series_select %]
-  <td align="left">
+  <td>
     <select name="[% sel.name %]" id="[% sel.name %]"
-            size="[% sel.size %]" style="width: 15em"
+            size="[% sel.size %]"
             [%+ 'multiple="multiple"' IF sel.multiple %]
             [%+ "disabled=\"disabled\"" UNLESS ${sel.name}.keys.size || newtext %]
             [%+ "onchange=\"$sel.onchange\"" IF sel.onchange %]>
diff --git a/template/en/default/reports/series.html.tmpl b/template/en/default/reports/series.html.tmpl
index a6bf0d97d..daf522348 100644
--- a/template/en/default/reports/series.html.tmpl
+++ b/template/en/default/reports/series.html.tmpl
@@ -17,16 +17,14 @@
 [% PROCESS "reports/series-common.html.tmpl"
    newtext = "New (name below)" 
  %]
-  
-<table cellpadding="2" cellspacing="2" border="0"
-       style="text-align: left; margin-left: 20px">
-  <tbody>
+
+<table id="edit_series">
     <tr>
-      <th>Category:</th>
+      <th>Category</th>
+      <th></th>
+      <th>Sub-category</th>
+      <th>Name</th>
       <th></th>
-      <th>Sub-category:</th>
-      <th>Name:</th>
-      <td></td>
     </tr>
     <tr>
       [% PROCESS series_select sel = { name => 'category',
@@ -38,41 +36,40 @@
                    id="action-edit">
           </noscript>
         </td>
-        
+
       [% PROCESS series_select sel = { name => 'subcategory', 
                                        size => 5,
                                        onchange => "checkNewState()" } %]
-        
-      <td valign="top" name="name">
+
+      <td>
         <input type="text" name="name" maxlength="64" 
                value="[% default.name.0 FILTER html %]" size="25">
       </td>
 
-      <td valign="top">
-        <span style="font-weight: bold;">Run every</span> &nbsp;
-        <input type="text" size="2" name="frequency"
+      <td>
+        Run every
+        <input type="text" size="2" id="frequency" name="frequency"
                value="[% (default.frequency.0 OR 7) FILTER html %]">
-        <span style="font-weight: bold;">&nbsp;day(s)</span><br>
+        day(s)<br>
         [%# Change 'admin' here and in Series.pm, or remove the check
             completely, if you want to change who can make series public. %]
-        [% IF user.in_group('admin') %]      
+        [% IF user.in_group('admin') %]
           <input type="checkbox" name="public"
                  [%+ "checked='checked'" IF default.public.0 %]>
-          <span style="font-weight: bold;">Visible to all<br>
-          (within group restrictions)</span> 
+          Visible to all<br>
+          (within group restrictions)
         [% END %]
       </td>
     </tr>
 
     <tr>
       <td>
-        <input type="text" style="width: 100%" name="newcategory" 
-               maxlength="64" value="[% default.newcategory.0 FILTER html %]">
+        <input type="text" name="newcategory" maxlength="64"
+               value="[% default.newcategory.0 FILTER html %]">
       </td>
-        <td></td>
+      <td></td>
       <td>
-        <input type="text" style="width: 100%" name="newsubcategory"
-               maxlength="64" 
+        <input type="text" name="newsubcategory" maxlength="64"
                value="[% default.newsubcategory.0 FILTER html %]">
       </td>
       <td></td>
@@ -81,5 +78,4 @@
                value="[% button_name FILTER html %]">
       </td>
     </tr>
-  </tbody>
 </table>