From 3ac122f47d18fe527c6c789a664d4c2b401f5e4c Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 24 Jul 2023 10:36:18 +0000
Subject: [PATCH] Bug 34343: Update style of fixed footer navbar in Z39.50
 searches

We use a Bootstrap fixed navbar in the footer of two pages: the popup
Z39.50 searches in cataloging and authorities. The style of these
footers needs to be udpated for the new staff interface design.

This patch also changes the style of the "cancel" controls in these
footers from links to buttons. The popup window in cataloging has been
adjusted to be the same size as the one in authorities.

To test, apply the batch and rebuild the staff interface CSS.

- Go to Cataloging -> New from Z39.50/SRU.
  - In the popup window, the form should fit comfortably in the window.
  - The footer should be white with a grey border at the top, with
    Bootstrap-styled buttons aligned to the right.
- Perform the same test in Authorities -> New from Z39.50/SRU
- Install and enable an additional translation so that you can confirm
  that the language-selection footer still has the correct style.

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../intranet-tmpl/prog/css/src/staff-global.scss     | 12 ++++++++++--
 .../prog/en/includes/authorities_js.inc              |  2 +-
 .../prog/en/modules/cataloguing/addbiblio.tt         |  2 +-
 .../prog/en/modules/cataloguing/z3950_auth_search.tt |  2 +-
 .../prog/en/modules/cataloguing/z3950_search.tt      |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 3ced7187e1..608e3477cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -3044,8 +3044,6 @@ button,
 }
 
 #changelanguage {
-    background: #FFF none;
-    border-top: 1px solid rgb(173, 173, 173);
     min-height: $language-footer-min-height;
 
     .dropdown-menu {
@@ -3078,6 +3076,16 @@ button,
 }
 
 .navbar-fixed-bottom {
+    background: #FFF none;
+    border-radius: 0;
+    border-top: 1px solid #ADADAD;
+    box-shadow: none;
+
+    fieldset {
+        margin: 0;
+        text-align: right;
+    }
+
     .navbar-inner {
         min-height: 0;
         padding: .4em 0;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
index 152feed293..b363ba106c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
@@ -68,7 +68,7 @@ $(document).ready(function () {
 
     $("#z3950_new").click(function(e){
         e.preventDefault();
-        window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl","z3950search",'width=800,height=500,location=yes,toolbar=no,scrollbars=yes,resize=yes');
+        window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl","z3950search",'width=800,height=550,location=yes,toolbar=no,scrollbars=yes,resize=yes');
     });
 
     $("#z3950_replace").click(function(e){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index 7047d2d381..1c1e7db0a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -465,7 +465,7 @@ function PopupMARCFieldDoc(field) {
     function PopupZ3950() {
         var strQuery = GetZ3950Terms();
         if(strQuery){
-            window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=[% biblionumber | html %]"+strQuery,"z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes');
+            window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=[% biblionumber | html %]"+strQuery,"z3950search",'width=800,height=550,location=yes,toolbar=no,scrollbars=yes,resize=yes');
         }
     }
 
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 487e09553a..8afdfb57e0 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
@@ -69,7 +69,7 @@
             <nav class="navbar navbar-default navbar-fixed-bottom">
                 <div class="container-fluid">
                      <fieldset class="action"><input type="submit" id="submit_z3950_search" class="btn btn-primary" value="Search" />
-                     <a class="cancel close" href="#">Cancel</a></fieldset>
+                     <a class="btn btn-default close" href="#">Cancel</a></fieldset>
                 </div>
             </nav>
         </form>
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 dc1c4ecb08..a4226bed76 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
@@ -110,7 +110,7 @@
                     <div class="container-fluid">
                         <fieldset class="action">
                             <input type="submit" id="submit_z3950_search" class="btn btn-primary" value="Search" />
-                            <a class="cancel close" href="#">Cancel</a>
+                            <a class="btn btn-default close" href="#">Cancel</a>
                         </fieldset>
                     </div>
                 </nav>
-- 
2.20.1