From 85bac02f1a98f88eddd6dfdf18464a0cf233d22f Mon Sep 17 00:00:00 2001 From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4> Date: Tue, 27 Jul 2010 22:32:53 +0000 Subject: [PATCH] put these command elements into the overlay, closer to where they're being used git-svn-id: svn://svn.open-ils.org/ILS/trunk@17043 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/circ/checkin.xul | 26 +-------------------- .../staff_client/server/circ/checkin_overlay.xul | 27 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.xul b/Open-ILS/xul/staff_client/server/circ/checkin.xul index 98c746cc19..6851ffbef9 100644 --- a/Open-ILS/xul/staff_client/server/circ/checkin.xul +++ b/Open-ILS/xul/staff_client/server/circ/checkin.xul @@ -76,31 +76,7 @@ <popupset id="copy_status_popupset"/> - <commandset id="checkin_cmds"> - <command id="cmd_checkin_submit_barcode" /> - <command id="cmd_checkin_print" /> - <command id="cmd_csv_to_clipboard" /> - <command id="cmd_csv_to_printer" /> - <command id="cmd_csv_to_file" /> - <command id="save_columns" /> - - <command id="sel_clip" disabled="true"/> - <command id="sel_edit" disabled="true"/> - <command id="sel_backdate" disabled="true"/> - <command id="sel_opac" disabled="true"/> - <command id="sel_patron" disabled="true"/> - <command id="sel_last_patron" disabled="true"/> - <command id="sel_copy_details" disabled="true"/> - <command id="sel_bucket" disabled="true"/> - <command id="sel_spine" disabled="true"/> - <command id="sel_transit_abort" disabled="true"/> - <command id="sel_mark_items_damaged" disabled="true"/> - - <command id="cmd_do_not_alert_on_precat" /> - <command id="cmd_suppress_holds_and_transits" /> - <command id="cmd_amnesty_mode" /> - <command id="cmd_checkin_auto_print_slips" /> - </commandset> + <commandset id="checkin_cmds" /> <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/> <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/> diff --git a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul index e84561a99f..ed4acecd45 100644 --- a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul +++ b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul @@ -10,7 +10,32 @@ <script>dump('loading checkin_overlay.xul\n');</script> -<commandset id="checkin_cmds" /> +<commandset id="checkin_cmds"> + <command id="cmd_checkin_submit_barcode" /> + <command id="cmd_checkin_print" /> + <command id="cmd_csv_to_clipboard" /> + <command id="cmd_csv_to_printer" /> + <command id="cmd_csv_to_file" /> + <command id="save_columns" /> + + <command id="sel_clip" disabled="true"/> + <command id="sel_edit" disabled="true"/> + <command id="sel_backdate" disabled="true"/> + <command id="sel_opac" disabled="true"/> + <command id="sel_patron" disabled="true"/> + <command id="sel_last_patron" disabled="true"/> + <command id="sel_copy_details" disabled="true"/> + <command id="sel_bucket" disabled="true"/> + <command id="sel_spine" disabled="true"/> + <command id="sel_transit_abort" disabled="true"/> + <command id="sel_mark_items_damaged" disabled="true"/> + + <command id="cmd_do_not_alert_on_precat" /> + <command id="cmd_suppress_holds_and_transits" /> + <command id="cmd_amnesty_mode" /> + <command id="cmd_checkin_auto_print_slips" /> +</commandset> + <popupset id="copy_status_popupset"> <popup id="copy_status_actions" position="at_pointer"> -- 2.11.0