Revert "reverting defaut-search-on-kw-wrdl and doing it elsewhere"

This reverts commit 38884abf65f4da5da03fbe73824a29b5bfc5fb32.

This commit results in failed searches all over the place, I'm reverting
the revert :-)

Conflicts:

	koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search-autocompl.inc

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/catalogue/search.pl b/catalogue/search.pl
index 80b4cdc..2f05649 100755 (executable)
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -339,6 +339,8 @@ my @operators;
 my @indexes;
 if ($params->{'idx'}) {
     @indexes = split("\0",$params->{'idx'});
+} else {
+    $indexes[0] = 'kw,wrdl';
 }
 
 # an operand can be a single term, a phrase, or a complete ccl query

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/blue.css b/koha-tmpl/intranet-tmpl/prog/en/css/blue.css
index 7b2e030..b9c9083 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/blue.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/blue.css
@@ -74,7 +74,3 @@ input[type=submit], input[type=button], input[type=reset] {
 input[type=submit]:hover, input[type=button]:hover, input[type=reset]:hover {
     border:1px outset;
 }
-
-#bd {
-background-color:white;
-}
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 153e390..bf83038 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -13,9 +13,8 @@
        <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="hidden" name="idx" value="kw,wrdl" />
-                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                        <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>

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 0c45b5c..9a56b64 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -147,20 +147,30 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 <!-- /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="hidden" name="idx" value="kw,wrdl" />
-                    <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 -->
+<!-- End Circulation Resident Search Box -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index 74136b7..dc544a3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -22,7 +22,6 @@
                <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" />
-                               <input type="hidden" name="idx" value="kw,wrdl" />
                </form>
        </div>
                        <ul>

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 d207e79..d27032e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -20,9 +20,8 @@
        <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="hidden" name="idx" value="kw,wrdl" />
-                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                        <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>

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 13e0a5f..6dd994c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -20,9 +20,8 @@
        <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="hidden" name="idx" value="kw,wrdl" />
-                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                        <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>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
index 5d86fac..6ae46e5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
@@ -25,9 +25,8 @@
        <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="hidden" name="idx" value="kw,wrdl" />
-                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                        <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>

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 a574eef..190c885 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -20,9 +20,8 @@
        <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="hidden" name="idx" value="kw,wrdl" />
-                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                        <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>

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 7a7673f..f189555 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
@@ -20,9 +20,8 @@
        <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="hidden" name="idx" value="kw,wrdl" />
-                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                        <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>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
index 990be0b..128fd00 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
@@ -20,9 +20,8 @@
        <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="hidden" name="idx" value="kw,wrdl" />
-                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                        <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>

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 d99248b..eeb8362 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -17,9 +17,8 @@
        <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="hidden" name="idx" value="kw,wrdl" />
-                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                        <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>

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 0f6d6ba..9a0a8a0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
@@ -21,9 +21,8 @@
        <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="hidden" name="idx" value="kw,wrdl" />
-                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                        <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>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
index 5b00a23..a1c3f4b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -22,9 +22,8 @@
        <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="hidden" name="idx" value="kw,wrdl" />
-                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                        <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>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
index 62886f7..dfaf653 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -20,9 +20,8 @@
        <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="hidden" name="idx" value="kw,wrdl" />
-                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                        <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>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search-autocompl.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search-autocompl.inc
index 4850efe..ad37643 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search-autocompl.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search-autocompl.inc
@@ -102,8 +102,7 @@
     <p class="tip">Entrer les termes de recherche :</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" />
-=======
->>>>>>> french translation updated (again...):koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search-autocompl.inc
+        <input type="submit" name="op" id="opac-submit" value="Valider" class="form-submit">
     </form>
 </div>
 

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index cfb1bf3..1d4408b 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -17,7 +17,6 @@
         <!-- TMPL_IF name="mylibraryfirst" --><!-- TMPL_IF name="loggedinusername" -->
             <input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
         <!-- /TMPL_IF --><!-- /TMPL_IF -->
-        <input type="hidden" name="idx" value="kw,wrdl" />
         <input type="submit" value="OK" class="submit" />
     </form>
     <a href="/cgi-bin/koha/opac-search.pl">more search options</a>

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index a407024..8c56245 100755 (executable)
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -372,6 +372,8 @@ my @operators;
 my @indexes;
 if ($params->{'idx'}) {
     @indexes = split("\0",$params->{'idx'});
+} else {
+    $indexes[0] = 'kw,wrdl';
 }
 
 # an operand can be a single term, a phrase, or a complete ccl query