From 63bf05ac9685efe7c3a953d8b45c267fa327cf84 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 27 Apr 2006 15:41:47 +0000
Subject: [PATCH] some context menus and tweaks, and some suggestive actions
 that need to do stuff

git-svn-id: svn://svn.open-ils.org/ILS/trunk@3926 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../xul/staff_client/server/circ/checkout.js  |  2 +-
 .../server/circ/copy_status_overlay.xul       | 30 +++++-----
 .../xul/staff_client/server/patron/holds.xul  |  2 +
 .../server/patron/holds_overlay.xul           | 52 ++++++++++------
 .../xul/staff_client/server/patron/items.xul  |  2 +
 .../server/patron/items_overlay.xul           | 60 +++++++++----------
 6 files changed, 83 insertions(+), 65 deletions(-)

diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index 16845dddf7..3aeb66b19c 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -304,7 +304,7 @@ circ.checkout.prototype = {
 				null,
 				{
 					'title' : 'Override Checkout Failure?',
-					'overridable_events' : [ 7004 /* COPY_NOT_AVAILABLE */, 7006, 7010 /* COPY_ALERT_MESSAGE */ ],
+					'overridable_events' : [ 7004 /* COPY_NOT_AVAILABLE */, 7006 /* COPY_IS_REFERENCE */, 7010 /* COPY_ALERT_MESSAGE */ ],
 					'text' : {
 						'7004' : function(r) {
 							return obj.data.hash.ccs[ r.payload ].name();
diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul b/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
index 71d0c3fd8a..1a60bb70ed 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
@@ -10,7 +10,7 @@
 <commandset id="copy_status_cmds" />
 
 <popupset id="copy_status_popupset">
-	<popup id="copy_status_actions" onpopupshowing="dump(document.popupNode.localName + '\n');if (document.popupNode.localName == 'treechildren') this.setAttribute('position','at_pointer'); else this.setAttribute('position','after_start');">
+	<popup id="copy_status_actions" position="at_pointer"> 
 		<menuitem command="sel_checkin" label="Check In Items" accesskey="C" />
 		<menuitem command="sel_edit" label="Edit Item Attributes" accesskey="E" />
 		<menuitem command="sel_opac" label="Show in Catalog" accesskey="S" />
@@ -43,28 +43,26 @@
 		command="cmd_copy_status_submit_barcode"
 		accesskey="S"/>
 	<spacer flex="1"/>
-	<button label="Selected Items" popup="copy_status_actions" accesskey="I"/>
+	<menubar>
+	<menu label="Actions for Selected Items" accesskey="S">
+		<menupopup>
+			<menuitem command="sel_checkin" label="Check In Items" accesskey="C" />
+			<menuitem command="sel_edit" label="Edit Item Attributes" accesskey="E" />
+			<menuitem command="sel_opac" label="Show in Catalog" accesskey="S" />
+			<menuitem command="sel_patron" label="Show Recent Circulations" accesskey="R"/>
+			<menuitem command="sel_bucket" label="Add to Item Bucket" accesskey="A"/>
+		</menupopup>
+	</menu>
+	</menubar>
+
 </hbox>
 
 <hbox id="copy_status_bottom_ui">
+	<spacer flex="1"/>
 	<button id="copy_status_print" 
 		label="Print"
 		command="cmd_copy_status_print"
 		accesskey="P"/>
-	<button id="copy_status_reprint" 
-		label="Print Last"
-		command="cmd_copy_status_reprint"
-		accesskey_disabled="L"/>
-	<spacer id="pcii3s" flex="1"/>
-	<checkbox id="copy_status_auto" 
-		label="Auto-Print"
-		accesskey_disabled="A"/> 
-<!--
-	<button id="copy_status_done" 
-		label="&staff.copy_status.done_label;" 
-		command="cmd_copy_status_done"
-		accesskey="&staff.copy_status.done_label.accesskey;"/>
--->
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/holds.xul b/Open-ILS/xul/staff_client/server/patron/holds.xul
index 43a07e2251..c55dce2f64 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds.xul
@@ -69,6 +69,8 @@
 		<command id="cmd_show_catalog" />
 	</commandset>
 
+	<popupset id="holds_popupset"/>
+
 	<box id="holds_main" />
 
 </window>
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 25ea9c77fe..7f63f8a4ea 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
@@ -9,6 +9,20 @@
 
 <commandset id="holds_cmds" />
 
+<popupset id="holds_popupset">
+	<popup id="holds_actions" position="at_pointer"> 
+		<menuitem label="Show in Catalog" command="cmd_show_catalog" />
+		<menuitem label="Edit Pickup Library" command="cmd_holds_edit_pickup_lib" />
+		<menuitem label="Edit Phone Notification" command="cmd_holds_edit_phone_notify" />
+		<menuitem label="Toggle Email Notification" command="cmd_holds_edit_email_notify" />
+		<menuitem label="Edit Selection Depth (Hold Range)" command="cmd_holds_edit_selection_depth" />
+		<menuitem label="Edit Selection Focus (Hold Range from a Specific Library)" command="cmd_holds_edit_selection_focus" />
+		<menuitem label="Find Another Target" command="cmd_holds_retarget"/>
+		<menuitem label="Cancel Hold" command="cmd_holds_cancel" />
+	</popup>
+</popupset>
+
+
 <box id="holds_main" flex="1" orient="vertical" class="my_overflow">
 	<vbox id="cmvb1" flex="1"/>
 </box>
@@ -19,7 +33,7 @@
 		<vbox flex="0">
 			<hbox id="holds_top_ui" />
 		</vbox>
-		<tree id="holds_list" flex="1" enableColumnDrag="true"/>
+		<tree id="holds_list" flex="1" enableColumnDrag="true" context="holds_actions"/>
 		<vbox flex="0">
 			<hbox id="holds_bottom_ui" />
 		</vbox>
@@ -28,23 +42,25 @@
 
 <hbox id="holds_top_ui" flex="1">
 	<spacer flex="1"/>
-	<button id="catalog"
-		label="Show in Catalog"
-		command="cmd_show_catalog"
-	/>
-	<button id="holds_edit"
-		label="Edit"
-		command="cmd_holds_edit"
-	/>
-	<button id="holds_cancel"
-		label="Cancel"
-		command="cmd_holds_cancel"
-	/>
-	<button id="holds_print" 
-		label="Print"
-		command="cmd_holds_print"
-		accesskey="P"
-	/>
+	<menubar>
+		<menu label="Actions for Selected Holds" accesskey="S">
+			<menupopup>
+				<menuitem label="Show in Catalog" command="cmd_show_catalog" />
+				<menuitem label="Edit Pickup Library" command="cmd_holds_edit_pickup_lib" />
+				<menuitem label="Edit Phone Notification" command="cmd_holds_edit_phone_notify" />
+				<menuitem label="Toggle Email Notification" command="cmd_holds_edit_email_notify" />
+				<menuitem label="Edit Selection Depth (Hold Range)" command="cmd_holds_edit_selection_depth" />
+				<menuitem label="Edit Selection Focus (Hold Range from a Specific Library)" command="cmd_holds_edit_selection_focus" />
+				<menuitem label="Find Another Target" command="cmd_holds_retarget"/>
+				<menuitem label="Cancel Hold" command="cmd_holds_cancel" />
+			</menupopup>
+		</menu>
+	</menubar>
+</hbox>
+
+<hbox id="holds_bottom_ui" flex="1">
+	<spacer flex="1"/>
+	<button id="holds_print" label="Print" command="cmd_holds_print" accesskey="P" />
 </hbox>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/server/patron/items.xul b/Open-ILS/xul/staff_client/server/patron/items.xul
index a5e38d3b52..29f70204c0 100644
--- a/Open-ILS/xul/staff_client/server/patron/items.xul
+++ b/Open-ILS/xul/staff_client/server/patron/items.xul
@@ -73,6 +73,8 @@
 		<command id="cmd_show_catalog" />
 	</commandset>
 
+	<popupset id="items_popupset"/>
+
 	<box id="items_main" />
 
 </window>
diff --git a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
index f2f1ffbdb9..cff4688982 100644
--- a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
@@ -9,6 +9,18 @@
 
 <commandset id="items_cmds" />
 
+<popupset id="items_popupset">
+	<popup id="items_actions" position="at_pointer"> 
+		<menuitem label="Show in Catalog" command="cmd_show_catalog" />
+		<menuitem label="Edit Due Date" command="cmd_items_edit" />
+		<menuitem label="Mark Patron Lost" command="cmd_items_mark_lost" />
+		<menuitem label="Mark Claimed Returned" command="cmd_items_claimed_returned" />
+		<menuitem label="Renew" command="cmd_items_renew" />
+		<menuitem label="Check In" command="cmd_items_checkin" />
+	</popup>
+</popupset>
+
+
 <box id="items_main" flex="1" orient="vertical" class="my_overflow">
 	<vbox id="cmvb1" flex="1"/>
 </box>
@@ -19,7 +31,7 @@
 		<vbox flex="0">
 			<hbox id="items_top_ui" />
 		</vbox>
-		<tree id="items_list" flex="1" enableColumnDrag="true"/>
+		<tree id="items_list" flex="1" enableColumnDrag="true" context="items_actions"/>
 		<vbox flex="0">
 			<hbox id="items_bottom_ui" />
 		</vbox>
@@ -28,35 +40,23 @@
 
 <hbox id="items_top_ui" flex="1">
 	<spacer id="pcii3s" flex="1"/>
-	<button id="show_catalog"
-		label="Show in Catalog"
-		command="cmd_show_catalog"
-	/>
-	<button id="items_edit"
-		label="Edit"
-		command="cmd_items_edit"
-	/>
-	<button id="items_mark_lost"
-		label="Patron Lost"
-		command="cmd_items_mark_lost"
-	/>
-	<button id="items_claimed_returned"
-		label="Claims Returned"
-		command="cmd_items_claimed_returned"
-	/>
-	<button id="items_renew"
-		label="Renew"
-		command="cmd_items_renew"
-	/>
-	<button id="items_checkin"
-		label="Check In"
-		command="cmd_items_checkin"
-	/>
-	<button id="items_print" 
-		label="&staff.patron_display.items.print_receipt_label;" 
-		command="cmd_items_print"
-		accesskey="&staff.patron_display.items.print_receipt_label.accesskey;"
-	/>
+	<menubar>
+		<menu label="Actions for Selected Items" accesskey="S">
+			<menupopup>
+				<menuitem label="Show in Catalog" command="cmd_show_catalog" />
+				<menuitem label="Edit Due Date" command="cmd_items_edit" />
+				<menuitem label="Mark Patron Lost" command="cmd_items_mark_lost" />
+				<menuitem label="Mark Claimed Returned" command="cmd_items_claimed_returned" />
+				<menuitem label="Renew" command="cmd_items_renew" />
+				<menuitem label="Check In" command="cmd_items_checkin" />
+			</menupopup>
+		</menu>
+	</menubar>
+</hbox>
+
+<hbox id="items_bottom_ui" flex="1">
+	<spacer flex="1"/>
+	<button id="items_print" label="&staff.patron_display.items.print_receipt_label;" command="cmd_items_print" accesskey="&staff.patron_display.items.print_receipt_label.accesskey;" />
 </hbox>
 
 </overlay>
-- 
2.43.2