Bug 23681: Fix QA issues

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

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 8ba2b15..c245343 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -1,36 +1,29 @@
+[% USE Koha %]
 <div class="gradient">
-  <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Serials Resident Search Box -->
+  <div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Serials Resident Search Box -->
   <div id="header_search">
     <div id="subscription_search" class="residentsearch">
     <p class="tip">Search subscriptions:</p>
     <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">
       [% IF ( routing ) %]
-        <input type="hidden" name="routing" value="[% routing %]" />
+        <input type="hidden" name="routing" value="[% routing | html %]" />
       [% END %]
       <input type="hidden" name="searched" value="1" />
-      <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter %]" />
+      <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" />
 
       [% IF (UNIMARC) %]
-        <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter %]" />
+        <label for="EAN_filter">EAN:</label> <input type="text" size="20" maxlength="40" name="EAN_filter" id="EAN_filter" value="[% EAN_filter | html %]" />
       [% END %]
-      <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter %]" />
+      <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" />
       <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/serials/serials-search.pl">Advanced search</a>
     </form>
     </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" 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 ) %]<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 %]
+      [% 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><!-- /header_search -->
 </div><!-- /gradient -->