[open-ils-commits] r17043 - trunk/Open-ILS/xul/staff_client/server/circ (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-07-27 18:32:53 -0400 (Tue, 27 Jul 2010)
New Revision: 17043

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/checkin.xul
   trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
Log:
put these command elements into the overlay, closer to where they're being used

Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkin.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkin.xul	2010-07-27 21:34:43 UTC (rev 17042)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkin.xul	2010-07-27 22:32:53 UTC (rev 17043)
@@ -76,32 +76,8 @@
 
     <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"/>
+    <commandset id="checkin_cmds" />
 
-        <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>
-
     <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
 

Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul	2010-07-27 21:34:43 UTC (rev 17042)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul	2010-07-27 22:32:53 UTC (rev 17043)
@@ -10,8 +10,33 @@
 
 <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"> 
         <menuitem command="sel_clip" label="&staff.circ.checkin_overlay.sel_clip.label;" accesskey="&staff.circ.checkin_overlay.sel_clip.accesskey;" />