From c9cdea869b574306ca09ada2c5e5058ec540a873 Mon Sep 17 00:00:00 2001
From: Peter Lux <plux@upei.ca>
Date: Fri, 9 Dec 2011 16:12:00 -0500
Subject: [PATCH] TPAC: Link to Basic Search from advanced page

The searchbar in basic search, results, record details offers an option
to get to advanced search - but advanced search doesn't offer a way to
get directly back to a basic search. Now it does; however, some CSS is
required to make it look consistent.

Signed-off-by: Peter Lux <plux@upei.ca>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
---
 Open-ILS/src/templates/opac/advanced.tt2 | 12 +++++++++-
 templates_custom/opac/advanced.tt2       | 41 ++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 templates_custom/opac/advanced.tt2

diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index db609d2f13..7114390337 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -6,8 +6,18 @@
     loc = CGI.param("loc");
 -%]
     <div id="search-wrapper">
+        <div>
+        <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+        <a href="[% mkurl(ctx.opac_root _ '/home') %]"
+            id="home_adv_search_link"><span
+            class="adv_search_font">[% l('Basic Search') %]</span></a>
+            </div>
+
+
         <div id="adv_search_parent">
-            <div id="adv_search_tabs">
+   
+	 <div id="adv_search_tabs">
+
                 <a href="?pane=advanced[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'advanced' %]class="on" [% END %]id="adv_search">[% l('Advanced Search') %]</a>
                 <a href="?pane=numeric[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'numeric' %]class="on" [% END %]id="num_search">[% l('Numeric Search') %]</a>
                 <a href="?pane=expert[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'expert' %]class="on" [% END %]id="expert_search">[% l('Expert Search') %]</a>
diff --git a/templates_custom/opac/advanced.tt2 b/templates_custom/opac/advanced.tt2
new file mode 100644
index 0000000000..7114390337
--- /dev/null
+++ b/templates_custom/opac/advanced.tt2
@@ -0,0 +1,41 @@
+[%-  PROCESS "opac/parts/header.tt2";
+    WRAPPER "opac/parts/base.tt2";
+    INCLUDE "opac/parts/topnav.tt2";
+    ctx.page_title = l("Advanced Search");
+    pane = CGI.param("pane") || "advanced";
+    loc = CGI.param("loc");
+-%]
+    <div id="search-wrapper">
+        <div>
+        <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+        <a href="[% mkurl(ctx.opac_root _ '/home') %]"
+            id="home_adv_search_link"><span
+            class="adv_search_font">[% l('Basic Search') %]</span></a>
+            </div>
+
+
+        <div id="adv_search_parent">
+   
+	 <div id="adv_search_tabs">
+
+                <a href="?pane=advanced[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'advanced' %]class="on" [% END %]id="adv_search">[% l('Advanced Search') %]</a>
+                <a href="?pane=numeric[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'numeric' %]class="on" [% END %]id="num_search">[% l('Numeric Search') %]</a>
+                <a href="?pane=expert[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'expert' %]class="on" [% END %]id="expert_search">[% l('Expert Search') %]</a>
+            </div>
+        </div>
+    </div>
+    <div id="content-wrapper">
+        <div id="main-content">
+            <div class="advanced_div">
+            [% IF pane == 'advanced' %]
+            [% INCLUDE "opac/parts/advanced/search.tt2" %]
+            [% ELSIF pane == 'numeric' %]
+            [% INCLUDE "opac/parts/advanced/numeric.tt2" %]
+            [% ELSIF pane == 'expert' %]
+            [% INCLUDE "opac/parts/advanced/expert.tt2" %]
+            [% END %]
+            </div>
+            <div class="common-full-pad"></div>	
+        </div>
+    </div>
+[% END %]
-- 
2.11.0