Merge branch 'bug_9617' into 3.12-master

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

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 b64b500..da47e19 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -1,7 +1,7 @@
-<div id="header" class="gradient">
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin z3950 Admin Resident Search Box -->
 <div id="header_search">
-       <div id="z3950_search" class="residentsearch">
+    <div id="z3950_search" class="residentsearch">
     <p class="tip">Z39.50 server search:</p>
        <form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
                 <input type="text" name="searchfield" size="40" value="[% searchfield %]" />
@@ -12,7 +12,7 @@
     [% INCLUDE 'patron-search-box.inc' %]
 
        [% IF ( CAN_user_catalogue ) %]
-       <div id="catalog_search" class="residentsearch" style="display:none;">
+    <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="form-text" />
@@ -21,11 +21,10 @@
        </div>
        [% END %]
                        <ul>
-            <li><a href="/cgi-bin/koha/admin/z3950servers.pl#z3950_search">Search Z390.50 servers</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
+            <li><a href="#z3950_search">Search Z390.50 servers</a></li>
+            [% 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>
 </div>
 <!-- End Members Resident Search Box -->
-curr