Bug 840407 (part 2): Remove the "align" and "valign" attributes from extensions

r/a=justdave

5 files changed, 25 insertions, 13 deletions

diff --git a/extensions/Example/template/en/default/hook/global/footer-end.html.tmpl b/extensions/Example/template/en/default/hook/global/footer-end.html.tmpl
index f4cb1e006..fd4ec8639 100644
--- a/extensions/Example/template/en/default/hook/global/footer-end.html.tmpl
+++ b/extensions/Example/template/en/default/hook/global/footer-end.html.tmpl
@@ -8,7 +8,7 @@
 
 [% USE date %]
 
-<p align="center">
+<p class="center">
   <em>[% component.callers.first FILTER html %]</em> processed
   on [% date.format(date.now, '%b %d, %Y at %H:%M:%S') FILTER html %].
   <br>
diff --git a/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl b/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
index 9a8373bac..c46da75ae 100644
--- a/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl
@@ -11,16 +11,16 @@
   product.votesperuser = 0
   product.votestoconfirm = 0
 %]
-  
+
 <tr>
-  <th align="right">Maximum votes per person:</th>
+  <th>Maximum votes per person:</th>
   <td><input size="5" maxlength="5" name="votesperuser" id="votesperuser"
              value="[% product.votesperuser FILTER html %]">
   </td>
 </tr>
 
 <tr>
-  <th align="right">
+  <th>
     Maximum votes a person can put on a single [% terms.bug %]:
   </th>
   <td><input size="5" maxlength="5" name="maxvotesperbug" id="maxvotesperbug"
@@ -30,7 +30,7 @@
 
 <tr id="votes_to_confirm_container"
     [%- ' class="bz_default_hidden"' IF !product.allows_unconfirmed %]>
-  <th align="right">
+  <th>
     Confirm [% terms.abug %] if it gets this many votes:
   </th>
   <td>
diff --git a/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl b/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl
index 2ba784f77..cb1d2380e 100644
--- a/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl
+++ b/extensions/Voting/template/en/default/pages/voting/bug.html.tmpl
@@ -20,10 +20,11 @@
 [% PROCESS global/header.html.tmpl
            title = "Show Votes"
            subheader = subheader
+           style_urls = [ "extensions/Voting/web/style.css" ]
  %]
 
 [% total = 0 %]
-<table cellspacing="4">
+<table id="bug_votes">
   <tr>
     <th>Who</th>
     <th>Number of votes</th>
@@ -38,7 +39,7 @@
           [% voter.login_name FILTER email FILTER html %]
         </a>
       </td>
-      <td align="right">
+      <td class="right">
         [% voter.vote_count FILTER html %]
       </td>
     </tr>
diff --git a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
index b08b4c878..b5e8fc9bc 100644
--- a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
+++ b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
@@ -51,11 +51,11 @@
   <form name="voting_form" method="post" action="page.cgi?id=voting/user.html">
     <input type="hidden" name="action" value="vote">
     <input type="hidden" name="token" value="[% issue_hash_token(['vote']) FILTER html %]">
-    <table cellspacing="4">
+    <table id="user_votes">
       <tr>
-        <td></td>
+        <th></th>
         <th>Votes</th>
-        <th>[% terms.Bug %] #</th>
+        <th>[% terms.Bug %]&nbsp;#</th>
         <th>Summary</th>
       </tr>
 
@@ -95,7 +95,8 @@
                 [% END %]
               [%- END %]
             </td>
-            <td align="right"><a name="vote_[% bug.id FILTER none %]">
+            <td>
+              <a name="vote_[% bug.id FILTER none %]">
               [% IF canedit %]
                 [% IF product.onevoteonly %]
                   <input type="checkbox" name="[% bug.id FILTER none %]" value="1"
@@ -107,8 +108,9 @@
               [% ELSE %]
                 [% bug.count FILTER html %]
               [% END %]
-            </a></td>
-            <td align="center">
+              </a>
+            </td>
+            <td class="right">
               [% PROCESS bug/link.html.tmpl bug = bug, link_text = bug.id %]
             </td>
             <td>
diff --git a/extensions/Voting/web/style.css b/extensions/Voting/web/style.css
index 3f06200ca..22458fd90 100644
--- a/extensions/Voting/web/style.css
+++ b/extensions/Voting/web/style.css
@@ -19,3 +19,12 @@ tr.bz_bug_being_voted_on td {
 #votes_container { 
     white-space: nowrap; 
 }
+
+#user_votes th {
+    text-align: center;
+}
+
+#user_votes th, #user_votes td,
+#bug_votes th, #bug_votes td {
+    padding: 0.2em;
+}