From 879a1fff2843d6a1b69e39603ff0b2e034800f79 Mon Sep 17 00:00:00 2001
From: senator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 15 Jun 2010 19:31:19 +0000
Subject: [PATCH] Acq: minor menu reorganization. Move admin-oriented
 interfaces to admin menu.

Also remove "Purchase Order Events" from the acq menu: it's outmoded.


git-svn-id: svn://svn.open-ils.org/ILS/trunk@16722 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/opac/locale/en-US/lang.dtd            | 28 +++++------
 .../xul/staff_client/chrome/content/main/menu.js   | 56 +++++++++++-----------
 .../chrome/content/main/menu_frame_menus.xul       | 33 ++++++-------
 .../chrome/locale/en-US/offline.properties         |  7 ---
 4 files changed, 59 insertions(+), 65 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index c57373b8d7..f144ebd1b7 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -709,6 +709,20 @@
 <!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy.accesskey "P">
 <!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy_action.label "Claim Policy Actions">
 <!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy_action.accesskey "A">
+<!ENTITY staff.main.menu.admin.server_admin.acq.fund.label "Funds">
+<!ENTITY staff.main.menu.admin.server_admin.acq.fund.accesskey "N">
+<!ENTITY staff.main.menu.admin.server_admin.acq.funding_source.label "Funding Sources">
+<!ENTITY staff.main.menu.admin.server_admin.acq.funding_source.accesskey "S">
+<!ENTITY staff.main.menu.admin.server_admin.acq.provider.label "Providers">
+<!ENTITY staff.main.menu.admin.server_admin.acq.provider.accesskey "V">
+<!ENTITY staff.main.menu.admin.server_admin.acq.edi_account.label "EDI Accounts">
+<!ENTITY staff.main.menu.admin.server_admin.acq.edi_account.accesskey "U">
+<!ENTITY staff.main.menu.admin.server_admin.acq.distrib_formula.label "Distribution Formulas">
+<!ENTITY staff.main.menu.admin.server_admin.acq.distrib_formula.accesskey "D">
+<!ENTITY staff.main.menu.admin.server_admin.acq.currency_type.label "Currency Types">
+<!ENTITY staff.main.menu.admin.server_admin.acq.currency_type.accesskey "R">
+<!ENTITY staff.main.menu.admin.server_admin.acq.exchange_rate.label "Exchange Rates">
+<!ENTITY staff.main.menu.admin.server_admin.acq.exchange_rate.accesskey "X">
 
 <!ENTITY staff.main.menu.admin.server_admin.booking.label "Booking">
 <!ENTITY staff.main.menu.admin.server_admin.booking.accesskey "B">
@@ -820,20 +834,6 @@
 <!ENTITY staff.main.menu.acq.po_events.accesskey "E">
 <!ENTITY staff.main.menu.acq.user_requests.label "User Requests">
 <!ENTITY staff.main.menu.acq.user_requests.accesskey "R">
-<!ENTITY staff.main.menu.acq.fund.label "Funds">
-<!ENTITY staff.main.menu.acq.fund.accesskey "F">
-<!ENTITY staff.main.menu.acq.funding_source.label "Funding Sources">
-<!ENTITY staff.main.menu.acq.funding_source.accesskey "S">
-<!ENTITY staff.main.menu.acq.provider.label "Providers">
-<!ENTITY staff.main.menu.acq.provider.accesskey "V">
-<!ENTITY staff.main.menu.acq.edi_account.label "EDI Accounts">
-<!ENTITY staff.main.menu.acq.edi_account.accesskey "U">
-<!ENTITY staff.main.menu.acq.distrib_formula.label "Distribution Formulas">
-<!ENTITY staff.main.menu.acq.distrib_formula.accesskey "D">
-<!ENTITY staff.main.menu.acq.currency_type.label "Currency Types">
-<!ENTITY staff.main.menu.acq.currency_type.accesskey "C">
-<!ENTITY staff.main.menu.acq.exchange_rate.label "Exchange Rates">
-<!ENTITY staff.main.menu.acq.exchange_rate.accesskey "X">
 <!ENTITY staff.main.menu.acq.claim_eligible.label "Claim-Eligible Items">
 <!ENTITY staff.main.menu.acq.claim_eligible.accesskey "M">
 
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 79410b73af..dae0a74054 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -700,6 +700,34 @@ main.menu.prototype = {
                 ['oncommand'],
                 function() { open_eg_web_page('conify/global/acq/claim_policy_action'); }
             ],
+            'cmd_server_admin_acq_fund' : [
+                ['oncommand'],
+                function() { open_eg_web_page('acq/fund/list'); }
+            ],
+            'cmd_server_admin_acq_funding_source' : [
+                ['oncommand'],
+                function() { open_eg_web_page('acq/funding_source/list'); }
+            ],
+            'cmd_server_admin_acq_provider' : [
+                ['oncommand'],
+                function() { open_eg_web_page('conify/global/acq/provider'); }
+            ],
+            'cmd_server_admin_acq_edi_account' : [
+                ['oncommand'],
+                function() { open_eg_web_page('conify/global/acq/edi_account'); }
+            ],
+            'cmd_server_admin_acq_currency_type' : [
+                ['oncommand'],
+                function() { open_eg_web_page('acq/currency_type/list'); }
+            ],
+            'cmd_server_admin_acq_exchange_rate' : [
+                ['oncommand'],
+                function() { open_eg_web_page('conify/global/acq/exchange_rate'); }
+            ],
+            'cmd_server_admin_acq_distrib_formula' : [
+                ['oncommand'],
+                function() { open_eg_web_page('conify/global/acq/distribution_formula'); }
+            ],
             'cmd_server_admin_z39_source' : [
                 ['oncommand'],
                 function() { open_eg_web_page('conify/global/config/z3950_source'); }
@@ -780,34 +808,6 @@ main.menu.prototype = {
                 ['oncommand'],
                 function() { open_eg_web_page('acq/picklist/brief_record', 'menu.cmd_acq_new_brief_record.tab'); }
             ],
-            'cmd_acq_view_fund' : [
-                ['oncommand'],
-                function() { open_eg_web_page('acq/fund/list', 'menu.cmd_acq_view_fund.tab'); }
-            ],
-            'cmd_acq_view_funding_source' : [
-                ['oncommand'],
-                function() { open_eg_web_page('acq/funding_source/list', 'menu.cmd_acq_view_funding_source.tab'); }
-            ],
-            'cmd_acq_view_provider' : [
-                ['oncommand'],
-                function() { open_eg_web_page('conify/global/acq/provider', 'menu.cmd_acq_view_provider.tab'); }
-            ],
-            'cmd_acq_view_edi_account' : [
-                ['oncommand'],
-                function() { open_eg_web_page('conify/global/acq/edi_account', 'menu.cmd_acq_view_edi_account.tab'); }
-            ],
-            'cmd_acq_view_currency_type' : [
-                ['oncommand'],
-                function() { open_eg_web_page('acq/currency_type/list', 'menu.cmd_acq_view_currency_type.tab'); }
-            ],
-            'cmd_acq_view_exchange_rate' : [
-                ['oncommand'],
-                function() { open_eg_web_page('conify/global/acq/exchange_rate', 'menu.cmd_acq_view_exchange_rate.tab'); }
-            ],
-            'cmd_acq_view_distrib_formula' : [
-                ['oncommand'],
-                function() { open_eg_web_page('conify/global/acq/distribution_formula', 'menu.cmd_acq_view_distrib_formula.tab'); }
-            ],
             'cmd_acq_claim_eligible' : [
                 ['oncommand'],
                 function() { open_eg_web_page('acq/financial/claim_eligible', 'menu.cmd_acq_claim_eligible.tab'); }
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 15819d62fc..bb83c59d1f 100644
--- 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
@@ -81,19 +81,12 @@
     <command id="cmd_acq_view_picklist" />
     <command id="cmd_acq_upload" />
     <command id="cmd_acq_view_po" />
-    <command id="cmd_acq_view_po_events" />
+    <!-- <command id="cmd_acq_view_po_events" /> -->
     <command id="cmd_acq_user_requests" />
     <command id="cmd_acq_bib_search" />
     <command id="cmd_acq_unified_search" />
     <command id="cmd_acq_from_bib" />
     <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_edi_account" />
-    <command id="cmd_acq_view_currency_type" />
-    <command id="cmd_acq_view_exchange_rate" />
-    <command id="cmd_acq_view_distrib_formula" />
     <command id="cmd_acq_claim_eligible" />
 
     <command id="cmd_booking_reservation" />
@@ -143,6 +136,13 @@
     <command id="cmd_server_admin_acq_claim_event_type"/>
     <command id="cmd_server_admin_acq_claim_policy"/>
     <command id="cmd_server_admin_acq_claim_policy_action"/>
+    <command id="cmd_server_admin_acq_fund" />
+    <command id="cmd_server_admin_acq_funding_source" />
+    <command id="cmd_server_admin_acq_provider" />
+    <command id="cmd_server_admin_acq_edi_account" />
+    <command id="cmd_server_admin_acq_currency_type" />
+    <command id="cmd_server_admin_acq_exchange_rate" />
+    <command id="cmd_server_admin_acq_distrib_formula" />
     <command id="cmd_server_admin_z39_source"/>
     <command id="cmd_server_admin_circ_mod"/>
     <command id="cmd_server_admin_global_flag"/>
@@ -275,16 +275,9 @@
         <menuitem label="&staff.main.menu.acq.create_invoice.label;" accesskey="&staff.main.menu.acq.create_invoice.accesskey;" command="cmd_acq_create_invoice"/>
         <menuitem label="&staff.main.menu.acq.upload.label;" accesskey="&staff.main.menu.acq.upload.accesskey;" command="cmd_acq_upload"/>
         <menuitem label="&staff.main.menu.acq.brief_record.label;" accesskey="&staff.main.menu.acq.brief_record.accesskey;" command="cmd_acq_new_brief_record"/>
-        <menuitem label="&staff.main.menu.acq.po_events.label;" accesskey="&staff.main.menu.acq.po_events.accesskey;" command="cmd_acq_view_po_events" />
+        <!-- <menuitem label="&staff.main.menu.acq.po_events.label;" accesskey="&staff.main.menu.acq.po_events.accesskey;" command="cmd_acq_view_po_events" /> -->
         <menuitem label="&staff.main.menu.acq.user_requests.label;" accesskey="&staff.main.menu.acq.user_requests.accesskey;" command="cmd_acq_user_requests" />
         <menuseparator />
-        <menuitem label="&staff.main.menu.acq.fund.label;" accesskey="&staff.main.menu.acq.fund.accesskey;" command="cmd_acq_view_fund" />
-        <menuitem label="&staff.main.menu.acq.funding_source.label;" accesskey="&staff.main.menu.acq.funding_source.accesskey;" command="cmd_acq_view_funding_source" />
-        <menuitem label="&staff.main.menu.acq.provider.label;" accesskey="&staff.main.menu.acq.provider.accesskey;" command="cmd_acq_view_provider" />
-        <menuitem label="&staff.main.menu.acq.edi_account.label;" accesskey="&staff.main.menu.acq.edi_account.accesskey;" command="cmd_acq_view_edi_account" />
-        <menuitem label="&staff.main.menu.acq.currency_type.label;" accesskey="&staff.main.menu.acq.currency_type.accesskey;" command="cmd_acq_view_currency_type" />
-        <menuitem label="&staff.main.menu.acq.exchange_rate.label;" accesskey="&staff.main.menu.acq.exchange_rate.accesskey;" command="cmd_acq_view_exchange_rate" />
-        <menuitem label="&staff.main.menu.acq.distrib_formula.label;" accesskey="&staff.main.menu.acq.distrib_formula.accesskey;" command="cmd_acq_view_distrib_formula" />
         <menuitem label="&staff.main.menu.acq.claim_eligible.label;" accesskey="&staff.main.menu.acq.claim_eligible.accesskey;" command="cmd_acq_claim_eligible" />
     </menupopup>
 </menu>
@@ -383,6 +376,14 @@
                         <menuitem label="&staff.main.menu.admin.server_admin.acq.claim_event_type.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_event_type.accesskey;" command="cmd_server_admin_acq_claim_event_type"/>
                         <menuitem label="&staff.main.menu.admin.server_admin.acq.claim_policy.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_policy.accesskey;" command="cmd_server_admin_acq_claim_policy"/>
                         <menuitem label="&staff.main.menu.admin.server_admin.acq.claim_policy_action.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_policy_action.accesskey;" command="cmd_server_admin_acq_claim_policy_action"/>
+                        <menuseparator />
+                        <menuitem label="&staff.main.menu.admin.server_admin.acq.fund.label;" accesskey="&staff.main.menu.admin.server_admin.acq.fund.accesskey;" command="cmd_server_admin_acq_fund" />
+                        <menuitem label="&staff.main.menu.admin.server_admin.acq.funding_source.label;" accesskey="&staff.main.menu.admin.server_admin.acq.funding_source.accesskey;" command="cmd_server_admin_acq_funding_source" />
+                        <menuitem label="&staff.main.menu.admin.server_admin.acq.provider.label;" accesskey="&staff.main.menu.admin.server_admin.acq.provider.accesskey;" command="cmd_server_admin_acq_provider" />
+                        <menuitem label="&staff.main.menu.admin.server_admin.acq.edi_account.label;" accesskey="&staff.main.menu.admin.server_admin.acq.edi_account.accesskey;" command="cmd_server_admin_acq_edi_account" />
+                        <menuitem label="&staff.main.menu.admin.server_admin.acq.currency_type.label;" accesskey="&staff.main.menu.admin.server_admin.acq.currency_type.accesskey;" command="cmd_server_admin_acq_currency_type" />
+                        <menuitem label="&staff.main.menu.admin.server_admin.acq.exchange_rate.label;" accesskey="&staff.main.menu.admin.server_admin.acq.exchange_rate.accesskey;" command="cmd_server_admin_acq_exchange_rate" />
+                        <menuitem label="&staff.main.menu.admin.server_admin.acq.distrib_formula.label;" accesskey="&staff.main.menu.admin.server_admin.acq.distrib_formula.accesskey;" command="cmd_server_admin_acq_distrib_formula" />
                     </menupopup>
                 </menu>
                 <menu id="main.menu.admin.server.booking" label="&staff.main.menu.admin.server_admin.booking.label;" accesskey="&staff.main.menu.admin.server_admin.booking.accesskey;">
diff --git a/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties b/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
index dd0401b5cf..2f9998753f 100644
--- a/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
+++ b/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
@@ -234,13 +234,6 @@ menu.cmd_acq_new_brief_record.tab=New Brief Record
 menu.cmd_acq_view_po.tab=Purchase Orders
 menu.cmd_acq_view_po_events.tab=Purchase Order Events
 menu.cmd_acq_user_requests.tab=User Requests
-menu.cmd_acq_view_fund.tab=Funds
-menu.cmd_acq_view_funding_source.tab=Funding Sources
-menu.cmd_acq_view_provider.tab=Providers
-menu.cmd_acq_view_edi_account.tab=EDI Accounts
-menu.cmd_acq_view_currency_type.tab=Currency Types
-menu.cmd_acq_view_exchange_rate.tab=Exchange Rates
-menu.cmd_acq_view_distrib_formula.tab=Distribution Formulas
 menu.cmd_acq_claim_eligible.tab=Claim-Eligible Items
 menu.cmd_booking_resource.tab=Resources
 menu.cmd_booking_reservation.tab=Reservations
-- 
2.11.0