From c63003dd5a73f1276d7e1191bef30822326f2994 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@gmail.com>
Date: Wed, 17 Dec 2014 21:10:32 -0300
Subject: [PATCH] Bug 13218: (RM followup) only scroll on actually variable
 stuff

Most of the page contents have fixed size. The only exception is the
targets list. If the target list grows, then the whole page needs to be scrolled
in order to reach the buttons.

We should make the z3950 targets area scrollable, and remove scrolbars from all
over the place.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 .../prog/en/css/staff-global.css              | 19 ++++++++++++-
 .../prog/en/modules/acqui/z3950_search.tt     |  9 +++---
 .../modules/cataloguing/z3950_auth_search.tt  | 28 +++++++++----------
 .../en/modules/cataloguing/z3950_search.tt    | 11 ++++----
 4 files changed, 43 insertions(+), 24 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 5eb6aab293..9d5b7ea9ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -849,11 +849,28 @@ fieldset.rows .inputnote {
 	background-position : center left;
 	background-repeat : no-repeat;
 }
+
 #z3950searcht table {
 	/* doesn't have desired effect in catalogue/results.tmpl - I'll leave this here for now but there do seem to be casscading CSS errors in this and other CSS fiels - RICKW 20081118 */
 	padding: 20px;
 	border: none;
 }
+
+#z3950_search_targets {
+    height:     338px;
+    overflow-y: auto;
+}
+
+#z3950_search_targets_acq {
+    height:     308px;
+    overflow-y: auto;
+}
+
+#z3950_search_targets_auth {
+    height:     348px;
+    overflow-y: auto;
+}
+
 #printbiblio button, #printbiblio a, #printmenuc .first-child {
 	padding-left : 34px;
 	background-image: url("../../img/toolbar-print.gif");
@@ -2740,4 +2757,4 @@ span.onsite_checkout {
     background-color : rgba(255, 242, 206, 0.5);
     border-radius: 4px;
     border : 1px solid #FFF2CE;
-}
\ No newline at end of file
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index c7550875b5..ff95b4a0c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -121,7 +121,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 	    </div>
 <div class="yui-u second">
 <h2>Search targets <span style="display: inline; font-size: 70%; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#">Select all</a></span><span class="clearall"><a id="CheckNone" href="#">Clear all</a></span></span></h2>
-
+    <div id="z3950_search_targets_acq">
     [% FOREACH serverloo IN serverloop %]
         <p>
             [% IF ( serverloo.checked ) %]
@@ -134,10 +134,11 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
         </p>
     [% END %]
     </div>
-    <fieldset class="action"><input type="submit"  class="submit" value="Search" onclick="cursor :'wait'"/> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Cancel</a></fieldset>
-
+  </div>
 </div>
-    </form>
+
+    <fieldset class="action"><input type="submit"  class="submit" value="Search" onclick="cursor :'wait'"/> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Cancel</a></fieldset>
+</form>
 
 
 [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
index 5965dcfeb9..6ef6136e25 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
@@ -120,23 +120,23 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
                 </ol>
                 </fieldset>
             </div>
-        <div class="yui-g">
-            <h2>Search targets <span style="display: inline; font-size: 70%; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#">Select all</a></span><span class="clearall"><a id="CheckNone" href="#">Clear all</a></span></span></h2>
-            [% FOREACH serverloo IN serverloop %]
-                <p>
-                [% IF ( serverloo.checked ) %]
-                    <input type="checkbox" name="id" id="z3950_[% serverloo.id %]" value="[% serverloo.id %]" checked="checked" />
-                [% ELSE %]
-                    <input type="checkbox" name="id" id="z3950_[% serverloo.id %]" value="[% serverloo.id %]" />
+            <div class="yui-g">
+                <h2>Search targets <span style="display: inline; font-size: 70%; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#">Select all</a></span><span class="clearall"><a id="CheckNone" href="#">Clear all</a></span></span></h2>
+                <div id="z3950_search_targets_auth">
+                [% FOREACH serverloo IN serverloop %]
+                    <p>
+                    [% IF ( serverloo.checked ) %]
+                        <input type="checkbox" name="id" id="z3950_[% serverloo.id %]" value="[% serverloo.id %]" checked="checked" />
+                    [% ELSE %]
+                        <input type="checkbox" name="id" id="z3950_[% serverloo.id %]" value="[% serverloo.id %]" />
+                    [% END %]
+                    <label for="z3950_[% serverloo.id %]">[% serverloo.servername %]</label>
+                    </p>
                 [% END %]
-                <label for="z3950_[% serverloo.id %]">[% serverloo.servername %]</label>
-                </p>
-            [% END %]
-        </div>
+                </div>
+            </div>
         <fieldset class="action"><input type="submit"  class="submit" value="Search" onclick="cursor :'wait'"/> <a class="cancel close" href="#">Cancel</a></fieldset>
         </form>
-
-
 [% ELSE %]
     <h2>Results for Authority Records</h2>
     [% IF ( breeding_loop ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index 65713b9274..ab3ef2e663 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -121,10 +121,10 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
         </ol>
     <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
     <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
-</div>
-<div class="yui-g">
-<h2>Search targets <span style="display: inline; font-size: 70%; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#">Select all</a></span><span class="clearall"><a id="CheckNone" href="#">Clear all</a></span></span></h2>
-
+    </div>
+    <div class="yui-g">
+      <h2>Search targets <span style="display: inline; font-size: 70%; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#">Select all</a></span><span class="clearall"><a id="CheckNone" href="#">Clear all</a></span></span></h2>
+      <div id="z3950_search_targets">
     [% FOREACH serverloo IN serverloop %]
         <p> 
             [% IF ( serverloo.checked ) %]
@@ -136,7 +136,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 
         </p>
     [% END %]
-        </div>
+      </div>
+    </div>
     <fieldset class="action"><input type="submit"  class="submit" value="Search" onclick="cursor :'wait'"/> <a class="cancel close" href="#">Cancel</a></fieldset>
     </form>
 
-- 
2.39.5