From 153d2be457ffff521dfccbb1e7c3d325c50412ca Mon Sep 17 00:00:00 2001
From: Guy Pyrzak <guy.pyrzak@gmail.com>
Date: Sun, 29 Aug 2010 14:14:14 -0700
Subject: Bug 571636: Make the Advanced Search UI follow a grid design
 r=mkanat, a=mkanat

---
 template/en/default/search/field.html.tmpl | 4 ++--
 template/en/default/search/form.html.tmpl  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'template/en')

diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl
index d4a1a30b7..defc94cc3 100644
--- a/template/en/default/search/field.html.tmpl
+++ b/template/en/default/search/field.html.tmpl
@@ -87,7 +87,7 @@
                         onclick="showCalendar('[% field.name FILTER js %]')">
            <span>Calendar</span>
          </button>
-         <div id="con_calendar_[% field.name FILTER html %]"></div>               
+         <span id="con_calendar_[% field.name FILTER html %]"></span>               
     to <input name="[% field.name FILTER html %]to" 
               id="[% field.name FILTER html %]to" size="10" maxlength="10"
               value="[% value.1 FILTER html %]" 
@@ -99,7 +99,7 @@
        </button>
     <small>(YYYY-MM-DD or relative dates)</small>
     
-    <div id="con_calendar_[% field.name FILTER html %]to"></div>
+    <span id="con_calendar_[% field.name FILTER html %]to"></span>
     <script type="text/javascript">
       createCalendar('[% field.name FILTER js %]');
       createCalendar('[% field.name FILTER js %]to');
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index e40467970..e1f8a5f68 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -251,14 +251,14 @@ TUI_hide_default('information_query');
   [% END %]
 
   <div class="search_field_row">
-    <label for="bug_id">[% terms.Bugs %] numbered</label>
+    <span class="field_label"><label for="bug_id">[% terms.Bugs %] numbered</label></span>
     <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>
     </div>
     should be 
-    <select name="bug_id_type">
+    <select name="bug_id_type" id="bug_id_type">
       <option value="anyexact"[% " selected" IF default.bug_id_type.0 == "anyexact" %]>only included in</option>
       <option value="nowords"[% " selected" IF default.bug_id_type.0 == "nowords" %]>excluded from</option>
     </select> the results
-- 
cgit v1.2.3-24-g4f1b