Merge branch '4.4.9-to-5.0-vanilla-nohist' into 5.0-migration

Move @gentoo.org restriction for new accounts into the Gentoo extentions.
Reset some templates to vanilla/default. We'll use custom ones from now on

1 files changed, 13 insertions, 14 deletions

diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl
index 4efdcf9f5..35c141265 100644
--- a/template/en/default/reports/duplicates.html.tmpl
+++ b/template/en/default/reports/duplicates.html.tmpl
@@ -27,10 +27,7 @@
   [% title = "Most Frequently Reported $terms.Bugs" %]
 [% END%]
 
-[% PROCESS global/header.html.tmpl
-   title = title
-   style_urls = ['skins/standard/duplicates.css']
-%]
+[% PROCESS global/header.html.tmpl title = title %]
 
 <p>
   <a href="#explanation">What is this data?</a>
@@ -52,6 +49,18 @@
   <input type="hidden" name="bug_id" value="[% bug_ids_string FILTER html %]">
   <table>
     <tr>
+      <td>Restrict to products:</td>
+      <td>
+        [% INCLUDE "global/product-select.html.tmpl"
+          id       => "product"
+          name     => "product"
+          multiple => 5
+          value    => product
+        %]
+      </td>
+    </tr>
+
+    <tr>
       <td>When sorting or restricting, work with:</td>
       <td>
         <input type="radio" name="sortvisible" id="entirelist" value="0"
@@ -66,16 +75,6 @@
           currently visible list
         </label>
       </td>
-      <td rowspan="4" valign="top">Restrict to products:</td>
-      <td rowspan="4" valign="top">
-        <select name="product" size="5" multiple="multiple">
-          [% FOREACH p = user.get_selectable_products %]
-            <option name="[% p.name FILTER html %]"
-            [% ' selected="selected"' IF product.contains(p.name) %]
-            >[% p.name FILTER html %]</option>
-          [% END %]
-        </select>
-      </td>
      </tr>
 
     <tr>