From ed0298ec0c610214e6fe311d4b6bfe5d50a33375 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 29 Apr 2013 12:34:10 -0400
Subject: [PATCH] Bug 10153 - Patron header search form is too wide

The patron header search form is now too wide to display correctly on
screens smaller than about 1110px. This patch groups the
previously shown-by-default choices with the hidden additional
search parameters.

To test, apply the patch and view any page which includes the patron
header search include, for example members/members-home.pl. Additional
search options should be hidden by default. Clicking "[+]" should show
all additional options: Search fields, search type, order by, library,
and category.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works for me.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. I like this change.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
---
 .../prog/en/includes/patron-search.inc        | 73 ++++++++++---------
 1 file changed, 37 insertions(+), 36 deletions(-)

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 5023ba5b7d..fba263e6f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -5,47 +5,48 @@
 	<p class="tip">Enter patron card number or partial name:</p>
 	<form action="/cgi-bin/koha/members/member.pl" method="post">
     <input id="searchmember" size="25" class="focus" name="member" type="text" value="[% member %]"/>
-	[% IF ( branchloop ) %]
 	<span class="filteraction" id="filteraction_off"> <a href="#" onclick="$('#filters').toggle();$('.filteraction').toggle();">[-]</a></span>
 	<span class="filteraction" id="filteraction_on"> <a href="#" onclick="$('#filters').toggle();$('.filteraction').toggle();">[+]</a></span>
-	[% END %]
 
-      <label for="searchfields">Search fields:</label>
-      <select name="searchfields" id="searchfields">
-          <option selected="selected" value=''>Standard</option>
-          <option value='email,emailpro,B_email,'>Email</option>
-          <option value='borrowernumber'>Borrower number</option>
-          <option value='phone,phonepro,B_phone,altcontactphone,mobile'>Phone number</option>
-          <option value='streettype,address,address2,city,state,zipcode,country'>Street Address</option>
-      </select>
 
-      <label for="searchtype">Search type:</label>
-      <select name="searchtype" id="searchtype">
-          <option selected="selected" value=''>Starts with</option>
-          <option value='contain'>Contains</option>
-      </select>
-
-    <label for="orderby">Order by:</label>
-    <select name="orderby" id="searchorderby">
-    <option value="">Surname, Firstname</option>
-    <option value="cardnumber,0">Cardnumber</option>
-    </select>
     <input value="Search" class="submit" type="submit" />
-	[% IF ( branchloop ) %]
-	<p id="filters"> <label for="branchcode">Library: </label><select name="branchcode" id="branchcode">
-        <option value="">Any</option>[% 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>
-                 <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 %]
+
+  <div id="filters">
+      <p><label for="searchfields">Search fields:</label>
+            <select name="searchfields" id="searchfields">
+                <option selected="selected" value=''>Standard</option>
+                <option value='email,emailpro,B_email,'>Email</option>
+                <option value='borrowernumber'>Borrower number</option>
+                <option value='phone,phonepro,B_phone,altcontactphone,mobile'>Phone number</option>
+                <option value='streettype,address,address2,city,state,zipcode,country'>Street Address</option>
+            </select></p>
+        <p><label for="searchtype">Search type:</label>
+                <select name="searchtype" id="searchtype">
+                    <option selected="selected" value=''>Starts with</option>
+                    <option value='contain'>Contains</option>
+                </select></p>
+
+      <p><label for="searchorderby">Order by:</label>
+            <select name="orderby" id="searchorderby">
+            <option value="">Surname, Firstname</option>
+            <option value="cardnumber,0">Cardnumber</option>
+            </select></p>
+        [% IF ( branchloop ) %] <p><label for="branchcode">Library: </label><select name="branchcode" id="branchcode">
+                <option value="">Any</option>[% 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></p>
+      [% 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 %]
+  </div>
 </form>
 	</div>
 
-- 
2.39.5