Search Link Changes

Add a "New Advanced Search" link next to the refine link

Change "Advanced Search" to "Basic Search" when in advanced already

Make "Basic Search" links clear the search so that the searchbar file does
not drop into the "Advanced Mode Summary" state.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>

diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index 220c56f..a63476c 100644 (file)
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -1,6 +1,8 @@
 [%- PROCESS "opac/parts/header.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
+    PROCESS "opac/parts/misc_util.tt2";
+    PROCESS get_library;
     ctx.page_title = l("Advanced Search");
     pane = CGI.param("pane") || "advanced";
     loc = ctx.search_ou;
@@ -8,7 +10,7 @@
     <div id="search-wrapper">
         <div id="search-box">
             <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
-            <a href="[% mkurl(ctx.opac_root _ '/home') %]"
+            <a href="[% mkurl(ctx.opac_root _ '/home', {$loc_name => loc_value}, 1) %]"
                 id="home_adv_search_link"><span
                 class="adv_search_font">[%l('Basic Search')%]</span></a>
         </div>

diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 3ea789f..2567bf6 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -5,9 +5,15 @@
     [%- END %]
     <div>
         <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+        [%- IF is_advanced %]
+        <a href="[% mkurl(ctx.opac_root _ '/home', {$loc_name => loc_value}, 1) %]"
+            id="home_adv_search_link"><span
+            class="adv_search_font">[% l('Basic Search') %]</span></a>
+        [%- ELSE %]
         <a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
             id="home_adv_search_link"><span
             class="adv_search_font">[% l('Advanced Search') %]</span></a>
+        [%- END %]
     </div>
     <div class="searchbar">[%-
         IF NOT is_advanced;
@@ -120,6 +126,8 @@
         END; %]
         [ <a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[%
             l('Refine My Original Search')
+        %]</a> ] [ <a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]">[%
+            l('Start a New Advanced Search')
         %]</a> ]
     </div>
     [% END %]