Bug 249875: buglist does not pass w3c validation

Patch By Anne van Kesteren <bug@annevankesteren.nl> r=LpSolit, a=myk

3 files changed, 18 insertions, 25 deletions

diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index c2c8bf4d8..d92d0f58d 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -24,7 +24,7 @@
 [% dontchange = "--do_not_change--" %]
 <input type="hidden" name="dontchange" value="[% dontchange FILTER html %]">
 
-<script type="text/javascript" language="JavaScript">
+<script type="text/javascript">
   var numelements = document.forms.changeform.elements.length;
   function SetCheckboxes(value) {
       var item;
@@ -39,16 +39,15 @@
 
 <hr>
 
-<p><font size="-1">
-  To change multiple [% terms.bugs %]:
-  <ol>
-    <li>Check the [% terms.bugs %] you want to change above.</li>
-    <li>Make your changes in the form fields below.  If the change
-        you are making requires an explanation, include it in
-        the comments box.</li>
-    <li>Click the <em>Commit</em> button.</li>
-  </ol>
-</font></p>
+<p style="font-size:smaller">
+ To change multiple [% terms.bugs %]:</p>
+<ol style="font-size:smaller">
+  <li>Check the [% terms.bugs %] you want to change above.</li>
+  <li>Make your changes in the form fields below.  If the change
+   you are making requires an explanation, include it in
+   the comments box.</li>
+  <li>Click the <em>Commit</em> button.</li>
+</ol>
 
 <table id="form">
   <tr>
@@ -185,7 +184,7 @@
 
 </table>
 
-<label for="comment"><b>Additional Comments:</b></label><br>
+<b><label for="comment">Additional Comments:</label></b><br>
 <textarea id="comment" name="comment" rows="5" cols="80"></textarea><br>
 
 [% IF groups.size > 0 %]
@@ -193,10 +192,10 @@
   <b>Groupset:</b><br>
   <table border="1">
     <tr>
-      <th>Don't<br>change<br>this group<br>restriction</td>
-      <th>Remove<br>[% terms.bugs %]<br>from this<br>group</td>
-      <th>Add<br>[% terms.bugs %]<br>to this<br>group</td>
-      <th>Group Name:</td>
+      <th>Don't<br>change<br>this group<br>restriction</th>
+      <th>Remove<br>[% terms.bugs %]<br>from this<br>group</th>
+      <th>Add<br>[% terms.bugs %]<br>to this<br>group</th>
+      <th>Group Name:</th>
     </tr>
 
     [% FOREACH group = groups %]
@@ -230,8 +229,8 @@
   </table>
 
   [% IF foundinactive %]
-    <font size="-1">(Note: [% terms.Bugs %] may not be added to [% FILTER inactive %]inactive
-    groups[% END %], only removed.)</font><br>
+    <p style="font-size:smaller">(Note: [% terms.Bugs %] may not be added to [% FILTER inactive %]inactive
+    groups[% END %], only removed.)</p>
   [% END %]
 
 [% END %]
@@ -327,7 +326,6 @@
   <input type="submit" name="action" value="[% Param('move-button-text') %]">
 [% END %]
 
-
 [%############################################################################%]
 [%# Select Menu Block                                                        #%]
 [%############################################################################%]
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 24d00feb6..602475d0d 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -124,7 +124,6 @@
 [%# Navigation Bar                                                           #%]
 [%############################################################################%]
 
-<p>
 <table>
   <tr>
     [% IF bugs.size > 0 %]
@@ -194,7 +193,6 @@
     [% END %]  
   </tr>
 </table>
-</p>  
 
 
 [%############################################################################%]
@@ -202,4 +200,3 @@
 [%############################################################################%]
 
 [% PROCESS global/footer.html.tmpl %]
-
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index 56ab2ee49..1a95fecd3 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -176,8 +176,7 @@
     </td>
 
     [% FOREACH column = displaycolumns %]
-    <td>
-      [% '<nobr>' IF NOT abbrev.$column.wrap %]
+    <td [% 'style="white-space: nowrap"' IF NOT abbrev.$column.wrap %]>
       [% IF abbrev.$column.format_value %] 
         [%- bug.$column FILTER format(abbrev.$column.format_value) FILTER html -%] 
       [% ELSIF column == 'actual_time' ||
@@ -187,7 +186,6 @@
       [% ELSE %]
         [%- bug.$column.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%]
       [% END %]
-      [%- '</nobr>' IF NOT abbrev.$column.wrap %]
     </td>
     [% END %]