Bug 30952: Move search bar below navbar and reduce navbar height

[koha-ffzg.git] / koha-tmpl / intranet-tmpl / prog / en / includes / checkin-search.inc

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 8fc03af..e52befd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -1,21 +1,17 @@
+[% USE Koha %]
+<!-- Begin Main page Resident Search Box -->
 
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Checkin Resident Search Box -->
 <div id="header_search">
-[% 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" />
-        <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 %]
-</ul>   
 
-</div>
+    [% INCLUDE 'patron-search-box.inc' %]
+    [% INCLUDE 'renew-search-box.inc' %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
+
+    <ul>
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"><i class="fa fa-upload"></i> Check out</a></li>[% END %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"><i class="fa fa-retweet"></i> Renew</a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"><i class="fa fa-fw fa-search"></i> Search catalog</a></li>[% END %]
+    </ul>
+</div><!-- /header_search -->
+<!-- End Main page Resident Search Box -->
 
-<!-- End Checkin Resident Search Box -->