more porting work

4 files changed, 71 insertions, 3 deletions

diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl
index defc94cc3..19f199692 100644
--- a/template/en/default/search/field.html.tmpl
+++ b/template/en/default/search/field.html.tmpl
@@ -115,7 +115,7 @@
       <select name="[% field.name FILTER html%]" 
               id="[% field.name FILTER html %]" 
         [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %]
-        multiple="multiple" size="7">
+        multiple="multiple" size="9">
         [% legal_values = ${field.name} %]
         [% IF field.name == "component" %]
           [% legal_values = ${"component_"} %]
diff --git a/template/en/default/search/search-google.html.tmpl b/template/en/default/search/search-google.html.tmpl
new file mode 100644
index 000000000..080887abb
--- /dev/null
+++ b/template/en/default/search/search-google.html.tmpl
@@ -0,0 +1,57 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is the Mozilla Foundation
+  # Portions created by the Initial Developers are Copyright (C) 2011 the
+  # Initial Developer. All Rights Reserved.
+  #
+  # Contributor(s):
+  #   Dave Lawrence <dkl@mozilla.com>
+  #%] 
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% PROCESS global/header.html.tmpl 
+  title = "Search " _ terms.Bugs _ " using Google"
+%]
+
+[% WRAPPER search/tabs.html.tmpl %]
+
+<p>
+  Use the <a href="http://www.google.com">Google</a> search engine to search 
+  for [% terms.Bugzilla +%] [%+ terms.bugs %]. Find the [% terms.bugs %] you are
+  looking for by entering words that best describe it.
+</p>
+
+<p>
+  For example, if the [% terms.bug %] you are looking for is a browser crash when 
+  you go to a secure web site with an embedded Flash animation, you might search 
+  for "crash secure SSL flash".
+</p>
+
+<p>
+  <span style="color:red;">*</span>
+  Google only indexes publicly viewable [% terms.bugs %] and all may not be represented.
+<p>
+
+<form method="get" action="http://www.google.com/search">
+<input type="hidden" name="sitesearch" value="bugzilla.mozilla.org">
+  <nobr>
+    <input type="text" name="q" size="60" maxlength="255" value="">
+    <input type="submit" value="Search">
+  </nobr>
+</form>
+
+[% END %]
+
+[% PROCESS global/footer.html.tmpl %]
+
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 31d950ec5..277a90960 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -98,7 +98,7 @@ for "crash secure SSL flash".
       <label for="content">Words:</label>
     </th>
     <td>
-      <input name="content" size="40" id="content"
+      <input name="content" size="60" id="content"
              value="[% default.content.0 FILTER html %]">
       <script type="text/javascript"> <!--
           document.forms['queryform'].content.focus(); 
@@ -107,6 +107,15 @@ for "crash secure SSL flash".
     </td>
   </tr>
   <tr>
+    <td>&nbsp;</td>
+    <td>
+      <input type="hidden" name="comments" value="0">
+      <input type="checkbox" id="comments" name="comments"
+             value="1" [% 'checked' IF cgi.param("comments") %]>
+      <label for="comments">Search comments</label>
+    </td>
+  </tr>
+  <tr>
     <td></td>
     <td>
     
diff --git a/template/en/default/search/tabs.html.tmpl b/template/en/default/search/tabs.html.tmpl
index 119b30fde..6a2f7f70a 100644
--- a/template/en/default/search/tabs.html.tmpl
+++ b/template/en/default/search/tabs.html.tmpl
@@ -27,7 +27,9 @@
      tabs = [ { name => 'specific', label => "Simple Search",
                 link => "query.cgi?format=specific" },
               { name => 'advanced', label => "Advanced Search",
-                link => "query.cgi?format=advanced" } ]
+                link => "query.cgi?format=advanced" }, 
+              { name => 'google',  label => 'Google Search', 
+                link => "query.cgi?format=google" } ]
      current_tab_name = query_format || format || "advanced"
 %]