(sitka) 2.4 tpac - numeric search changes
authorMark Bucholtz <mbucholtz@sitka.bclibraries.ca>
Wed, 26 Jun 2013 16:24:18 +0000 (09:24 -0700)
committerJeff Davis <jdavis@sitka.bclibraries.ca>
Wed, 26 Jun 2013 21:25:50 +0000 (14:25 -0700)
Open-ILS/src/templates/opac/home.tt2
Open-ILS/src/templates/opac/parts/myopac/base.tt2
Open-ILS/src/templates/opac/parts/searchbar_staff.tt2
Open-ILS/src/templates/opac/place_hold.tt2
Open-ILS/src/templates/opac/record.tt2
Open-ILS/src/templates/opac/results.tt2

index 13f6fc1..e2038f8 100644 (file)
@@ -5,8 +5,8 @@
     <div id="search-wrapper">
         [%- IF ctx.is_staff; %]
                 [% INCLUDE "opac/parts/topnav_staff.tt2" %]
-                [% INCLUDE "opac/parts/searchbar_staff.tt2" %]
                 [% INCLUDE "opac/parts/advanced/numeric_staff.tt2" %]
+                [% INCLUDE "opac/parts/searchbar_staff.tt2" %]
         [%- ELSE %]
                 [% INCLUDE "opac/parts/searchbar.tt2" %]
         [%- END %]
index bdf7823..3190e32 100644 (file)
@@ -12,8 +12,8 @@
     [% INCLUDE "opac/parts/topnav_secondary.tt2" %]
     <div id="search-wrapper">
        [%- IF ctx.is_staff; %]
-                [% INCLUDE "opac/parts/searchbar_staff.tt2" %]
                 [% INCLUDE "opac/parts/advanced/numeric_staff.tt2" %]
+                [% INCLUDE "opac/parts/searchbar_staff.tt2" %]
         [%- ELSE %]
                 [% INCLUDE "opac/parts/searchbar.tt2" %]
         [%- END %]
index 784d2f7..d696ee3 100644 (file)
@@ -4,21 +4,6 @@
     <form action="[% ctx.opac_root %]/results" method="GET">
     [%- END %]
 
-    <div>
-        <span class="search_catalog_lbl">[% l('Search the Catalogue') %]</span>
-
-        <a href="[% mkurl(ctx.opac_root _ '/advanced', {}, ['query']) %]"
-            id="home_adv_search_link"><span
-            class="adv_search_font">[% l('Advanced Search') %]</span></a>
-
-            [%- IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
-              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  <a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[%
-              l('<b>Refine Your Original Search</b>')
-            %]</a>
-            [%- END %]
-   </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');
         <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' style='height:16px;width:16px;' class='hidden' alt=''/>
     </span>
     </div>
+    
+    <div>
+<!---   <span class="search_catalog_lbl">[% l('Search the Catalogue') %]</span> -->
+
+        <a href="[% mkurl(ctx.opac_root _ '/advanced', {}, ['query']) %]"
+            id="home_adv_search_link"><span
+            class="adv_search_font">[% l('Advanced Search') %]</span></a>
+
+            [%- IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  <a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[%
+              l('<b>Refine Your Original Search</b>')
+            %]</a>
+            [%- END %]
+   </div>
+
     [% IF ctx.bookbag %]
     <div id="search-only-bookbag-container">
         <input type="checkbox" id="search-only-bookbag" name="bookbag"
index b8bf4e8..ec16e8a 100644 (file)
@@ -7,8 +7,8 @@
     ctx.page_title = l("Place Hold") %]
     <div id="search-wrapper">
         [%- IF ctx.is_staff; %]
-                [% INCLUDE "opac/parts/searchbar_staff.tt2" %]
                 [% INCLUDE "opac/parts/advanced/numeric_staff.tt2" %]
+                [% INCLUDE "opac/parts/searchbar_staff.tt2" %]
         [%- ELSE %]
                 [% INCLUDE "opac/parts/searchbar.tt2" %]
         [%- END %]
index c6d7156..f2b7385 100644 (file)
@@ -7,8 +7,8 @@
     <div id="search-wrapper">
     [%- IF ctx.is_staff; %]
        [% INCLUDE "opac/parts/topnav_staff.tt2" %]
-       [% INCLUDE "opac/parts/searchbar_staff.tt2" took_care_of_form=1 %]              
        [% INCLUDE "opac/parts/advanced/numeric_staff.tt2" %]
+       [% INCLUDE "opac/parts/searchbar_staff.tt2" took_care_of_form=1 %]              
     [%- ELSE %]
        [% INCLUDE "opac/parts/searchbar.tt2" took_care_of_form=1 %]
     [%- END %]
index db9417e..86f7cbb 100644 (file)
     PROCESS get_library;
 -%]
     <form action="[% ctx.opac_root %]/results" method="get">
+    <div id="search-wrapper-numeric">
+        [%- IF ctx.is_staff; %]
+                [% INCLUDE "opac/parts/advanced/numeric_staff.tt2" %]
+        [%- END %]
+    </div>
+    </form>
+
+    <form action="[% ctx.opac_root %]/results" method="get">
     <div id="search-wrapper">
         [%- IF ctx.is_staff; %]
                 [% INCLUDE "opac/parts/topnav_staff.tt2" %]
                 [% INCLUDE "opac/parts/searchbar_staff.tt2" took_care_of_form=1 %]
-                [% INCLUDE "opac/parts/advanced/numeric_staff.tt2" %]
         [%- ELSE %]
                 [% INCLUDE "opac/parts/searchbar.tt2" took_care_of_form=1 %]
         [%- END %]