From 5a15633a1179f960e1726eebf7f38c7ee2f2b4f8 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sat, 28 Dec 2013 20:55:54 +0100
Subject: Bug 952795: Remove all style="..." attributes from HTML elements
 r/a=justdave

---
 template/en/default/admin/flag-type/edit.html.tmpl | 25 ++++++++++------------
 template/en/default/admin/params/common.html.tmpl  |  4 ++--
 template/en/default/admin/params/general.html.tmpl |  3 +--
 .../en/default/admin/products/updated.html.tmpl    |  2 +-
 template/en/default/admin/table.html.tmpl          |  4 ++--
 template/en/default/admin/users/edit.html.tmpl     |  2 +-
 6 files changed, 18 insertions(+), 22 deletions(-)

(limited to 'template/en/default/admin')

diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index 2e9771384..ec19c0496 100644
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -23,10 +23,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = title
-  style = "
-    table#form th { text-align: right; vertical-align: baseline; white-space: nowrap; }
-    table#form td { text-align: left; vertical-align: baseline; }
-  "
+  style_urls = ['skins/standard/admin.css']
   onload="var f = document.forms['flagtype_properties'];
           selectProduct(f.product, f.component, null, null, '__Any__');"
   javascript_urls=["js/productform.js"]
@@ -49,7 +46,7 @@
 
   [%# Add a hidden button at the top of the form so that the user pressing "return"
     # really submit the form, as expected. %]
-  <input type="submit" id="commit" value="Submit" style="display: none;">
+  <input type="submit" id="commit" value="Submit" class="bz_default_hidden">
 
   <table id="form" cellspacing="0" cellpadding="4" border="0">
     <tr>
@@ -90,8 +87,8 @@
         [% END %]
         <table>
           <tr>
-            <td style="vertical-align: top;">
-              <b>Product/Component:</b><br>
+            <th class="top left">
+              Product/Component:<br>
               <select name="product" onchange="selectProduct(this, this.form.component, null, null, '__Any__');">
                 <option value="">__Any__</option>
                 [% FOREACH prod = products %]
@@ -108,19 +105,19 @@
                                    name="categoryAction-include" value="Include">
               <input type="submit" id="categoryAction-exclude"
                                    name="categoryAction-exclude" value="Exclude">
-            </td>
-            <td style="vertical-align: top;">
-              <b>Inclusions:</b><br>
+            </th>
+            <th class="top left">
+              Inclusions:<br>
               [% PROCESS category_select name="inclusion_to_remove" categories = inclusions %]<br>
               <input type="submit" id="categoryAction-removeInclusion" 
                      name="categoryAction-removeInclusion" value="Remove Inclusion">
-            </td>
-            <td style="vertical-align: top;">
-              <b>Exclusions:</b><br>
+            </th>
+            <th class="top left">
+              Exclusions:<br>
               [% PROCESS category_select name="exclusion_to_remove" categories = exclusions %]<br>
               <input type="submit" id="categoryAction-removeExclusion" 
                      name="categoryAction-removeExclusion" value="Remove Exclusion">
-            </td>
+            </th>
           </tr>
         </table>
       </td>
diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl
index 5f6f1bfc0..db3bde777 100644
--- a/template/en/default/admin/params/common.html.tmpl
+++ b/template/en/default/admin/params/common.html.tmpl
@@ -69,14 +69,14 @@
                 [% END %]
               </select>
             </td>
-            <td style="vertical-align: bottom">
+            <td class="bottom">
               <button type="button"
                       onClick="sortedList_moveItem('[% param.name FILTER html %]', -1, '[% sortlist_separator %]');">&uarr;</button>
             </td>
           </tr>
 
           <tr>
-            <td style="vertical-align: top">
+            <td class="top">
               <button type="button"
                       onClick="sortedList_moveItem('[% param.name FILTER html %]', +1, '[% sortlist_separator %]');">&darr;</button>
             </td>
diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl
index 369e495c7..9de306d1d 100644
--- a/template/en/default/admin/params/general.html.tmpl
+++ b/template/en/default/admin/params/general.html.tmpl
@@ -49,8 +49,7 @@
     _ " green text inside a red box, or <em>class=\"bz_private\"</em> for"
     _ " dark red on a red background.  Anything defined in "
     _ " <code>skins/standard/global.css</code> or <code>skins/custom/global.css</code>"
-    _ " will work.  To get centered text, use <em>style=\"text-align: "
-    _  " center;\"</em>.",
+    _ " will work.  To get centered text, use <em>class=\"center\"</em>.",
 
   upgrade_notification => 
     "$terms.Bugzilla can inform you when a new release is available."
diff --git a/template/en/default/admin/products/updated.html.tmpl b/template/en/default/admin/products/updated.html.tmpl
index 4d2280163..cc0c9f8ea 100644
--- a/template/en/default/admin/products/updated.html.tmpl
+++ b/template/en/default/admin/products/updated.html.tmpl
@@ -39,7 +39,7 @@
   <p>
     Updated description to:
   </p>
-  <p style="margin: 1em 3em 1em 3em">[% product.description FILTER html_light %]</p>
+  <p class="indented">[% product.description FILTER html_light %]</p>
 [% END %]
 
 [% IF changes.isactive.defined %]
diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl
index b8492dcb2..3981ef4bb 100644
--- a/template/en/default/admin/table.html.tmpl
+++ b/template/en/default/admin/table.html.tmpl
@@ -67,11 +67,11 @@
 
 [%###################  TABLE HEADER   ######################%]
 
-<table id="admin_table" border="1" cellpadding="4" cellspacing="0">
+<table id="admin_table">
   <tr class="column_header">
     [% FOREACH c = columns %]
       [%# Default to align left for headers %]
-      <th style="text-align:[% (c.align || 'left') FILTER html %];">
+      <th class="[% (c.align || 'left') FILTER css_class_quote %]">
         [% c.heading FILTER html %]
       </th>
     [% END %]
diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl
index b75f8400d..e301ed21e 100644
--- a/template/en/default/admin/users/edit.html.tmpl
+++ b/template/en/default/admin/users/edit.html.tmpl
@@ -52,7 +52,7 @@
           </tr>
           <tr>
             [% IF editusers %]
-              <td style="text-align: center; font-weight: bold">|</td>
+              <th class="checkbox">|</th>
             [% END %]
             <th colspan="2">User is a member of these groups</th>
           </tr>
-- 
cgit v1.2.3-24-g4f1b