From d363c662dafb292a6bd5d6a1b954387c63bd68b8 Mon Sep 17 00:00:00 2001
From: Chris Sharp <csharp@georgialibraries.org>
Date: Mon, 14 Nov 2016 15:02:49 -0500
Subject: [PATCH] Restoring stock advanced search template while we
 troubleshoot.

OPAC advanced search page UI tweaks. (Terran)
---
 .../src/templates/opac/parts/advanced/search.tt2   | 88 +++++++++++-----------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index 4fda58bc02..77ad3f18e6 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -12,7 +12,7 @@
                     <tr>
                         <td>
                             <div class="header_middle" id="adv_search_input">
-                                [% l("Enter Search Words:") %]
+                                Enter Search Words:
                             </div>
                         </td>
                     </tr>
@@ -31,11 +31,9 @@
     </div>
 
 
-	<div id='adv_search_filters' style="margin-top:30px;">
-        <div class="header_middle">[% l('Choose Search Limits:') %]</div>
-		<p style="font-style:italic;margin-bottom:0px;">Tip: Ctrl-Click to select multiple lines or to deselect lines (Shift-Click for Macs).</p>
-
-		
+    <div id='adv_search_filters'>
+        <div class="header_middle">Choose Search Limits:</div>
+        <p style="font-style:italic;margin-bottom:0px;">Tip: Ctrl-Click to select multiple lines or to deselect lines (Shift-Click for Macs).</p>
 [%
     in_row = 0;
     FOR adv_chunk IN search.adv_config;
@@ -46,20 +44,18 @@
 [%
         END; %]
             <div class='adv_filter_block_item'>
-            <div valign='top'[% IF adv_chunk.js_only %] 
+            <div valign='top'[% IF adv_chunk.js_only %]
                 id='adv_chunk_[% adv_chunk.adv_special %]'
                 class='hidden'[% END %]>
                 <strong><label for="[% adv_chunk.id %]">
                   [% adv_chunk.adv_label %] </label></strong><br />
-				  
 [%
         IF adv_chunk.adv_special;
             SWITCH adv_chunk.adv_special;
                 CASE "lib_selector";
                     PROCESS "opac/parts/org_selector.tt2";
                         INCLUDE build_org_selector show_loc_groups=1 id=adv_chunk.id %]
-					<br/><i>Tip: Choosing a library will<br/>allow you to select a<br/>shelving location.</i><br/> <br/>
-                            
+
 [%
                 CASE "pub_year"; %]
                             <select name='pubdate'
@@ -79,7 +75,8 @@
                             [% IF !ctx.exclude_electronic_checkbox %]
                             <br/>
                             <div id='adv_special_block'>
-                                Year: <input title="[% l('Search date') %]" 
+                            [% END %]
+                                <input title="[% l('Search date') %]"
                                   name='date1' type='text' size='4' maxlength='4' value="[% CGI.param('date1') | html %]" />
                                 <span id='adv_global_pub_date_2_span' class='[% CGI.param("pubdate") == "between" ? "" : "hide_me" %]'>
                                    [% l("and") %] <input name='date2'
@@ -110,6 +107,7 @@
                         value=default_sort class='results_header_sel';
                     %]
 
+<<<<<<< HEAD
                     [% IF NOT metarecords.disabled %]
                         <br/><!-- <br> may seem redundant, but it allows the
                             <input> (below) to drop down inline w/ its label -->
@@ -122,6 +120,8 @@
                                 [% l("Group Formats and Editions") %]</label>
                         </div>
                     [% END %]
+=======
+>>>>>>> 099a674... OPAC advanced search page UI tweaks. (Terran)
 
                 [% CASE "copy_location" %]
                     <select id="adv_copy_location_selector"
@@ -151,43 +151,45 @@
         END;
     END; %]
 
-    <!-- Moved 'Limit to Available' to its own block for clarity -->
-	    <div style="clear:left;">
-            <input type='checkbox' name="modifier"
-                value="available"[% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %]
-                id='opac.result.limit2avail' />
-            <label for='opac.result.limit2avail'><strong>
-            [% l("Limit Search Results to Currently Available Items") %]</strong></label>
-        </div>	
-
-	<!-- Moved 'Group Formats' to its own block for clarity -->
-	[% IF NOT metarecords.disabled %]
-        <div>
-            <input type='checkbox' name="modifier" value="metabib"
-                [%- CGI.param('modifier').grep('metabib').size ? 
-                ' checked="checked"' : '' %]
-                id='opac.result.ismetabib' />
-            <label for='opac.result.ismetabib'><strong>
-                [% l("Group Search Results by Format and Edition") %]</label></strong>
         </div>
-    [% END %]
-	
-
-	    </div>
-	</div>
-</div>
-
-<div id='adv_search_submit' style="clear:both;text-align:center;width:100%;max-width:700px;">
+    </div>
+    
+    <!-- moved checkboxes into their own div for readability -->
+    <div style="clear:left;padding-left:20px;">
+        <input type='checkbox' name="modifier"
+            value="available"[% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %]
+            id='opac.result.limit2avail' />
+        <label for='opac.result.limit2avail'>
+             <strong>[% l("Limit to Available") %]</strong>
+        </label>
+        <br/>
+        [% IF NOT metarecords.disabled %]
+            <input type='checkbox' name="modifier" value="metabib"
+                [%- CGI.param('modifier').grep('metabib').size ?
+                    ' checked="checked"' : '' %]
+                    id='opac.result.ismetabib' />
+            <label for='opac.result.ismetabib'>
+                <strong>[% l("Group Formats and Editions") %]</strong>
+            </label>
+        [% END %]
+    </div>
+    
+    <!-- moved search buttons to bottom -->
+    <div id='adv_search_submit' style="clear:both;text-align:center;width:100%;max-width:700px;">
         <input type="hidden" name="_adv" value="1" />
-		<a href="[% ctx.opac_root _ '/advanced' %]"
+        <input id="detail" type="hidden" name="detail_record_view"
+               value="[% show_detail_view %]"/>
+               
+        <a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]"
             class="opac-button" style="padding:10px;background-color:#669999;">[% l('Clear Form') %]</a>
+            
         <span>
-            <input id='search-submit-go' type="submit" value="[% l('Submit Search') %]" title="[% l('Search') %]" 
-			class="opac-button" style="padding:10px 50px 10px 50px;"
-                onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
-            <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' 
+            <input id='search-submit-go' type="submit" value="[% l('Search') %]" title="[% l('Search') %]" class="opac-button"
+                onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)' 
+                style="padding:10px 50px 10px 50px;" />
+            <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif'
                 class='hidden' alt="[% l('Search in progress icon') %]"/>
         </span>
-
     </div>
+</div>
 </form>
-- 
2.11.0