From 7dbb83067d36a7a0651dbc63b1988a1bdeb7c808 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 17 Nov 2009 07:33:37 +0000
Subject: [PATCH] fix some entity names.  With just two actions, use buttons
 instead of menus.  Avoid accesskey conflict with List Actions, and remove
 access key from Cancel

git-svn-id: svn://svn.open-ils.org/ILS/trunk@14937 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/opac/locale/en-US/lang.dtd            | 4 ++--
 Open-ILS/xul/staff_client/server/patron/staged.xul | 8 ++++++--
 2 files changed, 8 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 252b0ecc47..bcec77f9ae 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1304,9 +1304,9 @@
 <!ENTITY staff.patron_display.staged.menu.actions.label "Actions for Selected Events">
 <!ENTITY staff.patron_display.staged.menu.actions.accesskey "A">
 <!ENTITY staff.patron_display.staged.menu.actions.cancel.label "Cancel Patron">
-<!ENTITY staff.patron_display.staged.menu.actions.cancel.accesskey "C">
+<!ENTITY staff.patron_display.staged.menu.actions.cancel.accesskey "">
 <!ENTITY staff.patron_display.staged.menu.actions.load.label "Load Patron">
-<!ENTITY staff.patron_display.staged.menu.actions.load.accesskey "L">
+<!ENTITY staff.patron_display.staged.menu.actions.load.accesskey "P">
 <!ENTITY staff.patron_display.trigger_event.caption "Modify Triggered Events">
 <!ENTITY staff.patron_display.trigger_event.menu.actions.label "Actions for Selected Events">
 <!ENTITY staff.patron_display.trigger_event.menu.actions.accesskey "A">
diff --git a/Open-ILS/xul/staff_client/server/patron/staged.xul b/Open-ILS/xul/staff_client/server/patron/staged.xul
index 462dd970bf..0ce14d6765 100644
--- a/Open-ILS/xul/staff_client/server/patron/staged.xul
+++ b/Open-ILS/xul/staff_client/server/patron/staged.xul
@@ -44,16 +44,20 @@
                 <hbox id="lib_menu_placeholder" />
                 <spacer flex="1" />
                 <progressmeter id="progress" flex="1" hidden="true" mode="undetermined"/>
+<!--
                 <menubar>
                     <menu label="&staff.patron_display.staged.menu.actions.label;" 
                         accesskey="&staff.patron_display.staged.menu.actions.accesskey;" 
                         style="-moz-user-focus: normal">
                         <menupopup>
-                            <menuitem command="cmd_load" label="&staff.patron_display.staged.menu.actions.load.label;" accesskey="&staff.patron-display.menu.actions.load.accesskey;"/>
-                            <menuitem command="cmd_cancel" label="&staff.patron_display.staged.menu.actions.cancel.label;" accesskey="&staff.patron-display.menu.actions.cancel.accesskey;"/>
+                            <menuitem command="cmd_load" label="&staff.patron_display.staged.menu.actions.load.label;" accesskey="&staff.patron_display.staged.menu.actions.load.accesskey;"/>
+                            <menuitem command="cmd_cancel" label="&staff.patron_display.staged.menu.actions.cancel.label;" accesskey="&staff.patron_display.staged.menu.actions.cancel.accesskey;"/>
                         </menupopup>
                     </menu>
                 </menubar>
+-->
+                <button command="cmd_load" label="&staff.patron_display.staged.menu.actions.load.label;" accesskey="&staff.patron_display.staged.menu.actions.load.accesskey;"/>
+                <button command="cmd_cancel" label="&staff.patron_display.staged.menu.actions.cancel.label;" accesskey="&staff.patron_display.staged.menu.actions.cancel.accesskey;"/>
             </hbox>
         </vbox>
         <tree id="stgu_list" flex="1" enableColumnDrag="true" context="stgu_actions" />
-- 
2.11.0