From ee4fbd587f97768106367aab9b9746f9b09dffbf Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 5 Oct 2018 17:05:19 +0000
Subject: [PATCH] Bug 16420: Buttons inconsistent between "Hold found" and
 "Hold found (waiting)" dialogs in checkin

This patch makes minor changes to the text of hold confirmation buttons
in the checkin process in order to make them more consistent.

Also changed: Removed the "danger" class from the "Ignore" button for
readability and consistency's sake.

To test, apply the patch and check in an item which is on hold for a
patron at your logged-in library. The hold confirmation dialog's buttons
should read "Confirm hold," "Print slip and confirm," and "Ignore."

Confirm the hold, then check in the same item again.

In the dialog, the buttons should read "Confirm hold," "Print slip and
confirm," and "Cancel hold."

Signed-off-by: Michal Denar <black23@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 96c2df5804ce3ac84e5963d6b9764553a97a6978)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index cbc62e27e7..9ea80316f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -224,12 +224,12 @@
                     <input type="hidden" name="cancel_reserve" value="0" />
 
                     <button type="submit" class="btn btn-default approve" data-dismiss="modal">
-                        <i class="fa fa-check"></i> Confirm
+                        <i class="fa fa-check"></i> Confirm hold
                     </button>
 
                     <input type="hidden" name="print_slip" value="0" />
                     <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit();">
-                        <i class="fa fa-print"></i> Print and confirm
+                        <i class="fa fa-print"></i> Print slip and confirm
                     </button>
 
                     <button type="submit" class="btn btn-default deny" onclick="this.form.cancel_reserve.value = 1; this.form.submit();">
@@ -445,7 +445,7 @@
                         </button>
                     [% END %]
 
-                    <button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-danger deny" onclick="$('#barcode').focus(); return false;">
+                    <button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-default deny" onclick="$('#barcode').focus(); return false;">
                         <i class="fa fa-times"></i> Ignore
                     </button>
                 </div>
-- 
2.39.5