[open-ils-commits] r10670 - trunk/Open-ILS/xul/staff_client/server/circ

svn at svn.open-ils.org svn at svn.open-ils.org
Sun Sep 21 23:57:47 EDT 2008


Author: phasefx
Date: 2008-09-21 23:57:45 -0400 (Sun, 21 Sep 2008)
New Revision: 10670

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/checkin.js
   trunk/Open-ILS/xul/staff_client/server/circ/checkin.xul
   trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
Log:
toward standardizing some list actions

Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkin.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkin.js	2008-09-22 03:51:01 UTC (rev 10669)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkin.js	2008-09-22 03:57:45 UTC (rev 10670)
@@ -241,25 +241,9 @@
 							obj.list.print(p);
 						}
 					],
-					'cmd_checkin_export' : [
-						['command'],
-						function() {
-							obj.list.dump_csv_to_clipboard();
-						}
-					],
-
-					'cmd_checkin_reprint' : [
-						['command'],
-						function() {
-							JSAN.use('util.print'); var print = new util.print();
-							print.reprint_last();
-						}
-					],
-					'cmd_checkin_done' : [
-						['command'],
-						function() {
-						}
-					]
+					'cmd_csv_to_clipboard' : [ ['command'], function() { obj.list.dump_csv_to_clipboard(); } ],
+					'cmd_csv_to_printer' : [ ['command'], function() { obj.list.dump_csv_to_printer(); } ],
+					'cmd_csv_to_file' : [ ['command'], function() { obj.list.dump_csv_to_file( { 'defaultFileName' : 'checked_in.txt' } ); } ]
 				}
 			}
 		);

Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkin.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkin.xul	2008-09-22 03:51:01 UTC (rev 10669)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkin.xul	2008-09-22 03:57:45 UTC (rev 10670)
@@ -79,9 +79,9 @@
 	<commandset id="checkin_cmds">
 		<command id="cmd_checkin_submit_barcode" />
 		<command id="cmd_checkin_print" />
-		<command id="cmd_checkin_export" />
-		<command id="cmd_checkin_reprint" />
-		<command id="cmd_checkin_done" />
+		<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"/>

Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul	2008-09-22 03:51:01 UTC (rev 10669)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul	2008-09-22 03:57:45 UTC (rev 10670)
@@ -102,14 +102,23 @@
 </hbox>
 
 <hbox id="checkin_bottom_ui">
+    <button id="list_actions" oncommand="this.firstChild.showPopup();"
+        label="&staff.generic.list_actions.label;" 
+        accesskey="&staff.generic.list_actions.accesskey;" 
+        type="menu" allowevents="true">
+        <menupopup id="list_actions_popup">
+        	<menuitem command="sel_clip" label="&staff.generic.list_actions.sel_clip.label;" accesskey="&staff.generic.list_actions.sel_clip.accesskey;" disabled="true" />
+    	    <menuitem command="cmd_csv_to_printer" label="&staff.generic.list_actions.csv_to_printer.label;" accesskey="&staff.generic.list_actions.csv_to_printer.accesskey;" />
+        	<menuitem command="cmd_csv_to_clipboard" label="&staff.generic.list_actions.csv_to_clipboard.label;" accesskey="&staff.generic.list_actions.csv_to_clipboard.accesskey;" />
+        	<menuitem command="cmd_csv_to_file" label="&staff.generic.list_actions.csv_to_file.label;" accesskey="&staff.generic.list_actions.csv_to_file.accesskey;" />
+	        <menuitem command="save_columns" label="&staff.generic.list_actions.save_columns.label;" accesskey="&staff.generic.list_actions.save_columns.accesskey;" />
+        </menupopup>
+    </button>
+
 	<button id="checkin_print" 
 		label="&staff.checkin.print_receipt.label;" 
 		command="cmd_checkin_print"
 		accesskey="&staff.checkin.print_receipt.accesskey;"/>
-	<button id="checkin_export" 
-		label="&staff.circ.checkin_overlay.checkin_export.label;"
-		command="cmd_checkin_export"
-		accesskey=""/>
 	<checkbox id="trim_list" label="&staff.circ.checkin_overlay.trim_list.label;" checked="true" persist="checked"/> 
 	<checkbox id="strict_barcode" label="&staff.circ.checkin_overlay.strict_barcode.label;" checked="false" persist="checked"/> 
 	<checkbox id="do_not_alert_on_precat" label="&staff.circ.checkin_overlay.do_not_alert_on_precat.label;" persist="checked"/> 



More information about the open-ils-commits mailing list