From b813c376fd3de1651515f87f78419bb7a534b04f Mon Sep 17 00:00:00 2001
From: William Rockwood <wrockwood@tadl.org>
Date: Fri, 20 Jul 2012 17:04:58 -0400
Subject: [PATCH] mostly searchbox revamp + css load order change

- Removed Evergreen logo from homesearch.tt2, to be replaced (at some
  point) by either a news slideshow, or content sliders (new music,
  movies, books, etc).
- Massive restructuring of searchbar.tt2 and modification of relevant
  bits of tadl.css.
- Did I mention MASSIVE restructuring of searchbar.tt2? There is still
  more to do, but these are the initial changes.
- Changed load order of CSS files, so tadl.css is the last to be loaded
  so it won't be overridden by dojo/dijit.css (dojo.css was overriding
  the body {} for goodness sake!)

Signed-off-by: William Rockwood <wrockwood@tadl.org>
---
 css/tadl.css                                 | 21 +++++++++++++++++----
 templates_tadlskin/opac/parts/base.tt2       |  8 ++++----
 templates_tadlskin/opac/parts/homesearch.tt2 |  2 +-
 templates_tadlskin/opac/parts/searchbar.tt2  | 24 ++++++++++--------------
 4 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/css/tadl.css b/css/tadl.css
index ece6811e3c..960f38a966 100644
--- a/css/tadl.css
+++ b/css/tadl.css
@@ -29,8 +29,12 @@ a:hover {
 #search-wrapper input[type=text] {
 	margin:0;
 	padding:0;
-	line-height:1.6em;
+	line-height:1.8em;
 	font-size:1.4em;
+	height:1.8em;
+}
+.dijitTextBox {
+	width: 400px;
 }
 
 #search-wrapper select,
@@ -38,7 +42,7 @@ a:hover {
 	border:1px solid #e9ebf3;
 	margin:0;
 	padding:0;
-	width: 12em;
+	width: 14em;
 	font-size:1.4em;
 }
 
@@ -244,10 +248,18 @@ span.dash_divider {
 	background: #f0f2f5;
 }
 
+.searchbar {
+	margin-top:5px;
+	text-align:center;
+}
+
 .search_box_wrapper {
-	width:300px;
+	width:400px;
 	padding: 1px 1px 1px 3px;
 }
+#search_box {
+	width:400px;
+}
 
 #search-wrapper #breadcrumb {
 	margin-top:0px;
@@ -1013,7 +1025,8 @@ div.result_place_hold {
 	font-size: 10px;
 }
 .search_catalog_lbl {
-	font-size: 1.8em;
+	font-size: 1.6em;
+	vertical-align:middle;
 }
 
 .lbl1 {
diff --git a/templates_tadlskin/opac/parts/base.tt2 b/templates_tadlskin/opac/parts/base.tt2
index 4a82316fb2..6cb85ef8b6 100644
--- a/templates_tadlskin/opac/parts/base.tt2
+++ b/templates_tadlskin/opac/parts/base.tt2
@@ -7,16 +7,16 @@
         [% ELSIF ctx.authtime %]
         <meta http-equiv="refresh" content="[% ctx.authtime %]; url=[% ctx.logout_page %]">
         [% END %]
-        <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/semiauto.css" />
-        <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/tadl/opac/tadl.css" />
-        <title>[% l('Catalog - [_1]', ctx.page_title) %]</title>
-        <link rel="unapi-server" type="application/xml" title="unAPI" href="/opac/extras/unapi" />
         [% IF want_dojo %]
         <style type="text/css">
             @import "[% ctx.media_prefix %]/js/dojo/dojo/resources/dojo.css";
             @import "[% ctx.media_prefix %]/js/dojo/dijit/themes/tundra/tundra.css";
         </style>
         [% END %]
+        <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/semiauto.css" />
+        <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/tadl/opac/tadl.css" />
+        <title>[% l('Catalog - [_1]', ctx.page_title) %]</title>
+        <link rel="unapi-server" type="application/xml" title="unAPI" href="/opac/extras/unapi" />
         [% INCLUDE 'opac/parts/goog_analytics.tt2' %]
     </head>
     <body[% IF want_dojo; ' class="tundra"'; END %]>
diff --git a/templates_tadlskin/opac/parts/homesearch.tt2 b/templates_tadlskin/opac/parts/homesearch.tt2
index e99e1b1ee0..50e73a1546 100644
--- a/templates_tadlskin/opac/parts/homesearch.tt2
+++ b/templates_tadlskin/opac/parts/homesearch.tt2
@@ -1,3 +1,3 @@
 <div id="homesearch_main_logo">
-    <strong><center><img src="[% ctx.media_prefix %]/opac/images/main_logo.png" /></center></strong>
+    <!--<strong><center><img src="[% ctx.media_prefix %]/opac/images/main_logo.png" /></center></strong>-->
 </div>
diff --git a/templates_tadlskin/opac/parts/searchbar.tt2 b/templates_tadlskin/opac/parts/searchbar.tt2
index c75b2b435a..bd1550cda2 100644
--- a/templates_tadlskin/opac/parts/searchbar.tt2
+++ b/templates_tadlskin/opac/parts/searchbar.tt2
@@ -3,17 +3,7 @@
     [% UNLESS took_care_of_form -%]
     <form action="[% ctx.opac_root %]/results" method="GET">
     [%- END %]
-    <div>
-        <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
-        <a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
-            id="home_adv_search_link"><span
-            class="adv_search_font">[% l('Advanced Search') %]</span></a>
-    </div>
-    <div class="searchbar">[%- l('Search ');
-        INCLUDE "opac/parts/coded_value_selector.tt2"
-            attr=["mattype", "item_type"] none_ok=1 none_label=l('All Formats');
-            l(' for ');
-        %]
+    <div class="searchbar"><span class="search_catalog_lbl">[% l('Search') %]</span>
         <span class='search_box_wrapper'>
             <input type="text" id="search_box" name="query"
                 value="[% is_advanced ? ctx.naive_query_scrub(ctx.processed_search_query) : CGI.param('query') | html %]"
@@ -27,14 +17,20 @@
                 autofocus x-webkit-speech
                 [%- END # autosuggest enabled %] />
         </span>
-        [%- INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
-            l(' in '); INCLUDE build_org_selector show_loc_groups=1
-    %]
     <span>
         <input id='search-submit-go' type="submit" value="[% l('Go') %]!" alt="[% l('Go') %]!" class="opac-button"
             onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
         <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' style='height:16px;width:16px;' class='hidden' alt=''/>
     </span>
+        <a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
+            id="home_adv_search_link"><span
+            class="adv_search_font">[% l('Advanced Search') %]</span></a>
+    </div>
+    <div class="searchbar">
+    [%- INCLUDE "opac/parts/coded_value_selector.tt2" attr=["mattype", "item_type"] none_ok=1 none_label=l('All Formats'); %]
+        [%- INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
+            l(' in '); INCLUDE build_org_selector show_loc_groups=1
+    %]
     </div>
     [% IF ctx.bookbag %]
     <div id="search-only-bookbag-container">
-- 
2.11.0