From e3c5d9e322c53e9ca1ee56aed465bbe794eefcfd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 11 Feb 2016 08:56:42 -0500 Subject: [PATCH] Bug 15670 - Rename "Cancel" to "Cancel hold" when checking in a waiting item MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When checking in an on-hold item which is waiting, the "Cancel" button cancels the hold, so it should say so. This patch changes the text. This patch also moves the 'cancel hold' button to the middle, on the theory that buttons on the left should default to 'confirm' and buttons on the right should generally imply 'cancel'--as in 'do nothing.' Moving it to the middle seems like a good place to put it where users will have to think about clicking it. To test: 1. Find an hold which has been made 'waiting,' or check in an confirm a pending hold at your library. 2. Check in that item again and verify that the 'Hold found' dialog contains a 'Cancel hold' button which works to cancel the waiting hold. 3. Repeat the process and confirm that the functionality of the other buttons is unchanged. Followed test plan, works as expected. Signed-off-by: Marc VĂ©ron --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 5 +++-- 1 file changed, 3 insertions(+), 2 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 aace2fb..a2bed37 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -233,11 +233,12 @@ $(document).ready(function () {

Hold at [% destbranchname %]

[% END %]
- - + + + [% FOREACH inputloo IN inputloop %] -- 1.7.10.4