From: Jesse Weaver <jesse.weaver@liblime.com>
Date: Thu, 14 Aug 2008 18:08:47 +0000 (-0500)
Subject: Fix for bug 2155: duplicate checkin box on returns screen
X-Git-Tag: ontop~928
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=c6e2bcf67d92bbf3297bcf3fbcd43bfd50f528bb;p=koha.git

Fix for bug 2155: duplicate checkin box on returns screen

This changes some css and markup to make the return box at the top not show when one is on the checkin screen. It also moves the markup for the autocompleting search box to its own file.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 3f825dc2bc..cad023413c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1581,13 +1581,12 @@ span.permissiondesc {
 }
 /* autocomplete additions */
 #borrowerautocomplete { width: 450px; text-align:left;} /* z-index needed on top instances for ie & sf absolute inside relative issue */
-.autocomplete { width:130px; }/* set width of widget here*/
 .autocomplete .yui-ac-highlight ,
 .autocomplete .yui-ac-highlight .sample-result,
 .autocomplete .yui-ac-highlight .sample-query { color:#FFF; }
 .autocomplete .sample-result { color: black; }
 .autocomplete .sample-query { color:#000; }
-#findborrower { position:static; width:335px; }
+#findborrower { position:static; width:auto; }
 #yborrowercontainer { text-align:left;width:335px; }
 #mainuserblock {
 	border : 1px solid #E8E8E8;
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 3126af2b79..6d07dd1c18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -1,49 +1,5 @@
 
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Cataloging Resident Search Box -->
-<!-- TMPL_IF NAME="CAN_user_circulate" --><!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
-//<![CDATA[
-YAHOO.util.Event.onContentReady("header_search", function() {
-    new function() {
-        // Define a custom formatter function
-        this.fnCustomFormatter = function(oResultItem, sQuery) {
-            var name        = oResultItem[0];
-            var cardnumber  = oResultItem[1];
-            var address     = oResultItem[2];
-            var city        = oResultItem[3];
-            var zip         = oResultItem[4];
-            var aMarkup = [
-                "<div class=\"sample-result\">",
-                name,
-                " (",
-                cardnumber,
-                ")<small> -- ",
-                address,
-                ", ",
-                city,
-                "</small>",
-                "</div>"];
-            return (aMarkup.join(""));
-        };
-
-        // Instantiate one XHR DataSource and define schema as an array:
-        //     ["Record Delimiter",
-        //     "Field Delimiter"]
-        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
-        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
-        this.oACDS.maxCacheEntries = 60;
-        this.oACDS.queryMatchSubset = true;
-    
-        // Instantiate first AutoComplete
-        var myInput = document.getElementById('findborrower');
-        var myContainer = document.getElementById('yborrowercontainer');
-        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
-        //this.oAutoComp.delimChar = ";";
-        //this.oAutoComp.queryDelay = 1;
-        this.oAutoComp.formatResult = this.fnCustomFormatter;
-}
-});
-//]]>
-</script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <div id="header_search">
 <div id="addbooks_search" class="residentsearch">
 	<p class="tip">Search the catalog and the reservoir:</p>
@@ -52,32 +8,10 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         <input type="submit" class="submit" value="Submit" />
 	</form>
 </div>
-<!-- TMPL_IF NAME="CAN_user_circulate" -->
-	<div id="circ_search" class="residentsearch" style="display:none;">
-	<p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <!-- TMPL_IF NAME="CircAutocompl" -->
-    <div class="autocomplete">
-            <div id="borrowerautocomplete" class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
-                <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-                <input name="printer" value="" type="hidden" />
-            </div>
-        </div>
-	<!-- TMPL_ELSE -->
-            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-            <input name="printer" value="" type="hidden" />
-            <input value="Submit" class="submit" type="submit" />
-	<!-- /TMPL_IF -->
-    </form>
-	</div>
-<!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="patron-search-box.inc" -->
 			<ul>
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#addbooks_search">Cataloguing Search</a></li>
 			<!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li><!-- /TMPL_IF -->
 			</ul>	
 </div>
-<!-- End Cataloging Resident Search Box -->
\ No newline at end of file
+<!-- End Cataloging Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
index 0c04e8fde7..d455649e2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -1,83 +1,7 @@
 
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Checkin Resident Search Box -->
-<!-- TMPL_IF NAME="CircAutocompl" --><!-- TMPL_IF NAME="CAN_user_circulate" --><script type="text/javascript">
-//<![CDATA[
-YAHOO.util.Event.onContentReady("header_search", function() {
-    new function() {
-        // Define a custom formatter function
-        this.fnCustomFormatter = function(oResultItem, sQuery) {
-            var name        = oResultItem[0];
-            var cardnumber  = oResultItem[1];
-            var address     = oResultItem[2];
-            var city        = oResultItem[3];
-            var zip         = oResultItem[4];
-            var aMarkup = [
-                "<div class=\"sample-result\">",
-                name,
-                " (",
-                cardnumber,
-                ")<small> -- ",
-                address,
-                ", ",
-                city,
-                "</small>",
-                "</div>"];
-            return (aMarkup.join(""));
-        };
-
-        // Instantiate one XHR DataSource and define schema as an array:
-        //     ["Record Delimiter",
-        //     "Field Delimiter"]
-        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
-        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
-        this.oACDS.maxCacheEntries = 60;
-        this.oACDS.queryMatchSubset = true;
-    
-        // Instantiate first AutoComplete
-        var myInput = document.getElementById('findborrower');
-        var myContainer = document.getElementById('yborrowercontainer');
-        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
-        //this.oAutoComp.delimChar = ";";
-        //this.oAutoComp.queryDelay = 1;
-        this.oAutoComp.formatResult = this.fnCustomFormatter;
-}
-});    
-//]]>
-</script><!-- /TMPL_IF --><!-- /TMPL_IF -->
-
 <div id="header_search">
-<!-- TMPL_IF NAME="CAN_user_circulate" -->
-<div id="circ_search" class="residentsearch" style="display:none;">
-    <p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <!-- TMPL_IF NAME="CircAutocompl" -->
-    <div class="autocomplete">
-            <div id="borrowerautocomplete" class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" type="text" />
-                <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-                <input name="printer" value="" type="hidden" />
-            </div>
-        </div>
-	<!-- TMPL_ELSE -->
-            <input id="findborrower" name="findborrower" size="40" type="text" />
-            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-            <input name="printer" value="" type="hidden" />
-            <input value="Submit" class="submit" type="submit" />
-	<!-- /TMPL_IF -->
-    </form>
-</div>  
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="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">
-        <input name="barcode" id="ret_barcode" size="40" />
-        <input value="Submit" class="submit" type="submit" />
-    </form>
-</div>
-<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="patron-search-box.inc" -->
 <!-- TMPL_IF NAME="CAN_user_catalogue" -->
 <div id="catalog_search" class="residentsearch" style="display:none;">
     <p class="tip">Enter search keywords:</p>
@@ -89,7 +13,6 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 <!-- /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 class="ui-tabs-selected"><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>   
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 7f80ce2e7c..4b8841be4e 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -1,73 +1,8 @@
 
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Circulation Resident Search Box -->
-<!-- TMPL_IF NAME="CAN_user_circulate" --><!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
-//<![CDATA[
-YAHOO.util.Event.onContentReady("header_search", function() {
-    new function() {
-        // Define a custom formatter function
-        this.fnCustomFormatter = function(oResultItem, sQuery) {
-            var name        = oResultItem[0];
-            var cardnumber  = oResultItem[1];
-            var address     = oResultItem[2];
-            var city        = oResultItem[3];
-            var zip         = oResultItem[4];
-            var aMarkup = [
-                "<div class=\"sample-result\">",
-                name,
-                " (",
-                cardnumber,
-                ")<small> -- ",
-                address,
-                ", ",
-                city,
-                "</small>",
-                "</div>"];
-            return (aMarkup.join(""));
-        };
-
-        // Instantiate one XHR DataSource and define schema as an array:
-        //     ["Record Delimiter",
-        //     "Field Delimiter"]
-        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
-        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
-        this.oACDS.maxCacheEntries = 60;
-        this.oACDS.queryMatchSubset = true;
-    
-        // Instantiate first AutoComplete
-        var myInput = document.getElementById('findborrower');
-        var myContainer = document.getElementById('yborrowercontainer');
-        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
-        //this.oAutoComp.delimChar = ";";
-        //this.oAutoComp.queryDelay = 1;
-        this.oAutoComp.formatResult = this.fnCustomFormatter;
-}
-});    
-//]]>
-</script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
 <div id="header_search">
-<!-- TMPL_IF NAME="CAN_user_circulate" -->
-<div id="circ_search" class="residentsearch">
-    <p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <!-- TMPL_IF NAME="CircAutocompl" -->
-    <div class="autocomplete">
-            <div id="borrowerautocomplete" class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" accesskey="u" />
-                <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-                <input name="printer" value="" type="hidden" />
-            </div>
-        </div>
-	<!-- TMPL_ELSE -->
-            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" accesskey="u" />
-            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-            <input name="printer" value="" type="hidden" />
-            <input value="Submit" class="submit" type="submit" />
-	<!-- /TMPL_IF -->
-    </form>
-</div>  <!-- /TMPL_IF -->
+    <!-- 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>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index ca5446cf78..685c4fb491 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -1,49 +1,5 @@
 
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Currencies Resident Search Box -->
-<!-- TMPL_IF NAME="CAN_user_circulate" --><!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
-//<![CDATA[
-YAHOO.util.Event.onContentReady("header_search", function() {
-    new function() {
-        // Define a custom formatter function
-        this.fnCustomFormatter = function(oResultItem, sQuery) {
-            var name        = oResultItem[0];
-            var cardnumber  = oResultItem[1];
-            var address     = oResultItem[2];
-            var city        = oResultItem[3];
-            var zip         = oResultItem[4];
-            var aMarkup = [
-                "<div class=\"sample-result\">",
-                name,
-                " (",
-                cardnumber,
-                ")<small> -- ",
-                address,
-                ", ",
-                city,
-                "</small>",
-                "</div>"];
-            return (aMarkup.join(""));
-        };
-
-        // Instantiate one XHR DataSource and define schema as an array:
-        //     ["Record Delimiter",
-        //     "Field Delimiter"]
-        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
-        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
-        this.oACDS.maxCacheEntries = 60;
-        this.oACDS.queryMatchSubset = true;
-    
-        // Instantiate first AutoComplete
-        var myInput = document.getElementById('findborrower');
-        var myContainer = document.getElementById('yborrowercontainer');
-        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
-        //this.oAutoComp.delimChar = ";";
-        //this.oAutoComp.queryDelay = 1;
-        this.oAutoComp.formatResult = this.fnCustomFormatter;
-}
-});    
-//]]>
-</script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="currency_search" class="residentsearch">
 	<p class="tip">Currencies Search:</p>
@@ -52,28 +8,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
                 <input type="submit" class="submit" name="search" value="Search" />
         </form>	
 	</div>
-	<!-- TMPL_IF NAME="CAN_user_circulate" -->
-	<div id="circ_search" class="residentsearch" style="display:none;">
-	<p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <!-- TMPL_IF NAME="CircAutocompl" -->
-    <div class="autocomplete">
-            <div id="borrowerautocomplete" class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
-                <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-                <input name="printer" value="" type="hidden" />
-            </div>
-        </div>
-	<!-- TMPL_ELSE -->
-            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-            <input name="printer" value="" type="hidden" />
-            <input value="Submit" class="submit" type="submit" />
-	<!-- /TMPL_IF -->
-    </form>
-	</div><!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="patron-search-box.inc" -->
 	<!-- TMPL_IF NAME="CAN_user_catalogue" -->
 	<div id="catalog_search" class="residentsearch" style="display:none;">
 	<p class="tip">Enter search keywords:</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index d17be5169d..a198137ace 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -1,49 +1,5 @@
 
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Notices Resident Search Box -->
-<!-- TMPL_IF NAME="CAN_user_circulate" --><!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
-//<![CDATA[
-YAHOO.util.Event.onContentReady("header_search", function() {
-    new function() {
-        // Define a custom formatter function
-        this.fnCustomFormatter = function(oResultItem, sQuery) {
-            var name        = oResultItem[0];
-            var cardnumber  = oResultItem[1];
-            var address     = oResultItem[2];
-            var city        = oResultItem[3];
-            var zip         = oResultItem[4];
-            var aMarkup = [
-                "<div class=\"sample-result\">",
-                name,
-                " (",
-                cardnumber,
-                ")<small> -- ",
-                address,
-                ", ",
-                city,
-                "</small>",
-                "</div>"];
-            return (aMarkup.join(""));
-        };
-
-        // Instantiate one XHR DataSource and define schema as an array:
-        //     ["Record Delimiter",
-        //     "Field Delimiter"]
-        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
-        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
-        this.oACDS.maxCacheEntries = 60;
-        this.oACDS.queryMatchSubset = true;
-    
-        // Instantiate first AutoComplete
-        var myInput = document.getElementById('findborrower');
-        var myContainer = document.getElementById('yborrowercontainer');
-        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
-        //this.oAutoComp.delimChar = ";";
-        //this.oAutoComp.queryDelay = 1;
-        this.oAutoComp.formatResult = this.fnCustomFormatter;
-}
-});    
-//]]>
-</script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="notices_search" class="residentsearch">
 	<p class="tip">Search Existing Notices:</p>
@@ -52,28 +8,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
                 <input type="submit" class="submit" name="search" value="Search" />
         </form>	
 	</div>
-	<!-- TMPL_IF NAME="CAN_user_circulate" -->
-	<div id="circ_search" class="residentsearch" style="display:none;">
-	<p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <!-- TMPL_IF NAME="CircAutocompl" -->
-    <div class="autocomplete">
-            <div id="borrowerautocomplete" class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
-                <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-                <input name="printer" value="" type="hidden" />
-            </div>
-        </div>
-	<!-- TMPL_ELSE -->
-            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-            <input name="printer" value="" type="hidden" />
-            <input value="Submit" class="submit" type="submit" />
-	<!-- /TMPL_IF -->
-    </form>
-	</div>	<!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="patron-search-box.inc" -->
 	<!-- TMPL_IF NAME="CAN_user_catalogue" -->
 	<div id="catalog_search" class="residentsearch" style="display:none;">
 	<p class="tip">Enter search keywords:</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
new file mode 100644
index 0000000000..6bfb4397fd
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
@@ -0,0 +1,66 @@
+<!-- TMPL_IF NAME="CAN_user_circulate" --><!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class=\"sample-result\">",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+//]]>
+</script><!-- /TMPL_IF -->
+	<div id="circ_search" class="residentsearch" style="display:none;">
+	<p class="tip">Enter patron card number or partial name:</p>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" class="submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
+	</div>
+	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index 78cade10d8..3fc260b984 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -1,49 +1,5 @@
 
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Patrons Admin Resident Search Box -->
-<!-- TMPL_IF NAME="CAN_user_circulate" --><!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
-//<![CDATA[
-YAHOO.util.Event.onContentReady("header_search", function() {
-    new function() {
-        // Define a custom formatter function
-        this.fnCustomFormatter = function(oResultItem, sQuery) {
-            var name        = oResultItem[0];
-            var cardnumber  = oResultItem[1];
-            var address     = oResultItem[2];
-            var city        = oResultItem[3];
-            var zip         = oResultItem[4];
-            var aMarkup = [
-                "<div class=\"sample-result\">",
-                name,
-                " (",
-                cardnumber,
-                ")<small> -- ",
-                address,
-                ", ",
-                city,
-                "</small>",
-                "</div>"];
-            return (aMarkup.join(""));
-        };
-
-        // Instantiate one XHR DataSource and define schema as an array:
-        //     ["Record Delimiter",
-        //     "Field Delimiter"]
-        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
-        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
-        this.oACDS.maxCacheEntries = 60;
-        this.oACDS.queryMatchSubset = true;
-    
-        // Instantiate first AutoComplete
-        var myInput = document.getElementById('findborrower');
-        var myContainer = document.getElementById('yborrowercontainer');
-        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
-        //this.oAutoComp.delimChar = ";";
-        //this.oAutoComp.queryDelay = 1;
-        this.oAutoComp.formatResult = this.fnCustomFormatter;
-}
-});    
-//]]>
-</script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="patron_category_search" class="residentsearch">
 	<p class="tip">Search by Patron Category Name:</p>
@@ -52,28 +8,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 		<input type="submit" class="submit" name="search" value="Search" />
 	</form>	
 	</div>
-	<!-- TMPL_IF NAME="CAN_user_circulate" -->
-	<div id="circ_search" class="residentsearch" style="display:none;">
-	<p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <!-- TMPL_IF NAME="CircAutocompl" -->
-    <div class="autocomplete">
-            <div id="borrowerautocomplete" class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
-                <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-                <input name="printer" value="" type="hidden" />
-            </div>
-        </div>
-	<!-- TMPL_ELSE -->
-            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-            <input name="printer" value="" type="hidden" />
-            <input value="Submit" class="submit" type="submit" />
-	<!-- /TMPL_IF -->
-    </form>
-	</div>	<!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="patron-search-box.inc" -->
 	<!-- TMPL_IF NAME="CAN_user_catalogue" -->
 	<div id="catalog_search" class="residentsearch" style="display:none;">
 	<p class="tip">Enter search keywords:</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
index cb00c56b58..7280518360 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
@@ -1,49 +1,5 @@
 
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Printers Resident Search Box -->
-<!-- TMPL_IF NAME="CAN_user_circulate" --><!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
-//<![CDATA[
-YAHOO.util.Event.onContentReady("header_search", function() {
-    new function() {
-        // Define a custom formatter function
-        this.fnCustomFormatter = function(oResultItem, sQuery) {
-            var name        = oResultItem[0];
-            var cardnumber  = oResultItem[1];
-            var address     = oResultItem[2];
-            var city        = oResultItem[3];
-            var zip         = oResultItem[4];
-            var aMarkup = [
-                "<div class=\"sample-result\">",
-                name,
-                " (",
-                cardnumber,
-                ")<small> -- ",
-                address,
-                ", ",
-                city,
-                "</small>",
-                "</div>"];
-            return (aMarkup.join(""));
-        };
-
-        // Instantiate one XHR DataSource and define schema as an array:
-        //     ["Record Delimiter",
-        //     "Field Delimiter"]
-        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
-        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
-        this.oACDS.maxCacheEntries = 60;
-        this.oACDS.queryMatchSubset = true;
-    
-        // Instantiate first AutoComplete
-        var myInput = document.getElementById('findborrower');
-        var myContainer = document.getElementById('yborrowercontainer');
-        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
-        //this.oAutoComp.delimChar = ";";
-        //this.oAutoComp.queryDelay = 1;
-        this.oAutoComp.formatResult = this.fnCustomFormatter;
-}
-});    
-//]]>
-</script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="printer_search" class="residentsearch">
 	<p class="tip">Printer Search:</p>
@@ -52,29 +8,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
                 <input type="submit" name="submit" value="Search" />
         </form>
 	</div>
-	<!-- TMPL_IF NAME="CAN_user_circulate" -->
-	<div id="circ_search" class="residentsearch" style="display:none;">
-	<p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <!-- TMPL_IF NAME="CircAutocompl" -->
-    <div class="autocomplete">
-            <div id="borrowerautocomplete" class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
-                <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-                <input name="printer" value="" type="hidden" />
-            </div>
-        </div>
-	<!-- TMPL_ELSE -->
-            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-            <input name="printer" value="" type="hidden" />
-            <input value="Submit" class="submit" type="submit" />
-	<!-- /TMPL_IF -->
-    </form>
-	</div>
-	<!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="patron-search-box.inc" -->
 	<!-- TMPL_IF NAME="CAN_user_catalogue" -->
 	<div id="catalog_search" class="residentsearch" style="display:none;">
 	<p class="tip">Enter search keywords:</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index 12504a7f2c..c4ed7bf423 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -1,78 +1,12 @@
 
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Serials Resident Search Box -->
-<!-- TMPL_IF NAME="CAN_user_circulate" --><!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
-//<![CDATA[
-YAHOO.util.Event.onContentReady("header_search", function() {
-    new function() {
-        // Define a custom formatter function
-        this.fnCustomFormatter = function(oResultItem, sQuery) {
-            var name        = oResultItem[0];
-            var cardnumber  = oResultItem[1];
-            var address     = oResultItem[2];
-            var city        = oResultItem[3];
-            var zip         = oResultItem[4];
-            var aMarkup = [
-                "<div class=\"sample-result\">",
-                name,
-                " (",
-                cardnumber,
-                ")<small> -- ",
-                address,
-                ", ",
-                city,
-                "</small>",
-                "</div>"];
-            return (aMarkup.join(""));
-        };
-
-        // Instantiate one XHR DataSource and define schema as an array:
-        //     ["Record Delimiter",
-        //     "Field Delimiter"]
-        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
-        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
-        this.oACDS.maxCacheEntries = 60;
-        this.oACDS.queryMatchSubset = true;
-    
-        // Instantiate first AutoComplete
-        var myInput = document.getElementById('findborrower');
-        var myContainer = document.getElementById('yborrowercontainer');
-        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
-        //this.oAutoComp.delimChar = ";";
-        //this.oAutoComp.queryDelay = 1;
-        this.oAutoComp.formatResult = this.fnCustomFormatter;
-}
-});    
-//]]>
-</script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="subscription_search" class="residentsearch">
 	<p class="tip">Search Subscriptions:</p>
  <form action="/cgi-bin/koha/serials/serials-home.pl" method="get"><!-- TMPL_IF NAME="routing" --><input type="hidden" name="routing" value="<!-- TMPL_VAR NAME="routing" -->" /><!-- /TMPL_IF --><input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="<!-- TMPL_VAR name="ISSN_filter" -->" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="<!-- TMPL_VAR name="title_filter" -->" /><input type="submit" value="Search" class="submit" />
 </form>
 	</div>
-<!-- TMPL_IF NAME="CAN_user_circulate" -->
-<div id="circ_search" class="residentsearch" style="display:none;">
-	<p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <!-- TMPL_IF NAME="CircAutocompl" -->
-    <div class="autocomplete">
-            <div id="borrowerautocomplete" class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
-                <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-                <input name="printer" value="" type="hidden" />
-            </div>
-        </div>
-	<!-- TMPL_ELSE -->
-            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-            <input name="printer" value="" type="hidden" />
-            <input value="Submit" class="submit" type="submit" />
-	<!-- /TMPL_IF -->
-    </form>
-</div>
-	<!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="patron-search-box.inc" -->
 	<!-- TMPL_IF NAME="CAN_user_catalogue" -->
 	<div id="catalog_search" class="residentsearch" style="display:none;">
 	<p class="tip">Enter search keywords:</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
index 3b56167c4a..c129587f5f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
@@ -1,48 +1,5 @@
 
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Stopwords Resident Search Box -->
-<!-- TMPL_IF NAME="CAN_user_circulate" --><!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
-//<![CDATA[
-YAHOO.util.Event.onContentReady("header_search", function() {
-    new function() {
-        // Define a custom formatter function
-        this.fnCustomFormatter = function(oResultItem, sQuery) {
-            var name        = oResultItem[0];
-            var cardnumber  = oResultItem[1];
-            var address     = oResultItem[2];
-            var city        = oResultItem[3];
-            var zip         = oResultItem[4];
-            var aMarkup = [
-                "<div class=\"sample-result\">",
-                name,
-                " (",
-                cardnumber,
-                ")<small> -- ",
-                address,
-                ", ",
-                city,
-                "</small>",
-                "</div>"];
-            return (aMarkup.join(""));
-        };
-
-        // Instantiate one XHR DataSource and define schema as an array:
-        //     ["Record Delimiter",
-        //     "Field Delimiter"]
-        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
-        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
-        this.oACDS.maxCacheEntries = 60;
-        this.oACDS.queryMatchSubset = true;
-    
-        // Instantiate first AutoComplete
-        var myInput = document.getElementById('findborrower');
-        var myContainer = document.getElementById('yborrowercontainer');
-        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
-        //this.oAutoComp.delimChar = ";";
-        //this.oAutoComp.queryDelay = 1;
-        this.oAutoComp.formatResult = this.fnCustomFormatter;
-}
-});     //]]>
-</script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="stopword_search" class="residentsearch">
 	<p class="tip">Stop word search:</p>
@@ -51,29 +8,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         <input type="submit" name="ok" class="submit" value="Search" />
     </form>
 	</div>
-<!-- TMPL_IF NAME="CAN_user_circulate" -->
-<div id="circ_search" class="residentsearch" style="display:none;">
-	<p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <!-- TMPL_IF NAME="CircAutocompl" -->
-    <div class="autocomplete">
-            <div id="borrowerautocomplete" class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
-                <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-                <input name="printer" value="" type="hidden" />
-            </div>
-        </div>
-	<!-- TMPL_ELSE -->
-            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-            <input name="printer" value="" type="hidden" />
-            <input value="Submit" class="submit" type="submit" />
-	<!-- /TMPL_IF -->
-    </form>
-</div>
-	<!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="patron-search-box.inc" -->
 	<!-- TMPL_IF NAME="CAN_user_catalogue" -->
 	<div id="catalog_search" class="residentsearch" style="display:none;">
 	<p class="tip">Enter search keywords:</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
index 13f8e2cd53..2d53cd0800 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
@@ -1,48 +1,5 @@
 
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Stopwords Resident Search Box -->
-<!-- TMPL_IF NAME="CAN_user_circulate" --><!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
-//<![CDATA[
-YAHOO.util.Event.onContentReady("header_search", function() {
-    new function() {
-        // Define a custom formatter function
-        this.fnCustomFormatter = function(oResultItem, sQuery) {
-            var name        = oResultItem[0];
-            var cardnumber  = oResultItem[1];
-            var address     = oResultItem[2];
-            var city        = oResultItem[3];
-            var zip         = oResultItem[4];
-            var aMarkup = [
-                "<div class=\"sample-result\">",
-                name,
-                " (",
-                cardnumber,
-                ")<small> -- ",
-                address,
-                ", ",
-                city,
-                "</small>",
-                "</div>"];
-            return (aMarkup.join(""));
-        };
-
-        // Instantiate one XHR DataSource and define schema as an array:
-        //     ["Record Delimiter",
-        //     "Field Delimiter"]
-        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
-        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
-        this.oACDS.maxCacheEntries = 60;
-        this.oACDS.queryMatchSubset = true;
-    
-        // Instantiate first AutoComplete
-        var myInput = document.getElementById('findborrower');
-        var myContainer = document.getElementById('yborrowercontainer');
-        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
-        //this.oAutoComp.delimChar = ";";
-        //this.oAutoComp.queryDelay = 1;
-        this.oAutoComp.formatResult = this.fnCustomFormatter;
-}
-});     //]]>
-</script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="syspref_search" class="residentsearch">
 	<p class="tip">System preference search:</p>
@@ -52,29 +9,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         <input type="submit" name="ok" class="submit" value="Search" />
     </form>
 	</div>
-<!-- TMPL_IF NAME="CAN_user_circulate" -->
-<div id="circ_search" class="residentsearch" style="display:none;">
-	<p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <!-- TMPL_IF NAME="CircAutocompl" -->
-    <div class="autocomplete">
-            <div id="borrowerautocomplete" class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
-                <div id="yborrowercontainer"></div>
-                <input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
-                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-                <input name="printer" value="" type="hidden" />
-            </div>
-        </div>
-	<!-- TMPL_ELSE -->
-            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-            <input name="printer" value="" type="hidden" />
-            <input value="Submit" class="submit" type="submit" />
-	<!-- /TMPL_IF -->
-    </form>
-</div>
-	<!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="patron-search-box.inc" -->
 	<!-- TMPL_IF NAME="CAN_user_catalogue" -->
 	<div id="catalog_search" class="residentsearch" style="display:none;">
 	<p class="tip">Enter search keywords:</p>