Bug 27631: Changed <h1> around logo to <div>

[srvgit] / koha-tmpl / intranet-tmpl / prog / en / includes / cities-admin-search.inc

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 dc544a3..38ba890 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -1,33 +1,23 @@
-<!-- Begin Members Resident Search Box -->
+[% USE Koha %]
+<div class="gradient">
+<div id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></div><!-- Begin Cities Resident Search Box -->
 <div id="header_search">
        <div id="city_search" class="residentsearch">
-       <p class="tip">City Search:</p>
-       <form action="<TMPL_VAR NAME="script_name">" method="post">
-               <input type="text" name="city_name" value="<!-- TMPL_VAR NAME="searchfield" -->" size="40" />
-               <input type="submit" name="submit" value="OK" class="button" />
+       <form action="[% script_name | html %]" method="post">
+        <label class="tip" for="city_name_filter">City search:</label>
+        <input class="head-searchbox" type="text" name="city_name_filter" id="city_name_filter" value="[% city_name_filter | html %]" size="40" />
+               <input type="submit" name="submit" value="OK" class="submit" />
        </form>
        </div>
-       <div id="circ_search" class="residentsearch">
-       <p class="tip">Enter patron card number or partial name:</p>
-       <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-                       <label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-       <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-       <input value="Submit" type="submit" />
-       </form>
-       </div>  
-       <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" />
-                               <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
-               </form>
-       </div>
+
+    [% INCLUDE 'patron-search-box.inc' %]
+    [% INCLUDE 'catalogue-search-box.inc' %]
+
                        <ul>
-                       <li><a href="/cgi-bin/koha/admin/cities.pl#city_search">Search Cities</a></li>
-                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
-                       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+            <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 %]
+            [% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
                        </ul>   
 </div>
-<!-- End Members Resident Search Box -->
\ No newline at end of file
+</div>
+<!-- End Cities Resident Search Box -->