From f3f8239ff36c892c0437fc8054a68e07d7ca0020 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Mon, 7 Apr 2014 14:42:08 +0000
Subject: Bug 990982 - backport bug 539894 to bmo (Use <optgroup/> to group
 products into classifications in the product drop-down on show_bug.cgi)
 r=glob

---
 .../en/default/search/search-instant.html.tmpl     | 28 ++++-----------------
 .../en/default/search/search-specific.html.tmpl    | 29 ++++------------------
 2 files changed, 10 insertions(+), 47 deletions(-)

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

diff --git a/template/en/default/search/search-instant.html.tmpl b/template/en/default/search/search-instant.html.tmpl
index 5d75d1996..94cb619d0 100644
--- a/template/en/default/search/search-instant.html.tmpl
+++ b/template/en/default/search/search-instant.html.tmpl
@@ -41,29 +41,11 @@ YAHOO.bugzilla.instantSearch.setLabels( {
       <b><label for="product">Product:</label></b>
     </td>
     <td>
-      <select name="product" id="product">
-        [% IF Param('useclassification') %]
-          [% FOREACH c = classification %]
-            <optgroup label="[% c.name FILTER html %]">
-            [% FOREACH p = user.get_selectable_products(c.id) %]
-              [% IF p.components.size %]
-                <option value="[% p.name FILTER html %]"
-                  [% " selected" IF lsearch(default.product, p.name) != -1 %]>
-                  [% p.name FILTER html %]
-                </option>
-              [% END %]
-            [% END %]
-            </optgroup>
-          [% END %]
-        [% ELSE %]
-          [% FOREACH p = product %]
-            <option value="[% p.name FILTER html %]"
-              [% " selected" IF lsearch(default.product, p.name) != -1 %]>
-              [% p.name FILTER html %]
-            </option>
-          [% END %]
-        [% END %]
-      </select>
+      [% INCLUDE "global/product-select.html.tmpl"
+        id    => "product"
+        name  => "product"
+        value => default.product.0
+      %]
     </td>
   </tr>
   <tr>
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 7e5de2c4a..ea522a877 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -67,30 +67,11 @@ for "crash secure SSL flash".
       <label for="product">[% field_descs.product FILTER html %]:</label>
     </th>
     <td>
-      <select name="product" id="product">
-        <option value="">All</option>
-        [% IF Param('useclassification') %]
-          [% FOREACH c = classification %]
-            <optgroup label="[% c.name FILTER html %]">
-            [% FOREACH p = user.get_selectable_products(c.id) %]
-              [% IF p.components.size %]
-                <option value="[% p.name FILTER html %]"
-                  [% " selected" IF default.product.contains(p.name) %]>
-                  [% p.name FILTER html %]
-                </option>
-              [% END %]
-            [% END %]
-            </optgroup>
-          [% END %]
-        [% ELSE %]
-          [% FOREACH p = product %]
-            <option value="[% p.name FILTER html %]"
-              [% " selected" IF default.product.contains(p.name) %]>
-              [% p.name FILTER html %]
-            </option>
-          [% END %]
-        [% END %]
-      </select>
+      [% INCLUDE "global/product-select.html.tmpl"
+         id   => "product"
+         name => "product"
+         add  => "All"
+      %]
     </td>
   </tr>
   <tr>
-- 
cgit v1.2.3-24-g4f1b