From 4fa178ae3f0f612cf91b26a2dea498602794be3b Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 31 Dec 2013 13:48:41 +0100
Subject: Bug 920681: Remove the cellspacing and cellpadding attributes from
 tables r/a=justdave

---
 template/en/default/global/code-error.html.tmpl    |  15 ++-
 .../en/default/global/confirm-user-match.html.tmpl |  22 +----
 template/en/default/global/footer.html.tmpl        |  27 ++---
 template/en/default/global/header.html.tmpl        | 109 +++++++++------------
 template/en/default/global/tabs.html.tmpl          |   2 +-
 template/en/default/global/user-error.html.tmpl    |  12 +--
 6 files changed, 70 insertions(+), 117 deletions(-)

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

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 08ddace9d..eef5d27a0 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -440,15 +440,14 @@
   </script>
 </samp>
 
-<table cellpadding="20">
-  <tr>
-    <td id="error_msg" class="throw_error">
-      [% error_message FILTER none %]
-    </td>
-  </tr>
-</table>
+<div id="error_msg" class="throw_error">
+  [% error_message FILTER none %]
+</div>
+
+<p id="post_err_msg">
+  Traceback:
+</p>
 
-<p>Traceback:</p>
 <pre>[% traceback FILTER html %]</pre>
 
 [% IF variables %]
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index f02ea88ae..9db0bc923 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -79,21 +79,13 @@
   <p>Please go back and try other names or email addresses.</p>
 [% END %]
 
-  <table border="0">
-    <tr>
-      <td colspan="2">
-        <hr width="100%" size="1">
-      </td>
-    </tr>
-
-  [%# this is messy to allow later expansion %]
-
+<table id="user_match_table">
   [% FOREACH field = matches %]
     <tr>
-      <td align="left" valign="top">
+      <td>
         [% PROCESS field_names field_name=field.key %]:
       </td>
-      <td align="left" valign="top">
+      <td>
           [% FOREACH query = field.value %]
             <div class="user_match">
               <b>[% query.key FILTER html %]</b>
@@ -148,14 +140,8 @@
         [% END %]
       </td>
     </tr>
-    <tr>
-      <td colspan="2">
-        <hr width="100%" size="1">
-      </td>
-    </tr>
   [% END %]
-
-  </table>
+</table>
 
 [% IF matchsuccess == 1 %]
 
diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl
index e161a061c..7cc5e1b44 100644
--- a/template/en/default/global/footer.html.tmpl
+++ b/template/en/default/global/footer.html.tmpl
@@ -11,26 +11,17 @@
   # global/useful-links.html.tmpl.
   #%]
 
-  [% Hook.process('main-end') %]
-</div>
+      [% Hook.process('main-end') %]
+    </div>
 
-[%# Migration note: below this point, this file corresponds to the old Param
-  # 'footerhtml'
-  #%]
-
-<div id="footer">
-  <div class="intro">[% Hook.process('intro') %]</div>
-
-[%# Migration note: the old param 'blurbhtml' goes here %]
-
-[%# Migration note: useful-links.html.tmpl corresponds to %commandmenu% %]
-
-           [% PROCESS "global/useful-links.html.tmpl" %]
+    <div id="footer">
+      <div class="intro">[% Hook.process('intro') %]</div>
 
-  <div class="outro">[% Hook.process('outro') %]</div>
-</div>
+      [% PROCESS "global/useful-links.html.tmpl" %]
 
-[% Hook.process("end") %]
+      <div class="outro">[% Hook.process('outro') %]</div>
+    </div>
 
-</body>
+    [% Hook.process("end") %]
+  </body>
 </html>
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index dceb44db9..ea00eeef5 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -86,8 +86,6 @@
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     [% END %]
 
-[%# Migration note: contents of the old Param 'headerhtml' would go here %]
-
     [% PROCESS "global/site-navigation.html.tmpl" %]
 
     [% PROCESS 'global/setting-descs.none.tmpl' %]
@@ -215,75 +213,58 @@
     [% Hook.process("additional_header") %]
   </head>
 
-[%# Migration note: contents of the old Param 'bodyhtml' go in the body tag,
-  # but set the onload attribute in the DEFAULT directive above.
-  #%]
-
-  <body onload="[% onload %]"
+  <body [% IF onload %] onload="[% onload %]"[% END %]
         class="[% urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') FILTER css_class_quote %]
                [% FOREACH class = bodyclasses %]
-                 [% ' ' %][% class FILTER css_class_quote %]
+                 [%+ class FILTER css_class_quote %]
                [% END %] yui-skin-sam">
 
-[%# Migration note: the following file corresponds to the old Param
-  # 'bannerhtml'
-  #%]
-
-<div id="header">
-
-[% INCLUDE global/banner.html.tmpl %]
-
-<table border="0" cellspacing="0" cellpadding="0" id="titles">
-<tr>
-    <td id="title">
-      <p>[% terms.Bugzilla %]
-      [% " &ndash; $header" IF header %]</p>
-    </td>
-
-  [% IF subheader %]
-    <td id="subtitle">
-      <p class="subheader">[% subheader %]</p>
-    </td>
-  [% END %]
-
-  [% IF header_addl_info %]
-    <td id="information">
-      <p class="header_addl_info">[% header_addl_info %]</p>
-    </td>
-  [% END %]
-</tr>
-</table>
-
-<table id="lang_links_container" cellpadding="0" cellspacing="0"
-       class="bz_default_hidden"><tr><td>
-[% IF Bugzilla.languages.size > 1 %]
-  <ul class="links">
-  [% FOREACH lang = Bugzilla.languages.sort %]
-    <li>[% IF NOT loop.first %]<span class="separator"> | </span>[% END %]
-    [% IF lang == current_language %]
-      <span class="lang_current">[% lang FILTER html FILTER upper %]</span>
-    [% ELSE %]
-      <a href="#" onclick="set_language('[% lang FILTER none %]');">
-       [%- lang FILTER html FILTER upper %]</a>
+  <div id="header">
+    [% INCLUDE global/banner.html.tmpl %]
+
+    <div id="titles">
+      <span id="title">[% terms.Bugzilla %][% " &ndash; $header" IF header %]</span>
+
+      [% IF subheader %]
+        <span id="subtitle" class="subheader">[% subheader %]</span>
+      [% END %]
+
+      [% IF header_addl_info %]
+        <span id="information" class="header_addl_info">[% header_addl_info %]</span>
+      [% END %]
+    </div>
+
+    <div id="common_links">
+      [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]
+    </div>
+
+    [% IF Bugzilla.languages.size > 1 %]
+      <div id="lang_links_container" class="bz_default_hidden">
+        <ul class="links">
+          [% FOREACH lang = Bugzilla.languages.sort %]
+            <li>
+              [% IF NOT loop.first %]<span class="separator"> | </span>[% END %]
+              [% IF lang == current_language %]
+                <span class="lang_current">[% lang FILTER html FILTER upper %]</span>
+              [% ELSE %]
+                <a href="#" onclick="set_language('[% lang FILTER none %]');">
+                  [%- lang FILTER html FILTER upper %]</a>
+              [% END %]
+            </li>
+          [% END %]
+        </ul>
+      </div>
     [% END %]
-    </li>
-  [% END %]
-  </ul>
-[% END %]
-</td></tr></table>
-
-[% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]
-</div> [%# header %]
-
-<div id="bugzilla-body">
+  </div>
 
-[% IF Param('announcehtml') %]
-[% Param('announcehtml') FILTER none %]
-[% END %]
+  <div id="bugzilla-body">
+    [% IF Param('announcehtml') %]
+      [% Param('announcehtml') FILTER none %]
+    [% END %]
 
-[% IF message %]
-  <div id="message">[% message %]</div>
-[% END %]
+    [% IF message %]
+      <div id="message">[% message %]</div>
+    [% END %]
 
 [% BLOCK format_css_link %]
   [% IF style_url.match('/IE-fixes\.css') %]
diff --git a/template/en/default/global/tabs.html.tmpl b/template/en/default/global/tabs.html.tmpl
index 454066889..9cf5a897b 100644
--- a/template/en/default/global/tabs.html.tmpl
+++ b/template/en/default/global/tabs.html.tmpl
@@ -15,7 +15,7 @@
   #%]
 
 <div class="tabbed">
-  <table class="tabs" cellspacing="0" cellpadding="10" border="0" width="100%">
+  <table class="tabs">
     <tr>
       <td class="spacer">&nbsp;</td>
 
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 2018caee2..7d9aef817 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1930,15 +1930,11 @@
    admindocslinks = admindocslinks
 %]
 
-<table cellpadding="20">
-  <tr>
-    <td id="error_msg" class="throw_error">
-      [% error_message FILTER none %]
-    </td>
-  </tr>
-</table>
+<div id="error_msg" class="throw_error">
+  [% error_message FILTER none %]
+</div>
 
-<p>
+<p id="post_err_msg">
   Please press <b>Back</b> and try again.
 </p>
 
-- 
cgit v1.2.3-24-g4f1b