From d9224ccd8f87c4753aa48f1c2013763b9345065a Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 14 May 2021 15:04:38 +0000
Subject: [PATCH] Bug 28356: Consolidate catalogue search box code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To test:
1 - Apply patch
2 - Confirm searchign the catalog works from:
    Administration->Budgets
    Cataloging
    Circulation->Check in
    Administration->Cities and towns
    Acquisitions->{Vendor}->Contracts
    Administration->Currencies
    Administration->Circulation desks (requires  UseCirculationDesks preference)
    Home
    Tools->Notices and slips
    Patrons
    Adminstration
    Serials
    Acquisitions->Suggestions
    Administration->Z39.50/SRU servers

Signed-off-by: hakam <hakam@inlibro.com>

Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
---
 .../prog/en/includes/budgets-admin-search.inc | 64 +++++++++----------
 .../prog/en/includes/cat-search.inc           | 15 +----
 .../prog/en/includes/cataloging-search.inc    | 14 +---
 .../prog/en/includes/catalogue-search-box.inc | 12 ++++
 .../prog/en/includes/checkin-search.inc       | 15 +----
 .../prog/en/includes/circ-search.inc          | 15 +----
 .../prog/en/includes/cities-admin-search.inc  | 14 +---
 .../en/includes/contracts-admin-search.inc    | 15 +----
 .../en/includes/currencies-admin-search.inc   | 14 +---
 .../prog/en/includes/desks-admin-search.inc   | 14 +---
 .../prog/en/includes/home-search.inc          | 11 +---
 .../prog/en/includes/letters-search.inc       | 14 +---
 .../prog/en/includes/patron-search.inc        | 14 +---
 .../prog/en/includes/prefs-admin-search.inc   | 15 +----
 .../prog/en/includes/serials-search.inc       | 15 +----
 .../en/includes/suggestions-add-search.inc    | 15 +----
 .../prog/en/includes/z3950-admin-search.inc   | 15 +----
 17 files changed, 57 insertions(+), 234 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc

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 894f844a1b..fd188ddbe8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
@@ -3,43 +3,39 @@
 <div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1><!-- Begin Fund Admin Resident Search Box -->
 
-<div id="header_search">
-    <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 class="query" type="text" name="filter_budgetname" id="filter_budgetname" size="20" value="[% filter_budgetname | html %]" />
-            <label for="filter_budgetbranch">Library: </label>
-            <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;">
-                <option value=""></option>
-                    [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %]
-                        [% IF branchloo.selected %]
-                        <option value="[% branchloo.branchcode | html %]" selected="selected">[% branchloo.branchname | html %]</option>
-                        [% ELSE %]
-                        <option value="[% branchloo.branchcode | html %]" >[% branchloo.branchname | html %]</option>
+    <div id="header_search">
+        <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 class="query" type="text" name="filter_budgetname" id="filter_budgetname" size="20" value="[% filter_budgetname | html %]" />
+                <label for="filter_budgetbranch">Library: </label>
+                <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;">
+                    <option value=""></option>
+                        [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %]
+                            [% IF branchloo.selected %]
+                            <option value="[% branchloo.branchcode | html %]" selected="selected">[% branchloo.branchname | html %]</option>
+                            [% ELSE %]
+                            <option value="[% branchloo.branchcode | html %]" >[% branchloo.branchname | html %]</option>
+                            [% END %]
                         [% END %]
-                    [% END %]
-            </select>
-          <input type="hidden"  name="budget_period_id" value="[% budget_period_id | html %]" />
-          <input type="submit" class="submit" name="filter" value="Submit" />
-        </form>
-    </div>
+                </select>
+              <input type="hidden"  name="budget_period_id" value="[% budget_period_id | html %]" />
+              <input type="submit" class="submit" name="filter" value="Submit" />
+            </form>
+        </div>
 
-[% INCLUDE 'patron-search-box.inc' %]
+        [% INCLUDE 'patron-search-box.inc' %]
+        [% INCLUDE 'catalogue-search-box.inc' %]
 
-    [% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-        <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            <label class="tip" for="search-form">Enter search keywords:</label>
-             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
-             <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>
+        <ul>
             <li><a class="keep_text" href="#budgets_search">Search funds</a></li>
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
-            </ul>
-</div>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
+                <li><a class="keep_text" href="#circ_search">Check out</a></li>
+            [% END %]
+            [% IF ( CAN_user_catalogue ) %]
+                <li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>
+            [% END %]
+        </ul>
+    </div>
 </div>
 <!-- End Suggestions Resident Search Box -->
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 cdafcfe01f..39409999f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -23,20 +23,7 @@
 </div>
 [% END %]
 
-[% IF ( CAN_user_catalogue ) %]
-<div id="catalog_search" class="residentsearch">
-    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-            <label class="tip" for="search-form">Enter search keywords:</label>
-            [% INCLUDE 'search_indexes.inc' %]
-        [% ELSE %]
-            <label class="tip" for="search-form">Enter search keywords:</label>
-        [% END %]
-        <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
-        <input type="submit" class="submit" value="Submit" />
-    </form>
-</div>
-[% END %]
+[% INCLUDE 'catalogue-search-box.inc' %]
 
 <ul>
     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
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 20c7d9d2c3..a68e36abd4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -29,19 +29,7 @@
         </div>
         [% END %]
 
-
-        <div id="catalog_search" class="residentsearch">
-            <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-                [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                    <label class="tip" for="search-form">Enter search keywords:</label>
-                    [% INCLUDE 'search_indexes.inc' %]
-                [% ELSE %]
-                    <label class="tip" for="search-form">Enter search keywords:</label>
-                [% END %]
-                <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 'catalogue-search-box.inc' %]
 
         <ul>
             <li><a class="keep_text" href="#addbooks_search">Cataloging search</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc
new file mode 100644
index 0000000000..134bf93de8
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc
@@ -0,0 +1,12 @@
+[% IF ( CAN_user_catalogue ) %]
+    <div id="catalog_search" class="residentsearch">
+        <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+            <label class="tip" for="search-form">Enter search keywords:</label>
+                [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
+                    [% INCLUDE 'search_indexes.inc' %]
+                [% END %]
+            <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox" />
+            <input type="submit" value="Submit"  class="submit" />
+        </form>
+    </div>
+[% END %]
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 ef3a232e78..9d81f7abf2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -14,20 +14,7 @@
 </div>
 [% END %]
 
-[% IF ( CAN_user_catalogue ) %]
-<div id="catalog_search" class="residentsearch">
-    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-            <label class="tip" for="search-form">Enter search keywords:</label>
-            [% INCLUDE 'search_indexes.inc' %]
-        [% ELSE %]
-            <label class="tip" for="search-form">Enter search keywords:</label>
-        [% END %]
-        <input class="head-searchbox" type="text" name="q" id="search-form" size="40" />
-        <input type="submit" class="submit" value="Submit"/>
-    </form>
-</div>
-[% END %]
+[% INCLUDE 'catalogue-search-box.inc' %]
 <ul>
     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
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 8892c0d264..de45b257d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -4,6 +4,7 @@
 
 <div id="header_search">
     [% INCLUDE 'patron-search-box.inc' %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
 [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
 <div id="checkin_search" class="residentsearch">
     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
@@ -20,20 +21,6 @@
     </form>
 </div>
 [% END %]
-[% IF ( CAN_user_catalogue ) %]
-<div id="catalog_search" class="residentsearch">
-    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-            <label class="tip" for="search-form">Enter search keywords:</label>
-            [% INCLUDE 'search_indexes.inc' %]
-        [% ELSE %]
-            <label class="tip" for="search-form">Enter search keywords:</label>
-        [% END %]
-        <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_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
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 294af36d9c..9e1d251927 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -11,20 +11,8 @@
 	</div>
 
     [% INCLUDE 'patron-search-box.inc' %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
 
-	[% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-                [% INCLUDE 'search_indexes.inc' %]
-            [% ELSE %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-            [% END %]
-             <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 class="keep_text" href="#city_search">Search cities</a></li>
             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
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 d6060cea7d..710346c2a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
@@ -12,20 +12,7 @@
 	</div>
 
     [% INCLUDE 'patron-search-box.inc' %]
-
-	[% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-            <label class="tip" for="search-form">Enter search keywords:</label>
-            [% INCLUDE 'search_indexes.inc' %]
-        [% ELSE %]
-            <label class="tip" for="search-form">Enter search keywords:</label>
-        [% END %]
-             <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 %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
 
 	<ul>
             <li><a class="keep_text" href="#contract_description_search">Search contracts</a></li>
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 70e00c92b2..bc0028354c 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
@@ -10,19 +10,7 @@
         </form>	
 	</div>
     [% INCLUDE 'patron-search-box.inc' %]
-	[% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-                [% INCLUDE 'search_indexes.inc' %]
-            [% ELSE %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-            [% END %]
-             <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 %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
 			<ul>
             <li><a class="keep_text" href="#currency_search">Search currencies</a></li>
             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
index 5b67592d68..19799eb5ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
@@ -11,20 +11,8 @@
         </div>
 
     [% INCLUDE 'patron-search-box.inc' %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
 
-        [% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-                [% INCLUDE 'search_indexes.inc' %]
-            [% ELSE %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-            [% END %]
-             <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 class="keep_text" href="#desk_search">Search desks</a></li>
             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
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 eb397b8b5a..d102c4a729 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
@@ -30,16 +30,7 @@
         <input value="Submit" class="submit" type="submit" />
     </form>
 </div>[% END %]
-[% IF ( CAN_user_catalogue ) %]
-<div id="catalog_search" class="residentsearch">
-    <label class="tip" for="search-form">Enter search keywords:</label>
-    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
-        <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 %]
-
+[% INCLUDE 'catalogue-search-box.inc' %]
 <ul>
     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
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 3f60b68533..db27659511 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -10,19 +10,7 @@
         </form>	
 	</div>
     [% INCLUDE 'patron-search-box.inc' %]
-	[% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-                [% INCLUDE 'search_indexes.inc' %]
-            [% ELSE %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-            [% END %]
-            <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 %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
 			<ul>
             <li><a class="keep_text" href="#notices_search">Search notices</a></li>
             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" 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 b8aee067d9..1aa4695213 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -97,19 +97,7 @@
         </div>
     [% END %]
 
-    [% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-        <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-                [% INCLUDE 'search_indexes.inc' %]
-            [% ELSE %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-            [% END %]
-             <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 %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
 
     <ul>
         <li><a class="keep_text" href="#patron_search">Search patrons</a></li>
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 996f7cacad..4aa9da5bcb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
@@ -12,20 +12,7 @@
     </form>
 	</div>
     [% INCLUDE 'patron-search-box.inc' %]
-	[% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-                [% INCLUDE 'search_indexes.inc' %]
-            [% ELSE %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-            [% END %]
-             <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 %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
 			<ul>
             <li><a class="keep_text" href="#syspref_search">Search system preferences</a></li>
             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
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 ee25012e20..64f6fdb46a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -19,20 +19,7 @@
     </form>
     </div>
     [% INCLUDE 'patron-search-box.inc' %]
-    [% IF ( CAN_user_catalogue ) %]
-      <div id="catalog_search" class="residentsearch">
-        <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-                [% INCLUDE 'search_indexes.inc' %]
-            [% ELSE %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-            [% END %]
-          <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 %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
     <ul>
       <li><a href="#subscription_search">Search subscriptions</a></li>
       [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
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 12b3fab3a5..a76245128f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -14,21 +14,8 @@
 	</div>
 
     [% INCLUDE 'patron-search-box.inc' %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
 
-	[% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-                [% INCLUDE 'search_indexes.inc' %]
-            [% ELSE %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-            [% END %]
-            <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_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
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 51f77ee0b3..80223345fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -11,21 +11,8 @@
 	</div>
 
     [% INCLUDE 'patron-search-box.inc' %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
 
-	[% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-                [% INCLUDE 'search_indexes.inc' %]
-            [% ELSE %]
-                <label class="tip" for="search-form">Enter search keywords:</label>
-            [% END %]
-            <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 class="keep_text" href="#z3950_search">Search Z39.50/SRU servers</a></li>
             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
-- 
2.20.1