From d3b60afec4c25b17173a1244a54336e4aaad1ef7 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@quecheelibrary.org>
Date: Sat, 21 Mar 2015 10:51:24 -0400
Subject: [PATCH] Bug 13885: Cataloging search header should include more
 options

This patch adds the check in and standard catalog search to cataloging-search.inc

To test:
1 - Apply patch
2 - Go to More->Cataloging
3 - Search in each tab (Cataloging search / Check out / Check in / Standard
    search) and ensure that all work as expected

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
  - Added search options work properly, and are consistently named.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 .../prog/en/includes/cataloging-search.inc    | 47 ++++++++++++++-----
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index ba1b4c92d7..cb55e5e76d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -1,19 +1,42 @@
 
 <div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Cataloging Resident Search Box -->
-<div id="header_search">
-<div id="addbooks_search" class="residentsearch">
-	<p class="tip">Search the catalog and the reservoir:</p>
-	<form name="search" action="addbooks.pl">
-        <input type="text" name="q" size="40" />
-        <input type="submit" class="submit" value="Submit" />
-	</form>
-</div>
-    [% INCLUDE 'patron-search-box.inc' %]
-			<ul>
+    <div id="header_search">
+        <div id="addbooks_search" class="residentsearch">
+	    <p class="tip">Search the catalog and the reservoir:</p>
+            <form name="search" action="addbooks.pl">
+                <input type="text" name="q" size="40" />
+                <input type="submit" class="submit" value="Submit" />
+            </form>
+        </div>
+
+        [% IF ( CAN_user_circulate ) %]
+        <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" id="ret_barcode" size="40" />
+                <input value="Submit" class="submit" type="submit" />
+            </form>
+        </div>
+        [% END %]
+
+        [% IF ( CAN_user_catalogue ) %]
+        <div id="catalog_search" class="residentsearch">
+            <p class="tip">Enter search keywords:</p>
+            <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+                <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                <input type="submit" class="submit" value="Submit" />
+            </form>
+        </div>
+        [% END %]
+
+        [% INCLUDE 'patron-search-box.inc' %]
+        <ul>
             <li><a href="#addbooks_search">Cataloging search</a></li>
             [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-			</ul>	
-</div><!-- /header_search -->
+            [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
+            <li><a href="#catalog_search">Search the catalog</a></li>
+        </ul>
+    </div><!-- /header_search -->
 </div><!-- /gradient -->
 <!-- End Cataloging Resident Search Box -->
-- 
2.39.5