[open-ils-commits] r16485 - in trunk/Open-ILS: web/opac/locale/en-US web/opac/skin/default/js web/opac/skin/default/xml xul/staff_client/chrome/content/cat (phasefx)
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon May 24 11:52:05 EDT 2010
Author: phasefx
Date: 2010-05-24 11:52:01 -0400 (Mon, 24 May 2010)
New Revision: 16485
Modified:
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/web/opac/locale/en-US/opac.dtd
trunk/Open-ILS/web/opac/skin/default/js/rdetail.js
trunk/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
Log:
add View/Place Orders to opac wrapper in staff client
remove Show/Create Orders action from OPAC
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-05-21 20:30:02 UTC (rev 16484)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-05-24 15:52:01 UTC (rev 16485)
@@ -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 "">
Modified: trunk/Open-ILS/web/opac/locale/en-US/opac.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/opac.dtd 2010-05-21 20:30:02 UTC (rev 16484)
+++ trunk/Open-ILS/web/opac/locale/en-US/opac.dtd 2010-05-24 15:52:01 UTC (rev 16485)
@@ -483,7 +483,6 @@
<!-- =================================================================
Rdetail
================================================================= -->
-<!ENTITY rdetail.actions.orders "Show / Create Orders">
<!ENTITY rdetail.print "print these details">
<!ENTITY rdetail.cn.barcode "Barcode">
<!ENTITY rdetail.cn.location "Location">
Modified: trunk/Open-ILS/web/opac/skin/default/js/rdetail.js
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/js/rdetail.js 2010-05-21 20:30:02 UTC (rev 16484)
+++ trunk/Open-ILS/web/opac/skin/default/js/rdetail.js 2010-05-24 15:52:01 UTC (rev 16485)
@@ -1062,7 +1062,3 @@
}
-function rdetailViewOrders() {
- location.href = STAFF_WEB_BASE_PATH + '/acq/lineitem/related/' + record.doc_id() + '?target=bib';
-}
-
Modified: trunk/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml 2010-05-21 20:30:02 UTC (rev 16484)
+++ trunk/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml 2010-05-24 15:52:01 UTC (rev 16485)
@@ -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>
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.js 2010-05-21 20:30:02 UTC (rev 16484)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.js 2010-05-24 15:52:01 UTC (rev 16485)
@@ -4,6 +4,7 @@
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 @@
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 @@
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 @@
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;
}
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul 2010-05-21 20:30:02 UTC (rev 16484)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul 2010-05-24 15:52:01 UTC (rev 16485)
@@ -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();"/>
More information about the open-ils-commits
mailing list