Bug 14189: Made text persist when clicking the tabs under the searchbox

To test:
Apply the patch and see that the text now is there in the search
box when clicking the tabs: check in, check out etc..

(More files changed for persistent text in searchbox)

Sponsored-by: Halland County Library
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
This is something I have wanted quite a few times over the years...

Tested by going to every main area of Koha, entering some random
text into the search box and then clicking on all the available tabs
to check that the entered text is carried over to all the boxes.

There are a couple of places where text is not carried over, but I
guess that might be because one of the boxes is structurally
different to the others. These are:
- "Vendor search" and "Orders search" in Acquisitions
- "Search subscriptions" in Serials

I have not looked at how this is implemented, just that it works as
it should.

Bug 14189 refactor after failed QA.

Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org>
Amended patch: replace tabs with spaces

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
index b99c52a..86d9b92 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
@@ -5,7 +5,7 @@
     <div id="budgets_search" class="residentsearch">
         <p class="tip">Search funds:</p>
         <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
-            <label for="filter_budgetname">Fund code: </label><input type="text" name="filter_budgetname" id="filter_budgetname" size="20" value="[% filter_budgetname %]" />
+            <label for="filter_budgetname">Fund code: </label><input class="query" type="text" name="filter_budgetname" id="filter_budgetname" size="20" value="[% filter_budgetname %]" />
             <label for="filter_budgetbranch">Library: </label>
             <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;">
                 <option value=""></option>
@@ -28,14 +28,14 @@
     <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" />
                 <input type="submit" value="Submit"  class="submit" />
         </form>
     </div>[% END %]
             <ul>
-            <li><a href="#budgets_search">Search funds</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a onclick="keep_text(0)" href="#budgets_search">Search funds</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
             </ul>
 </div>
 </div>

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 84cc333..6eae193 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -8,7 +8,7 @@
 <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 class="head-searchbox" name="barcode" id="ret_barcode" size="40" />
         <input value="Submit" class="submit" type="submit" />
     </form>
 </div>
@@ -17,16 +17,16 @@
        <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                                <input type="submit" class="submit" value="Submit" />
                </form>
        </div>
        [% END %]
        
                        <ul>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li onclick="keep_text(2)" class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
 </div><!-- /header_search -->
 </div><!-- /gradient -->

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 7315205..1fda946 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -5,7 +5,7 @@
         <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 class="head-searchbox" type="text" name="q" size="40" />
                 <input type="submit" class="submit" value="Submit" />
             </form>
         </div>
@@ -14,7 +14,7 @@
         <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 class="head-searchbox" name="barcode" id="ret_barcode" size="40" />
                 <input value="Submit" class="submit" type="submit" />
             </form>
         </div>
@@ -23,17 +23,17 @@
         <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                 <input type="submit" class="submit" value="Submit" />
             </form>
         </div>
 
         [% 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 %]
-            [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
-            <li><a href="#catalog_search">Search the catalog</a></li>
+            <li><a onclick="keep_text(0)" href="#addbooks_search">Cataloging search</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
+            <li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>
         </ul>
     </div><!-- /header_search -->
 </div><!-- /gradient -->

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 cf96ab9..4f1e2b9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -6,14 +6,14 @@
 <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 class="head-searchbox" type="text" name="q" id="search-form" size="40" />
         <input type="submit" class="submit" value="Submit"/>
     </form>
 </div>
 [% END %]
 <ul>
-    [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(1)" href="#catalog_search">Search the catalog</a></li>[% END %]
 </ul>   
 
 </div>

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 5a145c6..ab730ba 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -7,7 +7,7 @@
 <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" accesskey="r" />
+        <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" />
         <input value="Submit" class="submit" type="submit" />
     </form>
 </div>[% END %]
@@ -15,15 +15,15 @@
 <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" accesskey="q" />
+        <input class="head-searchbox" type="text" name="q" id="search-form" size="40" accesskey="q" />
         <input type="submit" class="submit" value="Submit"/>
     </form>
 </div>[% END %]
 
 <ul>
-    [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
 </ul>   
 
 </div><!-- /header_search -->

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 191f7f3..41bfdc4 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
@@ -4,7 +4,7 @@
        <div id="city_search" class="residentsearch">
     <p class="tip">City search:</p>
        <form action="[% script_name %]" method="post">
-               <input type="text" name="city_name" value="[% searchfield %]" size="40" />
+        <input class="head-searchbox" type="text" name="city_name" value="[% searchfield %]" size="40" />
                <input type="submit" name="submit" value="OK" class="submit" />
        </form>
        </div>
@@ -15,14 +15,14 @@
     <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                                <input type="submit" value="Submit"  class="submit" />
                </form>
        </div>[% END %]
                        <ul>
-            <li><a href="#city_search">Search cities</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a onclick="keep_text(0)" href="#city_search">Search cities</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
 </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
index 88145fb..1d38559 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
@@ -5,7 +5,7 @@
        <div id="contract_description_search" class="residentsearch">
        <p class="tip">Search by contract name or/and description:</p>
        <form action="[% script_name %]" method="post">
-               <input type="text" name="searchfield" size="40" value="[% searchfield %]" />
+        <input class="head-searchbox" type="text" name="searchfield" size="40" value="[% searchfield %]" />
                <input type="submit" class="submit" name="search" value="Search" />
        </form> 
        </div>
@@ -16,14 +16,14 @@
     <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                                <input type="submit" value="Submit"  class="submit" />
                </form>
        </div>[% END %]
                        <ul>
-            <li><a href="#contract_description_search">Search contracts</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a onclick="keep_text(0)" href="#contract_description_search">Search contracts</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
 </div>
 </div><!-- /gradient -->

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 7ac9e3f..cbd6e5c 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
@@ -4,7 +4,7 @@
        <div id="currency_search" class="residentsearch">
     <p class="tip">Currencies search:</p>
         <form action="[% script_name %]" method="post">
-                <input type="text" name="description" size="40" value="[% searchfield %]" />
+                <input class="head-searchbox" type="text" name="description" size="40" value="[% searchfield %]" />
                 <input type="submit" class="submit" name="search" value="Search" />
         </form>        
        </div>
@@ -13,14 +13,14 @@
     <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                                <input type="submit" value="Submit"  class="submit" />
                </form>
        </div>[% END %]
                        <ul>
-            <li><a href="#currency_search">Search currencies</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a onclick="keep_text(0)" href="#currency_search">Search currencies</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
 </div>
 </div><!-- /gradient -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 2f80b78..a93435b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -56,3 +56,6 @@ var NO_LOCAL_JACKET = _("No cover image available");
 //]]>
 </script>
 [% END %]
+
+<!-- For keeping the text when navigating the search tabs -->
+[% INCLUDE 'searchbox-keep-text.inc' %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
index f61ce85..fbf3618 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
@@ -7,7 +7,7 @@
 <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" accesskey="r" />
+        <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
         <input value="Submit" class="submit" type="submit" />
     </form>
 </div>[% END %]
@@ -15,7 +15,7 @@
 <div id="patron_search" class="residentsearch">
     <p class="tip">Enter patron card number or partial name:</p>
     <form action="/cgi-bin/koha/members/member.pl" method="post">
-        <input name="searchmember" id="searchmember" size="40" type="text"/>
+        <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text"/>
         <input type="hidden" name="quicksearch" value="1" />
         <input value="Submit" class="submit" type="submit" />
     </form>
@@ -24,16 +24,16 @@
 <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" accesskey="q" />
+        <input type="text" name="q" id="search-form" class="head-searchbox" size="40" accesskey="q" />
         <input type="submit" class="submit" value="Submit"/>
     </form>
 </div>[% END %]
 
 <ul>
-    [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_borrowers ) %]<li><a href="#patron_search">Search patrons</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
+    [% IF ( CAN_user_borrowers ) %]<li><a onclick="keep_text(2)" href="#patron_search">Search patrons</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
 </ul>
 
 </div><!-- /header_search -->

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 1e28502..806ee5e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -4,7 +4,7 @@
        <div id="notices_search" class="residentsearch">
     <p class="tip">Search existing notices:</p>
 <form action="/cgi-bin/koha/tools/letter.pl" method="post">
-               <input type="text" name="searchfield" size="40" value="" />
+        <input class="head-searchbox" type="text" name="searchfield" size="40" value="" />
                 <input type="submit" class="submit" name="search" value="Search" />
         </form>        
        </div>
@@ -13,14 +13,14 @@
     <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                                <input type="submit" name="op" value="Submit"  class="submit" />
                </form>
        </div>[% END %]
                        <ul>
-            <li><a href="#notices_search">Search notices</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a onclick="keep_text(0)" href="#notices_search">Search notices</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
 </div>
 </div><!-- /gradient -->

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
index 87f1969..a7e9061 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
@@ -26,7 +26,7 @@ $(document).ready(function(){
     <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
     [% IF ( CircAutocompl ) %]
     <div class="autocomplete">
-                <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+                <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="head-searchbox focus" type="text" />
                 <input id="autocsubmit" type="submit" class="submit" value="Submit" />
                 <input name="branch" value="[% Branches.GetLoggedInBranchcode() %]" type="hidden" />
                 <input name="printer" value="" type="hidden" />
@@ -36,7 +36,7 @@ $(document).ready(function(){
             [% END %]
         </div>
        [% ELSE %]
-            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input id="findborrower" name="findborrower" size="40" class="head-searchbox focus" type="text" />
             <input name="branch" value="[% branch %]" type="hidden" />
             <input name="printer" value="" type="hidden" />
             [% IF ( stickyduedate ) %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 05a0e98..646c70a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -7,7 +7,7 @@
     <div id="patron_search" class="residentsearch">
     <p class="tip">Enter patron card number or partial name:</p>
     <form action="/cgi-bin/koha/members/member.pl" method="post">
-    <input id="searchmember" data-toggle="tooltip" size="25" class="focus" name="searchmember" type="text" value="[% searchmember %]"/>
+    <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox focus" name="searchmember" type="text" value="[% searchmember %]"/>
     <input type="hidden" name="quicksearch" value="1" />
     <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span>
     <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span>
@@ -113,7 +113,7 @@
     <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                 <input type="submit" name="op" id="opac-submit" value="Submit" class="submit" />
         </form>
     </div>[% END %]
@@ -121,16 +121,16 @@
     <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" accesskey="r" />
+    <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" />
     <input value="Submit" class="submit" type="submit" />
     </form>
     </div>
     [% END %]
     <ul>
-            <li><a href="#patron_search">Search patrons</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+        <li><a onclick="keep_text(0)" href="#patron_search">Search patrons</a></li>
+        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
     </ul>
 </div><!-- /header_search -->
 </div><!-- /gradient -->

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 3fd9f5d..c248810 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
@@ -4,7 +4,7 @@
        <div id="patron_category_search" class="residentsearch">
     <p class="tip">Search by patron category name:</p>
        <form action="[% script_name %]" method="post">
-               <input type="text" name="description" size="40" value="[% searchfield %]" />
+        <input class="head-searchbox" type="text" name="description" size="40" value="[% searchfield %]" />
                <input type="submit" class="submit" name="search" value="Search" />
        </form> 
        </div>
@@ -13,14 +13,14 @@
     <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                                <input type="submit" value="Submit"  class="submit" />
                </form>
        </div>[% END %]
                        <ul>
-            <li><a href="#patron_category_search">Search patron categories</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a onclick="keep_text(0)" href="#patron_category_search">Search patron categories</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
 </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
index 06b0752..a224c89 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
@@ -6,24 +6,24 @@
            <form action="/cgi-bin/koha/admin/preferences.pl">
         <input type="hidden" name="tab" value="[% last_tab %]" />
         <input type="hidden" name="op" value="search" />
-        <input type="text" size="40" name="searchfield" value="[% searchfield |html %]" />
+        <input class="head-searchbox" type="text" size="40" name="searchfield" value="[% searchfield |html %]" />
         <input type="submit" class="submit" value="Search" />
     </form>
        </div>
     [% INCLUDE 'patron-search-box.inc' %]
        [% IF ( CAN_user_catalogue ) %]
     <div id="catalog_search" class="residentsearch">
-       <p class="tip">Enter search keywords:</p>
+<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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                                <input type="submit" value="Submit" class="submit" />
                </form>
        </div>
        [% END %]
                        <ul>
-            <li><a href="#syspref_search">Search system preferences</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a onclick="keep_text(0)" href="#syspref_search">Search system preferences</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>
 </div>
 </div>

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 0fbc282..46deb14 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
@@ -4,7 +4,7 @@
        <div id="printer_search" class="residentsearch">
     <p class="tip">Printer search:</p>
 <form action="[% script_name %]" method="post">
-                <input type="text" size="40" name="description" value="[% searchfield %]" />
+                <input class="head-searchbox" type="text" size="40" name="description" value="[% searchfield %]" />
                 <input type="submit" name="submit" value="Search" />
         </form>
        </div>
@@ -13,15 +13,15 @@
     <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                                <input type="submit" value="Submit"  class="submit" />
                </form>
        </div>
        [% END %]
                        <ul>
-            <li><a href="#printer_search">Search printers</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a onclick="keep_text(0)" href="#printer_search">Search printers</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
 </div>
 </div><!-- /gradient -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc
new file mode 100644 (file)
index 0000000..3d7dbc2
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc
@@ -0,0 +1,30 @@
+<script type="text/javascript">
+//<![CDATA[
+function keep_text(clicked_index) {
+    var searchboxes = document.getElementsByClassName("head-searchbox");
+    var persist = searchboxes[0].value;
+
+    for (i = 0; i < searchboxes.length - 1; i++) {
+        if (searchboxes[i].value != searchboxes[i+1].value) {
+            if (i === searchboxes.length-2) {
+                if (searchboxes[i].value != searchboxes[0].value) {
+                    persist = searchboxes[i].value;
+                } else if (searchboxes.length === 2) {
+                    if (clicked_index === 0) {
+                        persist = searchboxes[1].value;
+                    }
+                } else {
+                    persist = searchboxes[i+1].value;
+                }
+            } else if (searchboxes[i+1].value != searchboxes[i+2].value) {
+                persist = searchboxes[i+1].value;
+            }
+        }
+    }
+
+    for (i = 0; i < searchboxes.length; i++) {
+        searchboxes[i].value = persist;
+    }
+}
+//]]>
+</script>

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 beb309c..8ba2b15 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -22,15 +22,15 @@
       <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
           <input type="submit" value="Submit"  class="submit" />
         </form>
       </div>
     [% END %]
     <ul>
       <li><a href="#subscription_search">Search subscriptions</a></li>
-      [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-      [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+      [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
+      [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(1)" href="#catalog_search">Search the catalog</a></li>[% END %]
     </ul>
   </div><!-- /header_search -->
 </div><!-- /gradient -->

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 e45a5c7..964f1b6 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
@@ -4,7 +4,7 @@
        <div id="stopword_search" class="residentsearch">
        <p class="tip">Stop word search:</p>
            <form action="[% script_name %]" method="post">
-        <input type="text" size="40" name="searchfield" value="[% searchfield %]" />
+        <input class="head-searchbox" type="text" size="40" name="searchfield" value="[% searchfield %]" />
         <input type="submit" name="ok" class="submit" value="Search" />
     </form>
        </div>
@@ -13,15 +13,15 @@
     <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                                <input type="submit" value="Submit"  class="submit" />
                </form>
        </div>
        [% END %]
                        <ul>
-            <li><a href="#stopword_search">Search stop words</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a onclick="keep_text(0)" href="#stopword_search">Search stop words</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
 </div>
 </div><!-- /gradient -->

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 877fcc2..58195c0 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
@@ -18,15 +18,15 @@
     <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                                <input type="submit" value="Submit"  class="submit" />
                </form>
        </div>
        [% END %]
                        <ul>
             <li><a href="#suggestions_search">Search suggestions</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(1)" href="#catalog_search">Search the catalog</a></li>[% END %]
             </ul>
 </div>
 </div><!-- /gradient -->

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 f843069..ffd5290 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
@@ -4,7 +4,7 @@
     <div id="z3950_search" class="residentsearch">
     <p class="tip">Z39.50/SRU server search:</p>
        <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
-                <input type="text" name="searchfield" size="40" value="[% searchfield %]" />
+                <input class="head-searchbox" type="text" name="searchfield" size="40" value="[% searchfield %]" />
                 <input type="submit" class="submit" name="search" value="Search" />
         </form>
        </div>
@@ -15,15 +15,15 @@
     <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="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
                                <input type="submit" value="Submit"  class="submit" />
                </form>
        </div>
        [% END %]
                        <ul>
-            <li><a href="#z3950_search">Search Z39.50/SRU servers</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a onclick="keep_text(0)" href="#z3950_search">Search Z39.50/SRU servers</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
 </div>
 </div>