Fix for bug 2155: duplicate checkin box on returns screen

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / includes / circ-search.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
old mode 100644 (file)
new mode 100755 (executable)
index 5dadbd0..4b8841b
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -1,25 +1,31 @@
-<!-- Begin Circulation Resident Search Box -->
+
+<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Circulation Resident Search Box -->
+
 <div id="header_search">
-       <div id="circ_search">
-       <p class="tip">Enter patron card number or partial name:</p>
-       <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-                       <label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-       <input name="branch" value="CPL" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-       <input value="Submit" type="submit" />
-       </form>
-       </div>  
-       <div id="catalog_search">
-       <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" name="op" id="opac-submit" value="Submit"  class="form-submit" />
-               </form>
-       </div>
-                       <ul>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
-                       </ul>   
+    <!-- TMPL_INCLUDE NAME="patron-search-box.inc" -->
+<!-- TMPL_IF NAME="CAN_user_circulate" -->
+<div id="checkin_search" class="residentsearch" style="display:none;">
+    <p class="tip">Scan a barcode to check in:</p>
+    <form method="post" action="/cgi-bin/koha/circ/returns.pl">
+        <input name="barcode" id="ret_barcode" size="40" accesskey="r" />
+        <input value="Submit" class="submit" type="submit" />
+    </form>
+</div><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="CAN_user_catalogue" -->
+<div id="catalog_search" class="residentsearch" style="display:none;">
+    <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" accesskey="q" />
+        <input type="submit" class="submit" value="Submit"/>
+    </form>
+</div><!-- /TMPL_IF -->
+
+<ul>
+    <!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check In</a></li><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_catalogue" --><li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li><!-- /TMPL_IF -->
+</ul>   
+
 </div>
-<!-- End Circulation Resident Search Box -->
\ No newline at end of file
+
+<!-- End Circulation Resident Search Box -->