OPAC advanced search page UI tweaks. (Terran)

diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index 0b76d08..77ad3f1 100644 (file)
--- 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("Search Input") %]
+                                Enter Search Words:
                             </div>
                         </td>
                     </tr>
@@ -30,24 +30,10 @@
         </div>
     </div>
 
-    <div id='adv_search_submit'>
-        <input type="hidden" name="_adv" value="1" />
-        <input id="detail" type="hidden" name="detail_record_view"
-               value="[% show_detail_view %]"/>
-        <span>
-            <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)'/>
-            <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif'
-                class='hidden' alt="[% l('Search in progress icon') %]"/>
-        </span>
-
-        <a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]"
-            class="opac-button">[% l('Clear Form') %]</a>
-    </div>
 
     <div id='adv_search_filters'>
-        <div class="header_middle">[% l('Search Filters') %]</div>
-
+        <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;
@@ -69,13 +55,7 @@
                 CASE "lib_selector";
                     PROCESS "opac/parts/org_selector.tt2";
                         INCLUDE build_org_selector show_loc_groups=1 id=adv_chunk.id %]
-                            <div class="adv_search_available">
-                                <input type='checkbox' name="modifier"
-                                    value="available"[% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %]
-                                    id='opac.result.limit2avail' />
-                                <label for='opac.result.limit2avail'>
-                                    [% l("Limit to Available") %]</label>
-                            </div>
+
 [%
                 CASE "pub_year"; %]
                             <select name='pubdate'
@@ -127,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 -->
@@ -139,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"
@@ -170,5 +153,43 @@
 
         </div>
     </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" />
+        <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('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>