From 57c88aa5be8aee96c0870330c85d4d727d84c837 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 16 Sep 2015 09:01:26 +0100
Subject: [PATCH] Bug 14829: Fix shortcuts in the cataloging and patron modules

In these 2 modules, the shortcuts alt+q, alt+r and alt+u don't work as
in other modules.
The tab are not "built" in the correct order and the id returned to
select the correct tab is wrong.

Test plan:
Go on the circ home page (circ/circulation-home.pl), the patron home
page (members/members-home.pl) and the cataloging home page
(cataloguing/addbooks.pl).
On these 3 pages, without this patch, the shortcuts select different
tabs.
With this patch, the issue is fixed for all of them.

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/includes/cataloging-search.inc     |  3 ++-
 .../prog/en/includes/patron-search.inc         | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

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 1fda946fde..4b6a9de45a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -10,6 +10,8 @@
             </form>
         </div>
 
+        [% INCLUDE 'patron-search-box.inc' %]
+
         [% IF ( CAN_user_circulate ) %]
         <div id="checkin_search" class="residentsearch">
             <p class="tip">Scan a barcode to check in:</p>
@@ -28,7 +30,6 @@
             </form>
         </div>
 
-        [% INCLUDE 'patron-search-box.inc' %]
         <ul>
             <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 %]
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 bb09574759..e831487e12 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -114,14 +114,6 @@
 </div>
     [% INCLUDE 'patron-search-box.inc' %]
 
-    [% IF ( CAN_user_catalogue ) %]
-    <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="head-searchbox form-text" />
-                <input type="submit" name="op" id="opac-submit" value="Submit" class="submit" />
-        </form>
-    </div>[% END %]
     [% IF ( CAN_user_circulate ) %]
     <div id="checkin_search" class="residentsearch">
     <p class="tip">Scan a barcode to check in:</p>
@@ -131,6 +123,16 @@
     </form>
     </div>
     [% END %]
+
+    [% IF ( CAN_user_catalogue ) %]
+    <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="head-searchbox form-text" />
+                <input type="submit" name="op" id="opac-submit" value="Submit" class="submit" />
+        </form>
+    </div>[% END %]
+
     <ul>
         <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 %]
-- 
2.39.5