From 694d31353870553bc8d89cf1a828436fe64ee88b Mon Sep 17 00:00:00 2001
From: Dan Scott <dscott@laurentian.ca>
Date: Wed, 18 Sep 2013 17:13:38 -0400
Subject: [PATCH] Refactor searchbar into non-sentence form

A search bar that does not use a sentence is easier to translate and has
the additional advantage of breaking up into a simpler mobile display.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
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 | 14 ++++-------
 .../src/templates/opac/parts/searchbar.tt2    | 24 +++++++++----------
 .../web/css/skin/default/opac/semiauto.css    |  1 -
 3 files changed, 17 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 0890030603..184cdb74eb 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -228,10 +228,6 @@ span.dash_divider {
     background: [% css_colors.background %];
 }
 
-.search_box_wrapper {
-    padding: 10px 5px 5px 3px;
-}
-
 #search-wrapper #breadcrumb {
     margin-top:0px;
     font-size: [% css_fonts.size_smaller %];
@@ -1874,9 +1870,6 @@ a.preflib_change {
         width: 85%;
         padding-top: 5px;
     }
-    #qtype {
-        display: none;
-    }
     #main-content-home {
         padding: 0px;
         margin: 0px;
@@ -1935,6 +1928,9 @@ a.preflib_change {
     .mobile_hide {
 	display: none;
     } 
-    .searchbar { width: 200px; line-height: 1.5em; }
-    #browse-controls { width: 200px; line-height: 1.5em; }
+    .searchbar { line-height: 1.5em; }
+    #browse-controls { line-height: 1.5em; }
+    #search_query_label, #search_qtype_label, #search_locg_label {
+        display: block;
+    }
 }
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 4688e2367a..b276a9d454 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -9,19 +9,11 @@
             id="home_adv_search_link">[% l('Advanced Search') %]</a></span>
         <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse', {}, ['fi:has_browse_entry']) %]">[% l('Browse the Catalog') %]</a></span>
     </div>
-    <div class="searchbar">[%- l('Search ');
-        IF search.basic_config.type == 'attr';
-            INCLUDE "opac/parts/coded_value_selector.tt2"
-                attr=search.basic_config.group none_ok=1 none_label=search.basic_config.none_label;
-        ELSIF search.basic_config.type == 'filter';
-            INCLUDE "opac/parts/filter_group_selector.tt2"
-                filter_group=search.basic_config.group none_ok=1 none_label=search.basic_config.none_label;
-        END;
-            l(' for ');
-        %]
+    <div class="searchbar">
         <span class='search_box_wrapper'>
             [%- # autosuggest breaks accessibility, as the aria-label
                 # attribute is removed when the Dijit is created. :(  %]
+            <label id="search_box_label">[% l('Search: ') %]
             <input type="text" id="search_box" name="query" aria-label="[%
                     l('Enter search query:');
                 %]" value="[% is_advanced ? ctx.naive_query_scrub(ctx.processed_search_query) : CGI.param('query') | html %]"
@@ -34,13 +26,21 @@
                 [%- ELSE -%]
                     [% IF basic_search != "f" %] autofocus [% END %] x-webkit-speech
                 [%- END # autosuggest enabled %] />
+            </label>
         </span>
+        <label id="search_qtype_label">
         [%- 
-            select_lib_label = l("Select search library");
+            l('Type: ');
             INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
-            l(' in ');
+        -%]
+        </label>
+        <label id="search_locg_label">
+        [%- 
+            l('Library: ');
+            select_lib_label = l("Select search library");
             INCLUDE build_org_selector arialabel=select_lib_label show_loc_groups=1
         -%]
+        </label>
     <span>
         <input id='search-submit-go' type="submit" value="[% l('Search') %]" alt="[% l('Search') %]" class="opac-button"
             onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
diff --git a/Open-ILS/web/css/skin/default/opac/semiauto.css b/Open-ILS/web/css/skin/default/opac/semiauto.css
index dfe8a6fb94..07705990cd 100644
--- a/Open-ILS/web/css/skin/default/opac/semiauto.css
+++ b/Open-ILS/web/css/skin/default/opac/semiauto.css
@@ -30,7 +30,6 @@
 .nowrap { white-space: nowrap; }
 .opac-auto-164 { white-space: nowrap; padding-left: 5px; }
 .full-width { width: 100%; }
-#search_box { width: 162px; }
 .selector_actions_for_list { width: 175px; margin-right: 11px; }
 .selector_actions_for_list_inner_option { margin-left: 2em; } /* XXX ".opac-auto-179 optgroup option" doesn't work!? */
 #cn_browse_div > div { width: 90%; text-align: center; margin: 10px; }
-- 
2.43.2