Bug 14510: (QA followup) Fix bug with unmapped columns

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

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 7739cc3..bb09574 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -1,11 +1,13 @@
 [% USE Koha %]
+[% USE Branches %]
+[% USE Categories %]
 <div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Patrons Resident Search Box -->
 <div id="header_search">
     <div id="patron_search" class="residentsearch">
     <p class="tip">Enter patron card number or partial name:</p>
     <form action="/cgi-bin/koha/members/member.pl" method="post">
-    <input id="searchmember" data-toggle="tooltip" size="25" class="focus" name="searchmember" type="text" value="[% searchmember %]"/>
+    <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox focus" name="searchmember" type="text" value="[% searchmember %]"/>
     <input type="hidden" name="quicksearch" value="1" />
     <span class="filteraction" id="filteraction_off"> <a href="#">[-]</a></span>
     <span class="filteraction" id="filteraction_on"> <a href="#">[+]</a></span>
@@ -30,6 +32,11 @@
               [% ELSE %]
                 <option value='borrowernumber'>Borrower number</option>
               [% END %]
+              [% IF searchfieldstype == "userid" %]
+                <option selected="selected" value='userid'>Username</option>
+              [% ELSE %]
+                <option value='userid'>Username</option>
+              [% END %]
               [% IF searchfieldstype == "phone" %]
                 <option selected="selected" value='phone'>Phone number</option>
               [% ELSE %]
@@ -71,29 +78,37 @@
             </select>
         </p>
 
+        <p>
+            <label for="branchcode">Library: </label>
+            [% SET branches = Branches.all( selected => branchcode_filter ) %]
+            <select name="branchcode_filter" id="branchcode">
+                [% IF branches.size != 1 %]
+                  <option value="">Any</option>
+                [% END %]
+                [% FOREACH b IN branches %]
+                    [% IF b.selected %]
+                        <option value="[% b.branchcode %]" selected="selected">[% b.branchname %]</option>
+                    [% ELSE %]
+                        <option value="[% b.branchcode %]">[% b.branchname %]</option>
+                    [% END %]
+                [% END %]
+            </select>
+        </p>
 
-        [% IF ( branchloop ) %]
-        <p> <label for="branchcode">Library: </label>
-        <select name="branchcode" id="branchcode">
-            [% IF branchloop.size != 1 %]
-              <option value="">Any</option>
-            [% END %]
-            [% FOREACH branchloo IN branchloop %]
-            [% IF ( branchloo.selected ) %]
-            <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]
-            <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
-          [% END %]</select>
-        [% END %]
-        [% IF ( categories ) %]
-            <p>
-            <label for="categorycode">Category: </label><select name="categorycode" id="categorycode">
-            <option value="">Any</option>[% FOREACH categorie IN categories %]
-            [% IF ( categorie.selected ) %]
-            <option value="[% categorie.categorycode %]" selected="selected">[% categorie.description %]</option>[% ELSE %]
-            <option value="[% categorie.categorycode %]">[% categorie.description %]</option>[% END %]
-          [% END %]</select>
-            </p>
-        [% END %]
+        <p>
+            <label for="categorycode">Category: </label>
+            [% SET categories = Categories.all( selected => categorycode_filter ) %]
+            <select name="categorycode_filter" id="categorycode">
+                <option value="">Any</option>
+                [% FOREACH categorie IN categories %]
+                    [% IF ( categorie.selected ) %]
+                        <option value="[% categorie.categorycode %]" selected="selected">[% categorie.description %]</option>
+                    [% ELSE %]
+                        <option value="[% categorie.categorycode %]">[% categorie.description %]</option>
+                    [% END %]
+                [% END %]
+            </select>
+        </p>
     </div>
     </form>
 </div>
@@ -103,7 +118,7 @@
     <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="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" name="op" id="opac-submit" value="Submit" class="submit" />
         </form>
     </div>[% END %]
@@ -111,16 +126,16 @@
     <div id="checkin_search" class="residentsearch">
     <p class="tip">Scan a barcode to check in:</p>
     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-    <input name="barcode" id="ret_barcode" size="40" accesskey="r" />
+    <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" />
     <input value="Submit" class="submit" type="submit" />
     </form>
     </div>
     [% END %]
     <ul>
-            <li><a href="#patron_search">Search patrons</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+        <li><a onclick="keep_text(0)" href="#patron_search">Search patrons</a></li>
+        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
+        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
     </ul>
 </div><!-- /header_search -->
 </div><!-- /gradient -->