From 29f55b22a9113a134dfcb5a3461eb74e4c96fc05 Mon Sep 17 00:00:00 2001
From: Bill Ott <bott@grpl.org>
Date: Wed, 18 Sep 2013 14:55:40 -0400
Subject: [PATCH] Various mobile style and display changes.

Try to reduce the size of the search bar and search type option links.
Remove completely from login page (problem or make user rely on back button?)
Introduce mobile_hide class for cheap/easy method to alter pieces for mobile.

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/advanced.tt2      |  2 +-
 Open-ILS/src/templates/opac/browse.tt2        |  9 ++++---
 Open-ILS/src/templates/opac/css/style.css.tt2 | 25 +++++++++++++------
 Open-ILS/src/templates/opac/login.tt2         |  4 ++-
 .../src/templates/opac/parts/searchbar.tt2    |  2 +-
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index 9d3929c8b4..2d04448ad2 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -7,7 +7,7 @@
 -%]
     <div id="search-wrapper">
         <div id="search-box">
-            <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+            <span class="search_catalog_lbl mobile_hide">[% l('Search the Catalog') %]</span>
             <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home') %]"
                     id="home_adv_search_link">[%l('Basic Search')%]</a></span>
 
diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2
index 54dec17f14..415e41c7ca 100644
--- a/Open-ILS/src/templates/opac/browse.tt2
+++ b/Open-ILS/src/templates/opac/browse.tt2
@@ -16,16 +16,17 @@
         [%# XXX TODO Give searchbar.tt2 more smarts so we can just do:
           # INCLUDE "opac/parts/searchbar.tt2" %]
         <div id="search-box">
-            <span class="search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home', {}, depart_list) %]">[% l('Search the Catalog') %]</a></span>
+            <span class="search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home', {}, depart_list) %]">[% l('Basic Search') %]</a></span>
             <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced', {}, depart_list) %]"
                     id="home_adv_search_link">[%l('Advanced Search')%]</a></span>
-            <span class="browse_the_catalog_lbl">[% l('Browse the Catalog') %]</span>
+        
+            <span class="browse_the_catalog_lbl mobile_hide">[% l('Browse the Catalog') %]</span>
         </div>
     </div>
     <div id="content-wrapper">
         <div id="main-content">
             <div id="browse-the-catalog">
-                <div id="browse-controls">
+                <div id="browse-controls" class='searchbar'>
                     <form method="get" onsubmit="$('browse-submit-spinner').className = ''; return true">
                         <input type="hidden" name="blimit"
                             value="[% blimit %]" />
@@ -40,7 +41,7 @@
                             arialabel=l('Select holding library') %]
                         [% l('Browse for [_1] starting with [_2] in [_3]', control_qtype, control_bterm, control_locg) %]
 
-                        <input type="submit" value="[% l('Go') %]" />
+			<input id='search-submit-go' type="submit" value="[% l('Browse') %]" alt="[% l('Browse') %]" class="opac-button"/>
                         <img id="browse-submit-spinner" src="[% ctx.media_prefix %]/opac/images/progressbar_green.gif" class="hidden" style="width: 16px; height: 16px;" alt="" />
                     </form>
                 </div>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 520ed5e605..7520acdbd9 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1667,9 +1667,6 @@ a.preflib_change {
     #homesearch_main_logo img {
         width:75%;
     }
-    #home_adv_search_link {
-        display: block;
-    }
     #format_selector {
         display:none;
     }
@@ -1693,9 +1690,6 @@ a.preflib_change {
     #gold-links-holder {
         display: none;
     }
-    #search-wrapper {
-        display: block;
-    }
     #simple-detail-view-links {
         display: none;
     }
@@ -1855,8 +1849,9 @@ a.preflib_change {
     select#pickup_lib.search-wrapper-locg {
         width: 100%;
     }
-    #search_box {
+    #search-wrapper #search-box {
         width: 85%;
+        padding-top: 5px;
     }
     #qtype {
         display: none;
@@ -1905,4 +1900,20 @@ a.preflib_change {
     h2.rdetail_uris {
         clear: both;
     }
+    .search_catalog_lbl {
+	margin-left: 0;
+	white-space: nowrap;
+    }
+    .adv_search_catalog_lbl { 
+        margin-top: 0;
+	white-space: nowrap;
+    }
+    .browse_the_catalog_lbl {
+        white-space: nowrap;
+    }
+    .mobile_hide {
+	display: none;
+    } 
+    .searchbar { width: 200px; line-height: 1.5em; }
+    #browse-controls { width: 200px; line-height: 1.5em; }
 }
diff --git a/Open-ILS/src/templates/opac/login.tt2 b/Open-ILS/src/templates/opac/login.tt2
index 1de7468254..9b6513f72c 100644
--- a/Open-ILS/src/templates/opac/login.tt2
+++ b/Open-ILS/src/templates/opac/login.tt2
@@ -3,7 +3,9 @@
     INCLUDE "opac/parts/topnav.tt2";
     basic_search = "f";
     ctx.page_title = l("Account Login") %]
-    [% INCLUDE "opac/parts/searchbar.tt2" %]
+    <div class='mobile_hide'>
+        [% INCLUDE "opac/parts/searchbar.tt2" %]
+    </div>
     <div id="content-wrapper">
         <div id="main-content">
             [% INCLUDE "opac/parts/login/form.tt2" %]
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 6cac5f8077..4688e2367a 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -4,7 +4,7 @@
     <form action="[% ctx.opac_root %]/results" method="get">
     [%- END %]
     <div id="search-box">
-        <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+        <span class="search_catalog_lbl mobile_hide">[% l('Search the Catalog') %]</span>
         <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
             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>
-- 
2.43.2