toward standardizing some list actions

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10670 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.js b/Open-ILS/xul/staff_client/server/circ/checkin.js
index 080f616..96fa7d2 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkin.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.js
@@ -241,25 +241,9 @@ circ.checkin.prototype = {
                                                        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' } ); } ]
                                }
                        }
                );

diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.xul b/Open-ILS/xul/staff_client/server/circ/checkin.xul
index 0314bcd..f944237 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkin.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.xul
@@ -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"/>

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 b94b212..d45d74f 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
@@ -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"/>