Bug 956190 (part 4): Merge duplicates.css, reports.css, search_form.css, show_multiple.css and summarize-time.css with buglist.css

7 files changed, 10 insertions, 13 deletions

diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl
index 86f293aa1..90156238d 100644
--- a/template/en/default/search/field.html.tmpl
+++ b/template/en/default/search/field.html.tmpl
@@ -23,7 +23,7 @@
     <input name="[% field.name FILTER html %]" 
            id="[% field.name FILTER html %]" size="40"
            [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %]
-           value="[% value FILTER html %]">              
+           value="[% value FILTER html %]" [% 'autofocus' IF focus %]>
   [% CASE constants.FIELD_TYPE_KEYWORDS %]
     [% INCLUDE "bug/field-label.html.tmpl"
       field = field
@@ -39,7 +39,7 @@
        <input name="[% field.name FILTER html %]" 
               id="[% field.name FILTER html %]" size="40"
               [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %]
-              value="[% value FILTER html %]">
+              value="[% value FILTER html %]" [% 'autofocus' IF focus %]>
        <div id="[% field.name FILTER html %]_autocomplete"></div>
     </div>
     <script type="text/javascript" defer="defer">
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index fcb038638..0420811ee 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -52,11 +52,8 @@ TUI_hide_default('information_query');
          value = default.short_desc.0
          type_selected = default.short_desc_type.0 
          accesskey = "s"
-         %]
-      <script type="text/javascript"> <!--
-          document.getElementById('short_desc').focus();
-      // -->
-      </script>
+         focus = 1
+      %]
 
       [% IF button_name %]
         <input type="submit" id="[% button_name FILTER css_class_quote %]_top"
@@ -165,7 +162,7 @@ TUI_hide_default('information_query');
 
   <div class="search_field_row">
     <span class="field_label"><label for="bug_id">[% terms.Bugs %] numbered</label></span>
-    <div id="bug_id_container" >
+    <div id="bug_id_container">
       <input type="text" name="bug_id" id="bug_id"
            value="[% default.bug_id.0 FILTER html %]" size="20">
            <div class="field_help">(comma-separated list)</div>
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index a48685719..7c1ca6e0a 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -29,7 +29,7 @@ function remove_token() {
   yui = [ 'autocomplete', 'calendar' ]
   javascript = javascript
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js"]
-  style_urls = [ "skins/standard/search_form.css" ]
+  style_urls = ['skins/standard/buglist.css']
   doc_section = "using.html#searching-for-bugs"
 %]
 
diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl
index 3c9c933d7..9f89000da 100644
--- a/template/en/default/search/search-create-series.html.tmpl
+++ b/template/en/default/search/search-create-series.html.tmpl
@@ -22,7 +22,7 @@
   yui = [ 'autocomplete', 'calendar' ]
   javascript = js_data 
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
-  style_urls = [ "skins/standard/reports.css", "skins/standard/search_form.css" ]
+  style_urls = ['skins/standard/buglist.css']
   doc_section = "using.html#creating-new-data-sets"
 %]
 
diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl
index a5e91f790..f1b77985d 100644
--- a/template/en/default/search/search-report-graph.html.tmpl
+++ b/template/en/default/search/search-report-graph.html.tmpl
@@ -21,7 +21,7 @@ var queryform = "reportform"
   yui = [ 'autocomplete', 'calendar' ]
   javascript = js_data
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
-  style_urls = [ "skins/standard/search_form.css" ]
+  style_urls = ['skins/standard/buglist.css']
   doc_section = "using.html#reports"
 %]
 
diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl
index de5d357fd..0db9871f9 100644
--- a/template/en/default/search/search-report-table.html.tmpl
+++ b/template/en/default/search/search-report-table.html.tmpl
@@ -21,7 +21,7 @@ var queryform = "reportform"
   yui = [ 'autocomplete', 'calendar' ]
   javascript = js_data
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
-  style_urls = [ "skins/standard/search_form.css" ]
+  style_urls = ['skins/standard/buglist.css']
   doc_section = "using.html#reports"
 %]
 
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 54a769b81..4d1b4c7ef 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -8,7 +8,7 @@
 
 [% PROCESS global/header.html.tmpl 
   title = "Simple Search"
-  style_urls = [ "skins/standard/search_form.css" ]
+  style_urls = ['skins/standard/buglist.css']
 %]
 
 [% WRAPPER search/tabs.html.tmpl %]