From b6e604c80e9c69007a63a7b55c81325ecf0f3672 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=83=C2=A9d=C3=83=C2=A9ric=20DEMIANS?=
 <f.demians@tamil.fr>
Date: Wed, 24 Oct 2007 13:11:48 -0500
Subject: [PATCH] patch

See attached file. Thanks.

>From 1c3021f31675193ad2e9b91a95191f9ae0caeff2 Mon Sep 17 00:00:00 2001
From: Frederic Demians <f.demians@tamil.fr>
Date: Wed, 24 Oct 2007 11:50:08 +0200
Subject: [PATCH] Borrower name autocompletion improvement
 Autocompletion is selected by syspref directly in circ-search.inc.
 This way it could be activated elsewhere just by adding CircAutocompl
 param into page using circ-search.inc.
 Done for example in circ/branchtransfers.pl. Must be done in all other
 circ/*.pl pages.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 circ/branchtransfers.pl                            |   1 +
 .../prog/en/includes/circ-search-autocompl.inc     | 162 -----------------
 .../intranet-tmpl/prog/en/includes/circ-search.inc | 198 ++++++++++++++++++---
 .../prog/en/modules/circ/circulation.tmpl          |   5 -
 4 files changed, 172 insertions(+), 194 deletions(-)
 delete mode 100755 koha-tmpl/intranet-tmpl/prog/en/includes/circ-search-autocompl.inc
 mode change 100644 => 100755 koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
 mode change 100644 => 100755 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl

diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl
index 76b1d14e6a..7d15cf7677 100755
--- a/circ/branchtransfers.pl
+++ b/circ/branchtransfers.pl
@@ -216,6 +216,7 @@ $template->param(
     trsfitemloop            => \@trsfitemloop,
     branchoptionloop        => \@branchoptionloop,
     errmsgloop              => \@errmsgloop,
+    CircAutocompl           => C4::Context->preference("CircAutocompl")
 );
 output_html_with_http_headers $query, $cookie, $template->output;
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search-autocompl.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search-autocompl.inc
deleted file mode 100755
index ccc13b03bd..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search-autocompl.inc
+++ /dev/null
@@ -1,162 +0,0 @@
-<!-- Begin Circulation Resident Search Box -->
-
-
-
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/utilities/utilities.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/autocomplete/autocomplete-min.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/yahoo-dom-event/yahoo-dom-event-min.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/element/element-beta-min.js"></script>
-
-
-
-<style type="text/css">
-.yui-skin-sam .yui-ac {
-    position:relative;
-    font-size:100%;
-}
-.yui-skin-sam .yui-ac-input { 
-    position:absolute;
-    width:100%;}
-.yui-skin-sam .yui-ac-container { 
-    position:absolute;
-    top:1.6em;
-    width:100%;
-}
-.yui-skin-sam .yui-ac-content {
-    position:absolute;
-    width:100%;
-    border:1px solid #808080;
-    background:#fff;
-    overflow:hidden;
-    z-index:9050;
-}
-.yui-skin-sam .yui-ac-shadow {
-    position:absolute;
-    margin:.3em;
-    width:100%;
-    background:#000;
-    -moz-opacity:0.10;
-    opacity:.10;
-    filter:alpha(opacity=10);
-    z-index:9049;
-}
-.yui-skin-sam .yui-ac-content ul {
-    margin:0;
-    padding:0;
-    width:100%;
-}
-.yui-skin-sam .yui-ac-content li {
-    margin:0;
-    padding:2px 5px;
-    cursor:default;
-    white-space:nowrap;
-}
-.yui-skin-sam .yui-ac-content li.yui-ac-prehighlight {
-    background:#B3D4FF;
-}
-.yui-skin-sam .yui-ac-content li.yui-ac-highlight {
-    background:#426FD9;
-    color:#FFF;
-}
-
-
-
-#borrowerautocomplete { width: 405px; 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; }  */
-#yborrowercontainer { text-align:left;width:300px; }
-</style>
-
-
-<div id="header_search">
-
-<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">
-        <div class="yui-skin-sam">
-            <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" value="Submit">
-                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-                <input name="printer" value="" type="hidden" />
-            </div>
-        </div>
-    </form>
-</div>	
-
-<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" maxlength="14" />
-        <input value="Submit" type="submit" />
-    </form>
-</div>
-
-<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" />
-        <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/circ/returns.pl#checkin_search">Check In</a></li>
-    <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
-</ul>   
-
-</div>
-
-
-<script type="text/javascript">
-YAHOO.bsearch.ACFlatData = 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>
-
-<!-- End Circulation Resident Search Box -->
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
new mode 100755
index c4b827b2fa..9a56b64758
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -1,32 +1,176 @@
 <!-- Begin Circulation Resident Search Box -->
+
+<!-- TMPL_IF NAME="CircAutocompl" -->
+
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/utilities/utilities.js"></script>
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/autocomplete/autocomplete-min.js"></script>
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/yahoo-dom-event/yahoo-dom-event-min.js"></script>
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/element/element-beta-min.js"></script>
+
+<style type="text/css">
+.yui-skin-sam .yui-ac {
+    position:relative;
+    font-size:100%;
+}
+.yui-skin-sam .yui-ac-input { 
+    position:absolute;
+    width:100%;}
+.yui-skin-sam .yui-ac-container { 
+    position:absolute;
+    top:1.6em;
+    width:100%;
+}
+.yui-skin-sam .yui-ac-content {
+    position:absolute;
+    width:100%;
+    border:1px solid #808080;
+    background:#fff;
+    overflow:hidden;
+    z-index:9050;
+}
+.yui-skin-sam .yui-ac-shadow {
+    position:absolute;
+    margin:.3em;
+    width:100%;
+    background:#000;
+    -moz-opacity:0.10;
+    opacity:.10;
+    filter:alpha(opacity=10);
+    z-index:9049;
+}
+.yui-skin-sam .yui-ac-content ul {
+    margin:0;
+    padding:0;
+    width:100%;
+}
+.yui-skin-sam .yui-ac-content li {
+    margin:0;
+    padding:2px 5px;
+    cursor:default;
+    white-space:nowrap;
+}
+.yui-skin-sam .yui-ac-content li.yui-ac-prehighlight {
+    background:#B3D4FF;
+}
+.yui-skin-sam .yui-ac-content li.yui-ac-highlight {
+    background:#426FD9;
+    color:#FFF;
+}
+
+
+
+#borrowerautocomplete { width: 405px; 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; }  */
+#yborrowercontainer { text-align:left;width:300px; }
+</style>
+
+<script type="text/javascript">
+
+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="header_search">
-	<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">
-    <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" type="submit" />
-	</form>
-	</div>	
-	<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" maxlength="14" />
-	    <input value="Submit" type="submit" />
+
+<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="yui-skin-sam">
+            <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" 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" type="submit" />
+
+<!-- /TMPL_IF -->
+
     </form>
-	</div>
-	<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" />
-				<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/circ/returns.pl#checkin_search">Check In</a></li>
-			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
-			</ul>	
+</div>  
+
+<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" maxlength="14" />
+        <input value="Submit" type="submit" />
+    </form>
+</div>
+
+<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" />
+        <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/circ/returns.pl#checkin_search">Check In</a></li>
+    <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+</ul>   
+
 </div>
+
 <!-- End Circulation Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
old mode 100644
new mode 100755
index 209d8ee53f..171bb3e4a6
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -18,12 +18,7 @@
 <body class="yui-skin-sam">
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-
-<!-- TMPL_IF NAME="CircAutocompl" -->
-<!-- TMPL_INCLUDE NAME="circ-search-autocompl.inc" -->
-<!-- TMPL_ELSE -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
-<!-- /TMPL_IF -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo;<!-- TMPL_IF NAME="borrowernumber" --> <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> &rsaquo; <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- TMPL_ELSE --> <strong>Checkouts</strong><!-- /TMPL_IF --></div>
 
-- 
2.11.0