From 4de566657ded628aa33b41a87caa6acfe294405a Mon Sep 17 00:00:00 2001
From: Aleisha <aleishaamohia@hotmail.com>
Date: Wed, 27 Apr 2016 04:45:08 +0000
Subject: [PATCH] Bug 16364: Cleaning up appearance of advanced search

This patch uses the page space a bit more wisely to reduce scrolling

To test:
1) Go to advanced search
2) Notice Subtype limits and Sorting divs are now stacked and Location and availability div is floated to the right (reduces scrolling)
3) Click [More options]
4) Notice Item type div becomes smaller and Limits div is now floated to the right
5) Notice that checkboxes next to item types are nicely aligned

Sponsored-by: Catalyst IT
---
 koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css  |   17 +++++++++++++++++
 .../prog/en/modules/catalogue/advsearch.tt            |   14 +++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index a638129..2bd0588 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -327,6 +327,23 @@ fieldset.lastchecked {
     border-bottom-right-radius: 0;
 }
 
+fieldset.subtype,
+fieldset.sortby {
+    width: 50%;
+    float: left;
+}
+
+fieldset.avail,
+fieldset.basiclimits {
+    width: 30%;
+    float: right;
+}
+
+select.subtype {
+    margin: 1px;
+    display: block;
+}
+
 legend {
 	font-size : 123.1%;
 	font-weight : bold;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index e2bd3cc..507fba9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -112,12 +112,12 @@
       [% END %]
       </ul>
     [% FOREACH advsearchloo IN advancedsearchesloop %]
-    <div id="advsearch-[% advsearchloo.advanced_search_type %]" class="advsearch">
+    <div id="advsearch-[% advsearchloo.advanced_search_type %]" class="advsearch" [% IF ( expanded_options ) %]style="width:55%;float:left;"[% END %]>
     <h4>Limit to any of the following:</h4>
     <table>
         <tr>
     [% FOREACH itemtypeloo IN advsearchloo.code_loop %]
-        <td><input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %]&nbsp;[% END %]
+        <td><input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><br><label for="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %]&nbsp;[% END %]
         [% itemtypeloo.description %]</label></td>
         [% IF ( loop.last ) %]</tr>[% ELSE %][% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %][% END %]
     [% END %]
@@ -127,12 +127,12 @@
 <!-- /MC-TYPE LIMIT -->
 [% IF ( expanded_options ) %]
 <!-- BASIC LIMITS -->
- <fieldset id="basiclimits">
+ <fieldset id="basiclimits" class="basiclimits">
 	<legend>Limits</legend>
 <fieldset id="pubrange">
 <!-- PUB / COPY YEAR LIMIT --><!-- FIXME: add publication,copyright,acquisition options -->
 	<p><label for="limit-yr">Year: </label>
-		<input type="text" size="15" name="limit-yr" id="limit-yr" value=""/>&nbsp;&nbsp;(format: yyyy-yyyy)</p>
+		<input type="text" size="15" name="limit-yr" id="limit-yr" value=""/><br>(format: yyyy-yyyy)</p>
 <!-- /PUB / COPY YEAR LIMIT -->
 </fieldset>
 <fieldset id="language">
@@ -160,7 +160,7 @@
 [% INCLUDE 'subtypes_unimarc.inc' %]
 [% ELSE %]
 <!-- SUBTYPE LIMITS -->
-        <fieldset id="subtype">
+        <fieldset id="subtype" class="subtype">
         <legend>Subtype limits</legend><p>
         
         <select name="limit" class="subtype">
@@ -230,7 +230,7 @@
 [% END %]
 
 <!-- AVAILABILITY LIMITS -->
-    <fieldset id="availability"><legend>Location and availability</legend>
+<fieldset id="availability" class="avail"><legend>Location and availability</legend>
 <fieldset id="currently-avail">
         <p><label for="available-items">Only items currently available:</label> <input type="checkbox" id="available-items" name="limit" value="available" /></p>
 </fieldset>
@@ -261,7 +261,7 @@
 <!-- /AVAILABILITY LIMITS -->
 
 <!-- RANK LIMITS -->
-<fieldset id="sortby"><legend>Sorting</legend>
+<fieldset id="sortby" class="sortby"><legend>Sorting</legend>
     <p>
     <label for="sort_by">Sort by: </label><select id="sort_by" name="sort_by">
   [% INCLUDE 'resort_form.inc' %]
-- 
1.7.10.4