From ff651b84e8d99496bc330c4e8e0925234f30def9 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Mon, 11 Mar 2019 08:33:13 +0000
Subject: [PATCH] Bug 13094: Make it easy to hide 'Cancel all' button on holds
 over report

This patch makes some small modifications to the 'Holds awaiting pickup'
report:

- Fixes typo sypref
- Fixes 'Home branch' to 'Home library'
- Adds a span to easily hide the cancel all button with CSS

To test:
- Make sure you have a hold appearing on the awaiting pickup list
  second tab: Holds waiting over...
- Verify the 'cancel all' button on top shows
- Verify syspref and Home library changes mentioned above
- Add #holdsover-cancel-all { display:none; } to IntrentUserCSS
- Verify that the button and the text have vanished

Note: If the text doesn't display next to the button, try toggling
      the TransferWhenCancelAllWaitingHolds system preference.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 39e4c6c5d791853985773e4032357372f77d7587)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../prog/en/includes/waiting_holds.inc        |  2 +-
 .../prog/en/modules/circ/waitingreserves.tt   | 37 ++++++++++---------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
index 1639197d7b..2bdf8c7c1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
@@ -7,7 +7,7 @@
             <th class="title-string">Date hold placed</th>
             <th class="anti-the">Title</th>
             <th>Patron</th>
-            <th>Home branch</th>
+            <th>Home library</th>
             <th>Current location</th>
             <th>Shelving location</th>
             <th>Call number</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 8694b77c8a..6bc433117f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -79,26 +79,27 @@
         [% END %]
         </div>
         <div id="holdsover">
-                [% IF ( ReservesMaxPickUpDelay ) %]<p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.</p>[% END %]
-               [% IF ( overloop ) %]
-               <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
-                   <input type="hidden" name="cancelall" value="1" />
-                   <input type="hidden" name="allbranches" value="[% allbranches | html %]" />
-                   <input type="hidden" name="tab" value="holdsover">
-                   [% IF TransferWhenCancelAllWaitingHolds %]
-                       <input type="submit" value="Cancel and Transfer all" />
-                   [% ELSE %]
-                       <input type="submit" value="Cancel all" />
+            [% IF ( ReservesMaxPickUpDelay ) %]<p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.</p>[% END %]
+            [% IF ( overloop ) %]
+                <span id="holdsover-cancel-all">
+                   <form name="cancelAllReserve" action="waitingreserves.pl" method="post">
+                       <input type="hidden" name="cancelall" value="1" />
+                       <input type="hidden" name="allbranches" value="[% allbranches | html %]" />
+                       <input type="hidden" name="tab" value="holdsover">
+                       [% IF TransferWhenCancelAllWaitingHolds %]
+                           <input type="submit" value="Cancel and Transfer all" />
+                       [% ELSE %]
+                           <input type="submit" value="Cancel all" />
+                       [% END %]
+                   </form>
+                   [% UNLESS TransferWhenCancelAllWaitingHolds %]
+                        Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref)
                    [% END %]
-               </form>
-               [% UNLESS TransferWhenCancelAllWaitingHolds %]
-                    Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds sypref)
-               [% END %]
-
+                </span>
                [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop %]
-        [% ELSE %]
-            <div class="dialog message">No holds found.</div>
-                [% END %]
+            [% ELSE %]
+                <div class="dialog message">No holds found.</div>
+            [% END %]
         </div>
         </div>
     [% END %]
-- 
2.39.5