From 33e2d1841dc47baa483b0a28303a549a4f0520f6 Mon Sep 17 00:00:00 2001
From: Bill Ott <bott@grpl.org>
Date: Wed, 18 Sep 2013 11:12:20 -0400
Subject: [PATCH] Clean-up of expert and numeric forms.

Again, toward the mobilization of advanced searches.  Allow the forms to resize happily.

Signed-off-by: Bill Ott <bott@grpl.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
---
 Open-ILS/src/templates/opac/css/style.css.tt2 |  2 ++
 .../templates/opac/parts/advanced/expert.tt2  | 16 ++++++++-----
 .../templates/opac/parts/advanced/numeric.tt2 | 24 +++++++------------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 722e7ed885..c31abd4dbf 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1169,6 +1169,8 @@ a.dash-link:hover { text-decoration: underline !important; }
 .staff-hold { background-color: [% css_colors.accent_lightest %]; }
 .expert-search tbody tr th { text-align: right; padding-left: 2em; }
 .expert-search-row { padding-top: 10px; }
+#adv_expert_row label { font-weight: bold; }
+
 .bookshelf thead tr td {
     border-bottom: 1px dashed [% css_colors.accent_dark %];
     padding-bottom: 1ex;
diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 4d069d07aa..1abc365c81 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
@@ -4,12 +4,16 @@
     <table class="expert-search">
         <tbody id="adv_expert_rows_here">
             <tr id="adv_expert_row">
-                <th><label for="expert_tag">[% l("Tag:") %]</label></th>
-                <td><input id="expert_tag" type="text" name="tag" size="3" autofocus /></td>
-                <th><label for="expert_subfield">[% l("Subfield:") %]</label></th>
-                <td><input id="expert_subfield" type="text" name="subfield" size="1" /></td>
-                <th><label for="expert_term">[% l("Value:") %]</label></th>
-                <td><input id="expert_term" type="text" name="term" size="16" /></td>
+                <td>
+		    <label for="expert_tag">[% l("Tag:") %]</label>
+                    <input id="expert_tag" type="text" name="tag" size="3" autofocus />
+                    <label for="expert_subfield">[% l("Subfield:") %]</label>
+                    <input id="expert_subfield" type="text" name="subfield" size="1" />
+		    <span style="white-space:nowrap">
+                	<label for="expert_term">[% l("Value:") %]</label>
+                	<input id="expert_term" type="text" name="term" size="16" />
+		    </span>
+		</td>
                 <td>
                     <a href="javascript:;" class="row-remover"
                         title="[% l('Remove row') %]" alt="[% l('Remove row') %]"
diff --git a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
index d5df951def..d471308169 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
@@ -2,9 +2,8 @@
     <div class="header_middle">[% l("Numeric Search") %]</div>
     <input type="hidden" name="contains" value="contains" />
     <input type="hidden" name="_special" value="1" />
-    <table>
-        <tr>
-            <td><label for="numeric_qtype"><strong>[% l("Field:") %]</strong></label>
+    <div id='adv_numeric_block'>
+            <label for="numeric_qtype"><strong>[% l("Field:") %]</strong></label>
                 <select id="numeric_qtype" name="qtype">
                     <!-- TODO: Pull labels from config.metabib_field.label -->
                     <option value="identifier|isbn">[% l('ISBN') %]</option>
@@ -16,24 +15,17 @@
                     <option value="item_barcode">[% l('Item Barcode') %]</option>
                 </select>
                 </label>
-            </td>
-            <td>
+	
                 <input type="text" name="query" size="16" autofocus placeholder='[% l("Identifier") %]' />
-            </td>
-        </tr>
-        <tr>
+	    <br/>
             [%- lib_select_id="numeric_search_library" -%]
-            <td colspan="2"><label for="[% lib_select_id %]"><strong>[% l("Search Library:") %]</strong>
+            <label for="[% lib_select_id %]"><strong>[% l("Search Library:") %]</strong>
                   [% PROCESS "opac/parts/org_selector.tt2";
                      INCLUDE build_org_selector id=lib_select_id show_loc_groups=1
                   %]
-                </label>
-            </td>
-        </tr>
-        <tr>
-            <td colspan="2" align="right">
+            </label>
+	    <br/>
                 <input type="submit" alt="[% l('Search') %]"
                     value="[% l('Search') %]" class="opac-button" />
-            </td>
-    </table>
+    </div>
 </form>
-- 
2.43.2