From aaf6b6724f5c7c6e29433600d55b9f1e8836a77b Mon Sep 17 00:00:00 2001
From: radiuscz <radek.siman@centrum.cz>
Date: Mon, 24 Oct 2016 00:57:03 +0200
Subject: [PATCH] Bug 17487: Styling moved from style attribute into
 staff-global.css

Test plan:
1) Apply patch
2) Display Z39.50 search dialogs:
   - cataloguing / new from Z39.50
   - authorities / new from Z39.50
   - acquisition / new from an external source
3) Select all / Clear all should be placed below "Search targets" header
4) [Optionally] Set some style in IntranetUserCSS for class z3950checks

https://bugs.koha-community.org/show_bug.cgi?id=17487

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/css/staff-global.css             | 4 ++++
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 2 +-
 .../prog/en/modules/cataloguing/z3950_auth_search.tt          | 2 +-
 .../intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
index 20ce983ac6..a9da2eeac7 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
@@ -883,6 +883,10 @@ fieldset.rows .inputnote {
     overflow-y: auto;
 }
 
+.z3950checks {
+    padding-left: 1em;
+}
+
 .error {
        color: #cc0000;
 }
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 6a18462fd7..ddf104ad8e 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
@@ -89,7 +89,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 <div class="yui-u second">
 <h2>Search targets</h2>
     <div id="z3950_search_targets_acq">
-        <span style="display: inline; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span>
+        <span class="z3950checks"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span>
     [% FOREACH serverloo IN serverloop %]
         <p>
             [% IF ( serverloo.checked ) %]
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 43ea3fb710..6e6de65fa3 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
@@ -92,7 +92,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
             <div class="yui-g">
                 <h2>Search targets</h2>
                 <div id="z3950_search_targets_auth">
-                    <span style="display: inline; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span>
+                    <span class="z3950checks"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span>
                 [% FOREACH serverloo IN serverloop %]
                     <p>
                     [% IF ( serverloo.checked ) %]
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 9f0c9daa9d..733c6b508d 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
@@ -88,7 +88,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
     <div class="yui-g">
       <h2>Search targets</h2>
       <div id="z3950_search_targets">
-        <span style="display: inline; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span>
+        <span class="z3950checks"><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></span>
     [% FOREACH serverloo IN serverloop %]
         <p> 
             [% IF ( serverloo.checked ) %]
-- 
2.39.5