toward fleshed out holds interface

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

diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js
index b3003a2..ae8300a 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/holds.js
+++ b/Open-ILS/xul/staff_client/server/patron/holds.js
@@ -68,12 +68,17 @@ patron.holds.prototype = {
                                                ['command'],
                                                function() { alert('Not Yet Implemented'); }
                                        ],
-                                       'cmd_item_print' : [
+                                       'cmd_holds_print' : [
                                                ['command'],
                                                function() {
                                                }
                                        ],
-                                       'cmd_item_reprint' : [
+                                       'cmd_holds_cancel' : [
+                                               ['command'],
+                                               function() {
+                                               }
+                                       ],
+                                       'cmd_show_catalog' : [
                                                ['command'],
                                                function() {
                                                }

diff --git a/Open-ILS/xul/staff_client/server/patron/holds.xul b/Open-ILS/xul/staff_client/server/patron/holds.xul
index 89ca37a..7becaf1 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/holds.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds.xul
@@ -50,7 +50,7 @@
        
                        } catch(E) {
                                var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-                                       "system administrator or software developer the following:\n" + E + '\n';
+                                       "system administrator or software developer the following:\npatron/holds.xul\n" + E + '\n';
                                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
                                alert(err_msg);
                        }
@@ -61,7 +61,8 @@
 
        <commandset id="holds_cmds">
                <command id="cmd_holds_print" />
-               <command id="cmd_holds_reprint" />
+               <command id="cmd_holds_cancel" />
+               <command id="cmd_show_catalog" />
        </commandset>
 
        <box id="holds_main" />

diff --git a/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul b/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
index 2183269..0cdd881 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
@@ -12,20 +12,33 @@
 </box>
 
 <vbox id="cmvb1" flex="1">
-       <groupbox id="cmgb1" flex="2">
+       <groupbox id="cmgb1" flex="1" orient="vertical">
                <caption label="&staff.patron_navbar.holds;" />
-               <hbox id="holds_top_ui" />
+               <vbox flex="0">
+                       <hbox id="holds_top_ui" />
+               </vbox>
                <tree id="holds_list" flex="1" enableColumnDrag="true"/>
-               <hbox id="holds_bottom_ui" />
+               <vbox flex="0">
+                       <hbox id="holds_bottom_ui" />
+               </vbox>
        </groupbox>
 </vbox>
 
-<hbox id="holds_bottom_ui">
+<hbox id="holds_top_ui" flex="1">
+       <spacer flex="1"/>
+       <button id="catalog"
+               label="Show in Catalog"
+               command="cmd_show_catalog"
+       />
+       <button id="holds_cancel"
+               label="Cancel"
+               command="cmd_holds_cancel"
+       />
        <button id="holds_print" 
-               label="&staff.patron_display.holds.print_receipt_label;" 
+               label="Print"
                command="cmd_holds_print"
-               accesskey="&staff.patron_display.holds.print_receipt_label.accesskey;"/>
-       <spacer id="pcii3s" flex="1"/>
+               accesskey="P"
+       />
 </hbox>
 
 </overlay>