From f0494827a8c550d007acc7a3d6be746fdacc1db7 Mon Sep 17 00:00:00 2001
From: Aleisha <aleishaamohia@hotmail.com>
Date: Wed, 27 Apr 2016 03:34:07 +0000
Subject: [PATCH] Bug 10171: Add a search box include on advanced search and
 item search pages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch creates a new file: adv-search.inc. This search include has
no catalog search (as it makes no sense to have the catalog search tab
on the advanced search page).
The item search page uses home-search.inc (with catalog search) as the
catalog search is different to the item search.

To test:
1) Go to Search (advanced search)
2) Confirm search header is there with no catalog search tab and works
   as expected
3) Go to item search
4) Confirm search header is there with catalog search tab and works as
   expected

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Tested together with follow up patch, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
---
 .../intranet-tmpl/prog/en/includes/adv-search.inc  |   42 ++++++++++++++++++++
 .../prog/en/modules/catalogue/advsearch.tt         |    2 +-
 .../prog/en/modules/catalogue/itemsearch.tt        |    1 +
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
new file mode 100644
index 0000000..d081ed2
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
@@ -0,0 +1,42 @@
+<div class="gradient">
+<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Main page Resident Search Box -->
+
+<div id="header_search">
+    [% INCLUDE 'patron-search-box.inc' %]
+[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
+<div id="checkin_search" class="residentsearch">
+    <p class="tip">Scan a barcode to check in:</p>
+    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
+        <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
+        <input value="Submit" class="submit" type="submit" />
+    </form>
+</div>
+<div id="renew_search" class="residentsearch">
+    <p class="tip">Scan a barcode to renew:</p>
+        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
+            <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+            <input value="Submit" class="submit" type="submit" />
+        </form>
+    </div>
+[% END %]
+
+[% IF ( CAN_user_borrowers ) %]
+<div id="patron_search" class="residentsearch">
+    <p class="tip">Enter patron card number or partial name:</p>
+    <form action="/cgi-bin/koha/members/member.pl" method="post">
+        <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text"/>
+        <input type="hidden" name="quicksearch" value="1" />
+        <input value="Submit" class="submit" type="submit" />
+    </form>
+</div>[% END %]
+
+<ul>
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
+    [% IF ( CAN_user_borrowers ) %]<li><a onclick="keep_text(3)" href="#patron_search">Search patrons</a></li>[% END %]
+</ul>
+
+</div><!-- /header_search -->
+</div><!-- /gradient -->
+<!-- End Main page Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index e2bd3cc..9a5e6e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -20,8 +20,8 @@
 </script>
 </head>
 <body id="catalog_advsearch" class="catalog">
-
 [% INCLUDE 'header.inc' %]
+[% INCLUDE 'adv-search.inc' %]
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Advanced search</div>
 
 <div id="doc" class="yui-t7">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index 09e6b84..9ce1427 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -356,6 +356,7 @@
 </head>
 <body id="catalog_itemsearch" class="catalog">
   [% INCLUDE 'header.inc' %]
+  [% INCLUDE 'home-search.inc' %]
   <div id="breadcrumbs">
     <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo; Item search
   </div>
-- 
1.7.10.4