acq menu entries. fixed generic browser loader to get back/forward working

git-svn-id: svn://svn.open-ils.org/ILS/trunk@13164 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 33e5db3..ecaf6de 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -710,9 +710,18 @@
 
 <!ENTITY staff.main.menu.acq.label "Acquisitions">
 <!ENTITY staff.main.menu.acq.picklist.label "Selection Lists">
+<!ENTITY staff.main.menu.acq.bib_search.label "Title Search">
+<!ENTITY staff.main.menu.acq.brief_record.label "New Brief Record">
 <!ENTITY staff.main.menu.acq.upload.label "Load Order Record">
 <!ENTITY staff.main.menu.acq.po.label "Purchase Orders">
 
+<!ENTITY staff.main.menu.acq.fund.label "Funds">
+<!ENTITY staff.main.menu.acq.funding_source.label "Funding Sources">
+<!ENTITY staff.main.menu.acq.provider.label "Providers">
+<!ENTITY staff.main.menu.acq.distrib_formula.label "Distribution Formulas">
+<!ENTITY staff.main.menu.acq.currency_type.label "Currency Types">
+<!ENTITY staff.main.menu.acq.exchange_rate.label "Exchange Rates">
+
 <!ENTITY staff.main.menu.circ.barcode.retrieve_patron "Retrieve Patron by Barcode">
 <!ENTITY staff.main.menu.circ.barcode.retrieve_patron.accesskey "P">
 <!ENTITY staff.main.menu.circ.barcode.show_item "Show Item Status by Barcode">

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
index 28f6f89..06230c9 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -98,11 +98,10 @@ main.menu.prototype = {
             
             // tab label
             labelKey = labelKey || 'menu.cmd_open_conify.tab';
-            label = offlineStrings.getString(labelKey);
+            var label = offlineStrings.getString(labelKey);
 
             // URL
-            var loc = urls.XUL_REMOTE_BROWSER + '?url=' + 
-                window.escape(urls.EG_WEB_BASE + '/' + path);
+            var loc = urls.XUL_BROWSER + '?url=' + window.escape(obj.url_prefix(urls.EG_WEB_BASE) + '/' + path);
 
             obj.set_tab( 
                 loc, 
@@ -586,6 +585,38 @@ main.menu.prototype = {
                                ['oncommand'],
                                function() { open_eg_web_page('acq/picklist/upload'); }
                        ],
+                       'cmd_acq_bib_search' : [
+                               ['oncommand'],
+                               function() { open_eg_web_page('acq/picklist/bib_search'); }
+                       ],
+                       'cmd_acq_new_brief_record' : [
+                               ['oncommand'],
+                               function() { open_eg_web_page('acq/picklist/brief_record'); }
+                       ],
+            'cmd_acq_view_fund' : [
+                               ['oncommand'],
+                               function() { open_eg_web_page('acq/fund/list'); }
+                       ],
+            'cmd_acq_view_funding_source' : [
+                               ['oncommand'],
+                               function() { open_eg_web_page('acq/funding_source/list'); }
+                       ],
+            'cmd_acq_view_provider' : [
+                               ['oncommand'],
+                               function() { open_eg_web_page('conify/global/acq/provider'); }
+                       ],
+            'cmd_acq_view_currency_type' : [
+                               ['oncommand'],
+                               function() { open_eg_web_page('acq/currency_type/list'); }
+                       ],
+            'cmd_acq_view_exchange_rate' : [
+                               ['oncommand'],
+                               function() { open_eg_web_page('conify/global/acq/exchange_rate'); }
+                       ],
+            'cmd_acq_view_distrib_formula' : [
+                               ['oncommand'],
+                               function() { open_eg_web_page('conify/global/acq/distribution_formula'); }
+                       ],
 
                        'cmd_reprint' : [
                                ['oncommand'],

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
index dff67ba..6db1a9a 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
@@ -77,6 +77,15 @@
        <command id="cmd_acq_view_picklist" />
        <command id="cmd_acq_upload" />
        <command id="cmd_acq_view_po" />
+       <command id="cmd_acq_bib_search" />
+       <command id="cmd_acq_new_brief_record" />
+    <command id="cmd_acq_view_fund" />
+    <command id="cmd_acq_view_funding_source" />
+    <command id="cmd_acq_view_provider" />
+    <command id="cmd_acq_view_currency_type" />
+    <command id="cmd_acq_view_exchange_rate" />
+    <command id="cmd_acq_view_distrib_formula" />
+
 
     <!-- local admin menu commands -->
     <command id="cmd_local_admin_fonts_and_sounds"/>
@@ -217,8 +226,18 @@
 <menu id="main.menu.acq" label="&staff.main.menu.acq.label;">
        <menupopup id="main.menu.acq.popup">
                <menuitem label="&staff.main.menu.acq.picklist.label;" command="cmd_acq_view_picklist"/>
+               <menuitem label="&staff.main.menu.acq.bib_search.label;" command="cmd_acq_bib_search"/>
                <menuitem label="&staff.main.menu.acq.upload.label;" command="cmd_acq_upload"/>
+               <menuitem label="&staff.main.menu.acq.brief_record.label;" command="cmd_acq_new_brief_record"/>
+               <menuseparator />
                <menuitem label="&staff.main.menu.acq.po.label;" command="cmd_acq_view_po" />
+               <menuseparator />
+               <menuitem label="&staff.main.menu.acq.fund.label;" command="cmd_acq_view_fund" />
+               <menuitem label="&staff.main.menu.acq.funding_source.label;" command="cmd_acq_view_funding_source" />
+               <menuitem label="&staff.main.menu.acq.provider.label;" command="cmd_acq_view_provider" />
+               <menuitem label="&staff.main.menu.acq.currency_type.label;" command="cmd_acq_view_currency_type" />
+               <menuitem label="&staff.main.menu.acq.exchange_rate.label;" command="cmd_acq_view_exchange_rate" />
+               <menuitem label="&staff.main.menu.acq.distrib_formula.label;" command="cmd_acq_view_distrib_formula" />
     </menupopup>
 </menu>