From 661fcc99f4cccdee094a81505591e2270724b02c Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 11 Oct 2023 17:41:45 +0000
Subject: [PATCH] Bug 35037: Revise the appearance of the last patron button

Following Bug 21246 I find the button to be too obtrusive. This patch
makes CSS changes to the style of the "Last patron" button shown in the
staff interface when the "showLastPatron" system preference is enabled.

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

- Enable the showLastPatron system preference if necessary.
- Go to Circulation in the staff interface and check out to a patron.
- A "Last patron" button should appear on the right-hand end of the
  breadcrumbs bar.
- Check that the link, dropdown button, and dropdown menu look good.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/css/src/_header.scss   | 13 +++++++++++--
 .../intranet-tmpl/prog/css/src/staff-global.scss    | 10 +++++++++-
 .../prog/en/includes/last-borrower.inc              |  6 +++---
 .../intranet-tmpl/prog/en/includes/shortcut.inc     |  4 +++-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss
index 946ce293d29..eec9046e443 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss
@@ -295,8 +295,17 @@ a.navbar-toggle {
 }
 
 #lastborrowerlink {
-    color: #FFFFFF;
-    background-color: $background-color-primary;
+    font-size: 13px;
+    padding: 0 .7em;
+
+    & + .dropdown-toggle {
+        margin-left: 0;
+        padding: .01em .7em;
+
+        &:hover {
+            background-color: #FFF;
+        }
+    }
 }
 
 @media (max-width: 768px) {
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 029ed50d4b9..b12a703cd92 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -941,6 +941,10 @@ details[open] {
     justify-content: space-between;
 }
 
+#shortcut {
+    display: flex;
+}
+
 #breadcrumbs, #shortcut {
     background-color: transparent;
     clear: both;
@@ -3223,7 +3227,11 @@ label {
     }
 
     > .btn:first-child:not( :last-child ):not( .dropdown-toggle ) {
-        border-right: 1px solid darken( saturate( $btn-primary, 15 ), 15 );
+        border-right: 1px solid #CCC;
+
+        &.btn-primary {
+            border-right: 1px solid darken( saturate( $btn-primary, 15 ), 15 );
+        }
     }
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc
index 844bca2aaa8..86b93f98130 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc
@@ -3,12 +3,12 @@
 </script>
 <div id="lastborrower-window">
     <div class="btn-group">
-        <a class="btn btn-default navbar-btn lastborrower" id="lastborrowerlink" href="#" title=""><i class="fa fa-arrow-right"></i> Last patron</a>
-        <button type="button" data-toggle="dropdown" class="btn btn-default navbar-btn dropdown-toggle" aria-haspopup="true" aria-expanded="false">
+        <a class="btn btn-link navbar-btn lastborrower" id="lastborrowerlink" href="#" title=""><i class="fa fa-arrow-right"></i> Last patron</a>
+        <button type="button" data-toggle="dropdown" class="btn btn-link navbar-btn dropdown-toggle" aria-haspopup="true" aria-expanded="false">
             <span class="caret"></span>
             <span class="sr-only">Toggle Dropdown</span>
         </button>
-        <ul id="lastBorrowerList" class="dropdown-menu">
+        <ul id="lastBorrowerList" class="dropdown-menu dropdown-menu-right">
             <li role="separator" class="divider"></li>
             <li><a id="lastborrower-remove" class="lastborrower" href="#">Clear list</a></li>
         </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc
index b602a2c21c2..01a5924a698 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/shortcut.inc
@@ -3,5 +3,7 @@
         [% INCLUDE 'last-borrower.inc' %]
     [% END %]
 
-    <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa-solid fa-circle-question"></i> <span>Help</span></a>
+    <div>
+        <a class="" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa-solid fa-circle-question"></i> <span>Help</span></a>
+    </div>
 </nav>
-- 
2.30.2