From 88fe5b19e0497171c93ef263912c336d48546317 Mon Sep 17 00:00:00 2001
From: Thomas Berezansky <tsbere@mvlc.org>
Date: Fri, 1 Feb 2013 12:33:33 -0500
Subject: [PATCH] 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>
---
 Open-ILS/src/templates/opac/advanced.tt2        | 4 +++-
 Open-ILS/src/templates/opac/parts/searchbar.tt2 | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index 220c56fd20..a63476cc86 100644
--- 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 3ea789f7bc..2567bf628b 100644
--- 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 %]
-- 
2.11.0