Bug 20568: Fix bad resolution conflict with bug 18403

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / includes / prefs-admin-search.inc

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 34de2d4..4170576 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
@@ -1,3 +1,4 @@
+[% USE Koha %]
 <div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
 <div id="header_search">
@@ -6,7 +7,7 @@
            <form action="/cgi-bin/koha/admin/preferences.pl">
         <input type="hidden" name="tab" value="[% last_tab %]" />
         <input type="hidden" name="op" value="search" />
-        <input class="head-searchbox" type="text" size="40" name="searchfield" value="[% searchfield |html %]" />
+        <input class="head-searchbox" type="text" size="40" name="searchfield" value="">
         <input type="submit" class="submit" value="Search" />
     </form>
        </div>
@@ -15,15 +16,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">
+             [% 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="head-searchbox form-text" />
                                <input type="submit" value="Submit" class="submit" />
                </form>
        </div>
        [% END %]
                        <ul>
-            <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 %]
+            <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 %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>
 </div>
 </div>