From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 24 May 2010 15:52:01 +0000 (+0000)
Subject: add View/Place Orders to opac wrapper in staff client
X-Git-Tag: sprint4-merge-nov22~7671
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=947978d138511112555ff140d4a4a2cea43b4161;p=working%2FEvergreen.git

add View/Place Orders to opac wrapper in staff client
remove Show/Create Orders action from OPAC


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

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index d12cfa8c85..a0de88ac46 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -308,6 +308,8 @@
 <!ENTITY staff.cat.opac.remove_me.label "Remove this Frame">
 <!ENTITY staff.cat.opac.view_holds.accesskey "s">
 <!ENTITY staff.cat.opac.view_holds.label "View Holds">
+<!ENTITY staff.cat.opac.view_orders.accesskey "r">
+<!ENTITY staff.cat.opac.view_orders.label "View/Place Orders">
 <!ENTITY staff.cat.popup.add_to_bucket "Add to Bucket">
 <!ENTITY staff.cat.popup.add_to_bucket.key "">
 <!ENTITY staff.cat.popup.browse.record.tab.key "">
diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd
index 69c30ef47e..d5066caa52 100644
--- a/Open-ILS/web/opac/locale/en-US/opac.dtd
+++ b/Open-ILS/web/opac/locale/en-US/opac.dtd
@@ -483,7 +483,6 @@ Please see a librarian to renew your account.">
 <!--	================================================================= 
 	Rdetail
 	================================================================= -->
-<!ENTITY rdetail.actions.orders "Show / Create Orders">
 <!ENTITY rdetail.print "print these details">
 <!ENTITY rdetail.cn.barcode "Barcode">
 <!ENTITY rdetail.cn.location "Location">
diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js
index d9d05b8821..e081befab3 100644
--- a/Open-ILS/web/opac/skin/default/js/rdetail.js
+++ b/Open-ILS/web/opac/skin/default/js/rdetail.js
@@ -1062,7 +1062,3 @@ function rdetailGBPViewerLoadCallback() {
 
 }
 
-function rdetailViewOrders() {
-    location.href = STAFF_WEB_BASE_PATH + '/acq/lineitem/related/' + record.doc_id() + '?target=bib';
-}
-
diff --git a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
index 6b39fba4ac..cfd2e69e66 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
@@ -64,8 +64,6 @@
 							<option disabled='disabled'>--------------</option>
 							<option value='new_bookbag' onclick='rdetailNewBookbag();'>&rdetail.bookbag.create;</option>
 							<option disabled='disabled'>--------------</option>
-                            <!-- TODO: i18n, hide when non-xul -->
-							<option id='rdetail_show_orders' class='hide_me' value='view_orders' onclick='rdetailViewOrders();'>&rdetail.actions.orders;</option>
 						</select>
 					</span>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.js b/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
index faa3edc351..16e7b767a6 100644
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
@@ -4,6 +4,7 @@ var marc_view_reset = true;
 var marc_edit_reset = true;
 var copy_browser_reset = true;
 var hold_browser_reset = true;
+var acq_orders_reset = true;
 
 function $(id) { return document.getElementById(id); }
 
@@ -267,6 +268,19 @@ function set_hold_browser() {
     bottom_pane.get_contentWindow().addEventListener('load',opac_wrapper_set_help_context,false);
 }
 
+function set_acq_orders() {
+    g.view = 'acq_orders';
+    var url = xulG.url_prefix( '/acq/lineitem/related/' ) + window.escape(docid) + '?target=bib';
+    if (acq_orders_reset) {
+        bottom_pane.reset_iframe(url,{},xulG);
+        acq_orders_reset = false;
+    } else {
+        bottom_pane.set_iframe(url,{},xulG);
+    }
+    opac_wrapper_set_help_context(); 
+    bottom_pane.get_contentWindow().addEventListener('load',opac_wrapper_set_help_context,false);
+}
+
 function set_opac() {
     g.view = 'opac';
     try {
@@ -527,6 +541,7 @@ function refresh_display(id) {
         marc_edit_reset = true;
         copy_browser_reset = true;
         hold_browser_reset = true;
+        acq_orders_reset = true;
         while(top_pane.node.lastChild) top_pane.node.removeChild( top_pane.node.lastChild );
         var children = bottom_pane.node.childNodes;
         for (var i = 0; i < children.length; i++) {
@@ -549,6 +564,7 @@ function refresh_display(id) {
             case 'marc_edit' : set_marc_edit(); break;
             case 'copy_browser' : set_copy_browser(); break;
             case 'hold_browser' : set_hold_browser(); break;
+            case 'acq_orders' : set_acq_orders(); break;
             case 'opac' :
             default: set_opac(); break;
         }
diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
index 7f0fdbb035..929ab382cc 100644
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
@@ -49,6 +49,7 @@
                 <menuitem label="&staff.cat.opac.marc_edit.label;" accesskey="&staff.cat.opac.marc_edit.accesskey;" id="marc_edit" oncommand="set_marc_edit();"/>
                 <menuitem label="&staff.cat.opac.copy_browse.label;" accesskey="&staff.cat.opac.copy_browse.accesskey;" id="copy_browse" oncommand="set_copy_browser();"/>
                 <menuitem label="&staff.cat.opac.view_holds.label;" accesskey="&staff.cat.opac.view_holds.accesskey;" id="view_holds" oncommand="set_hold_browser();"/>
+                <menuitem label="&staff.cat.opac.view_orders.label;" accesskey="&staff.cat.opac.view_orders.accesskey;" id="view_orders" oncommand="set_acq_orders();"/>
                 <menuseparator/>
                 <menuitem label="&staff.cat.opac.add_bucket.label;" accesskey="&staff.cat.opac.add_bucket.accesskey;" id="add_bucket" oncommand="add_to_bucket();"/>
                 <menuitem label="&staff.cat.opac.mark_for_overlay.label;" accesskey="&staff.cat.opac.mark_for_overlay.accesskey;" id="mark_for_overlay" oncommand="mark_for_overlay();"/>