From b41a615328721bfe1e1e2836e69bac3d1f2e8621 Mon Sep 17 00:00:00 2001
From: Kyle Tomita <ktomita@catalystitservices.com>
Date: Wed, 27 Mar 2013 13:31:03 -0700
Subject: [PATCH] LP1159768 - Client: Holds Client Controls Confusing

The buttons were updated per Jason's suggestions to "No" and "Yes" with
a question added, "Are you sure you want to cancel the hold(s)?"

Signed-off-by: Kyle Tomita <ktomita@catalystitservices.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
---
 Open-ILS/web/opac/locale/en-US/lang.dtd                 | 8 ++++----
 Open-ILS/xul/staff_client/server/patron/hold_cancel.xul | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index b96d4ccb9e..6d6b2e5c6e 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -2636,10 +2636,10 @@
 <!ENTITY staff.hold_list.cancel_hold_dialog.title "Cancel Hold">
 <!ENTITY staff.hold_list.cancel_hold_dialog.header "Cancel Hold">
 <!ENTITY staff.hold_list.cancel_hold_dialog.description "Reason and Notes">
-<!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.label "Cancel Action">
-<!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.accesskey "C">
-<!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.label "Apply Cancellation">
-<!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.accesskey "A">
+<!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.label "No">
+<!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.accesskey "N">
+<!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.label "Yes">
+<!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.accesskey "Y">
 <!ENTITY staff.cat.manage_multi_bib_items.caption "Manage Conjoined Items">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu.label "Actions for Selected Items">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu.accesskey "f">
diff --git a/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul b/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
index d2da173951..ca0941b68b 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
+++ b/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
@@ -49,6 +49,7 @@
     <textbox id="note_tb" multiline="true" />
     <hbox>
         <spacer flex="1"/>
+        Are you sure you want to cancel the hold(s)?
         <button id="cancel_btn" label="&staff.hold_list.cancel_hold_dialog.cancel_btn.label;" accesskey="&staff.hold_list.cancel_hold_dialog.cancel_btn.accesskey;" />
         <button id="apply_btn" label="&staff.hold_list.cancel_hold_dialog.apply_btn.label;" accesskey="&staff.hold_list.cancel_hold_dialog.apply_btn.accesskey;" />
     </hbox>
-- 
2.43.2