Bug 321691 duplicates.cgi doesn't use <th>

r=lpsolit a=justdave

2 files changed, 92 insertions, 98 deletions

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index a2cf6c0d3..cc4503bb7 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -104,10 +104,6 @@
 ],
 
 'reports/duplicates-table.html.tmpl' => [
-  '"&maxrows=$maxrows" IF maxrows',
-  '"&changedsince=$changedsince" IF changedsince',
-  '"&bug_id=$bug_ids_string&sortvisible=1" 
-                                                            IF sortvisible',
   'column.name', 
   'column.description',
   'bug.id', 
diff --git a/template/en/default/reports/duplicates-table.html.tmpl b/template/en/default/reports/duplicates-table.html.tmpl
index 6017a1e4e..80a85ff3c 100644
--- a/template/en/default/reports/duplicates-table.html.tmpl
+++ b/template/en/default/reports/duplicates-table.html.tmpl
@@ -48,101 +48,99 @@
 
 [% IF bug_ids.size > 0 %]
   <table border>
-    <tr bgcolor="#CCCCCC">
-      [% FOREACH column = [ { name => "id", description => "$terms.Bug #" },
-                            { name => "count", description => "Dupe<br>Count" },
-                            { name => "delta",
-                        description => "Change in last<br>$changedsince day(s)" },
-                            { name => "component", description => "Component" },
-                            { name => "bug_severity", description => "Severity" },
-                            { name => "op_sys", description => "Op Sys" },
-                            { name => "target_milestone",
-                              description => "Target<br>Milestone" },
-                            { name => "short_desc", description => "Summary" } ]
-       %]
-
-        [%# Small hack to keep delta column out if we don't need it %]
-        [% NEXT IF column.name == "delta" AND NOT dobefore %]
-
-        <td>
-          <center>
-            <b>
-              [% bug_ids_string = bug_ids.join(',') %]
-              <a href="duplicates.cgi?sortby=[% column.name %]
-                [% IF sortby == column.name %]
-                  [% "&amp;reverse=1" IF NOT reverse %]
-                [% ELSE %]
-                  [%-# Some columns start off reversed %]
-                  [% "&amp;reverse=1" IF column.name.match('delta|count') %]
-                [% END %]
-                [% "&amp;maxrows=$maxrows" IF maxrows %]
-                [% "&amp;changedsince=$changedsince" IF changedsince %]
-                [% "&amp;openonly=1" IF openonly %]
-                [% FOREACH p = query_products %]&amp;product=[% p FILTER html %][% END %]
-                [% IF format %]&amp;format=[% format FILTER html %][% END %]
-                [% "&amp;bug_id=$bug_ids_string&amp;sortvisible=1" 
-                                                            IF sortvisible %]">
-                [% column.description %]</a>
-            </b>
-          </center>
-        </td>
+    <thead>
+      <tr bgcolor="#CCCCCC">
+        [% FOREACH column = [ { name => "id", description => "$terms.Bug #" },
+                              { name => "count", description => "Dupe<br>Count" },
+                              { name => "delta",
+                                description => "Change in last<br>$changedsince day(s)" },
+                              { name => "component", description => "Component" },
+                              { name => "bug_severity", description => "Severity" },
+                              { name => "op_sys", description => "Op Sys" },
+                              { name => "target_milestone",
+                                description => "Target<br>Milestone" },
+                              { name => "short_desc", description => "Summary" } ]
+         %]
+
+          [%# Small hack to keep delta column out if we don't need it %]
+          [% NEXT IF column.name == "delta" AND NOT dobefore %]
+
+          <th>
+            [% bug_ids_string = bug_ids.join(',') %]
+            <a href="duplicates.cgi?sortby=[% column.name %]
+              [% IF sortby == column.name %]
+                [% "&amp;reverse=1" IF NOT reverse %]
+              [% ELSE %]
+                [%-# Some columns start off reversed %]
+                [% "&amp;reverse=1" IF column.name.match('delta|count') %]
+              [% END %]
+              [% IF maxrows %]&amp;maxrows=[% maxrows FILTER html %][% END %]
+              [% IF changedsince %]&amp;changedsince=[% changedsince FILTER html %][% END %]
+              [% "&amp;openonly=1" IF openonly %]
+              [% FOREACH p = query_products %]&amp;product=[% p FILTER html %][% END %]
+              [% IF format %]&amp;format=[% format FILTER html %][% END %]
+              [% IF sortvisible %]&amp;bug_id=[% bug_ids_string FILTER html %]&amp;sortvisible=1[% END %]">
+              [% column.description %]</a>
+          </th>
+        [% END %]
+      </tr>
+    </thead>
+
+    [% IF NOT sortby %]
+      [% sortby = "count"; reverse = "1" %]
+    [% END %]
+
+    [% IF sortby == "id" OR sortby == "count" OR sortby == "delta" %]
+      [%# Numeric sort %]
+      [% sortedbugs = bugs.nsort(sortby) %]
+    [% ELSE %]
+      [% sortedbugs = bugs.sort(sortby) %]
+    [% END %]
+
+    [% IF reverse %]
+      [% bugs = sortedbugs.reverse %]
+    [% ELSE %]
+      [% bugs = sortedbugs %]
+    [% END %]
+
+    [%# *** Buglist *** %]
+    <tbody>
+
+      [%# We need to keep track of the bug IDs we are actually displaying, because
+        # if the user decides to sort the visible list, we need to know what that
+        # list actually is. %]
+      [% vis_bug_ids = [] %]
+
+      [% FOREACH bug = bugs %]
+        [% LAST IF loop.index() >= maxrows %]
+        [% vis_bug_ids.push(bug.id) %]
+
+        <tr [% "class='resolved'" IF bug.resolution != "" %]>
+          <td>
+            <center>
+              [% isclosed = bug.resolution != "" %]
+              <a href="show_bug.cgi?id=[% bug.id %]">[% bug.id FILTER closed(isclosed) %]</a>
+            </center>
+          </td>
+
+          <td>
+            <center>
+              [% bug.count %]
+            </center>
+          </td>
+
+          [% IF dobefore %]
+            <td><center>[% bug.delta %]</center></td>
+          [% END %]
+
+          <td>[% bug.component FILTER html %]</td>
+          <td><center>[% bug.bug_severity FILTER html %]</center></td>
+          <td><center>[% bug.op_sys FILTER html %]</center></td>
+          <td><center>[% bug.target_milestone FILTER html %]</center></td>
+          <td>[% bug.short_desc FILTER html %]</td>
+        </tr>
       [% END %]
-    </tr>
-
-  [% IF NOT sortby %]
-    [% sortby = "count"; reverse = "1" %]
-  [% END %]
-
-  [% IF sortby == "id" OR sortby == "count" OR sortby == "delta" %]
-    [%# Numeric sort %]
-    [% sortedbugs = bugs.nsort(sortby) %]
-  [% ELSE %]
-    [% sortedbugs = bugs.sort(sortby) %]
-  [% END %]
-
-  [% IF reverse %]
-    [% bugs = sortedbugs.reverse %]
-  [% ELSE %]
-    [% bugs = sortedbugs %]
-  [% END %]
-
-  [%# *** Buglist *** %]
-
-  [%# We need to keep track of the bug IDs we are actually displaying, because
-    # if the user decides to sort the visible list, we need to know what that
-    # list actually is. %]
-  [% vis_bug_ids = [] %]
-
-  [% FOREACH bug = bugs %]
-    [% LAST IF loop.index() >= maxrows %]
-    [% vis_bug_ids.push(bug.id) %]
-
-    <tr [% "class='resolved'" IF bug.resolution != "" %]>
-      <td>
-        <center>
-          [% isclosed = bug.resolution != "" %]
-          <a href="show_bug.cgi?id=[% bug.id %]">[% bug.id FILTER closed(isclosed) %]</a>
-        </center>
-      </td>
-
-      <td>
-        <center>
-          [% bug.count %]
-        </center>
-      </td>
-
-      [% IF dobefore %]
-        <td><center>[% bug.delta %]</center></td>
-      [% END %]
-
-      <td>[% bug.component FILTER html %]</td>
-      <td><center>[% bug.bug_severity FILTER html %]</center></td>
-      <td><center>[% bug.op_sys FILTER html %]</center></td>
-      <td><center>[% bug.target_milestone FILTER html %]</center></td>
-      <td>[% bug.short_desc FILTER html %]</td>
-    </tr>
-  [% END %]
-
+    </tbody>
   </table>
 [% ELSE %]
   <h3>No duplicate [% terms.bugs %] found.</h3>