From be5afc2cd6559f692541ca314f966fa23a490eec Mon Sep 17 00:00:00 2001
From: senator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 21 Jun 2010 20:35:57 +0000
Subject: [PATCH] Acq: yet another menu-reorganizing commit

git-svn-id: svn://svn.open-ils.org/ILS/trunk@16769 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/opac/locale/en-US/lang.dtd            | 39 ++++++++++------------
 .../chrome/content/main/menu_frame_menus.xul       | 23 +++++--------
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 638332120..de0946ffb 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -818,32 +818,29 @@
 
 <!ENTITY staff.main.menu.acq.label "Acquisitions">
 <!ENTITY staff.main.menu.acq.accesskey "A">
-<!ENTITY staff.main.menu.acq.create_invoice.label "New Invoice">
-<!ENTITY staff.main.menu.acq.create_invoice.accesskey "N">
 
-<!ENTITY staff.main.menu.acq.search.label "Search">
-<!ENTITY staff.main.menu.acq.search.accesskey "S">
-<!ENTITY staff.main.menu.acq.unified_search.label "Acquisitions Search">
-<!ENTITY staff.main.menu.acq.unified_search.accesskey "A">
+<!ENTITY staff.main.menu.acq.unified_search.label "General Search">
+<!ENTITY staff.main.menu.acq.unified_search.accesskey "S">
 <!ENTITY staff.main.menu.acq.view_my_pl.label "My Selection Lists">
 <!ENTITY staff.main.menu.acq.view_my_pl.accesskey "L">
-<!ENTITY staff.main.menu.acq.view_local_po.label "Local Purchase Orders">
-<!ENTITY staff.main.menu.acq.view_local_po.accesskey "P">
-<!ENTITY staff.main.menu.acq.view_local_inv.label "Local Invoices">
-<!ENTITY staff.main.menu.acq.view_local_inv.accesskey "I">
-<!ENTITY staff.main.menu.acq.bib_search.label "Title Search">
-<!ENTITY staff.main.menu.acq.bib_search.accesskey "T">
-
-<!ENTITY staff.main.menu.acq.from_bib.label "Import Catalog Records by ID">
-<!ENTITY staff.main.menu.acq.from_bib.accesskey "I">
 <!ENTITY staff.main.menu.acq.brief_record.label "New Brief Record">
 <!ENTITY staff.main.menu.acq.brief_record.accesskey "B">
-<!ENTITY staff.main.menu.acq.upload.label "Load Order Record">
-<!ENTITY staff.main.menu.acq.upload.accesskey "O">
-<!ENTITY staff.main.menu.acq.user_requests.label "User Requests">
-<!ENTITY staff.main.menu.acq.user_requests.accesskey "R">
-<!ENTITY staff.main.menu.acq.claim_eligible.label "Claim-Eligible Items">
-<!ENTITY staff.main.menu.acq.claim_eligible.accesskey "M">
+<!ENTITY staff.main.menu.acq.user_requests.label "Patron Requests">
+<!ENTITY staff.main.menu.acq.user_requests.accesskey "Q">
+<!ENTITY staff.main.menu.acq.bib_search.label "MARC Federated Search">
+<!ENTITY staff.main.menu.acq.bib_search.accesskey "F">
+<!ENTITY staff.main.menu.acq.from_bib.label "Load Catalog Record IDs">
+<!ENTITY staff.main.menu.acq.from_bib.accesskey "C">
+<!ENTITY staff.main.menu.acq.upload.label "Load MARC Order Records">
+<!ENTITY staff.main.menu.acq.upload.accesskey "M">
+<!ENTITY staff.main.menu.acq.view_local_po.label "Purchase Orders">
+<!ENTITY staff.main.menu.acq.view_local_po.accesskey "P">
+<!ENTITY staff.main.menu.acq.claim_eligible.label "Claim-Ready Items">
+<!ENTITY staff.main.menu.acq.claim_eligible.accesskey "R">
+<!ENTITY staff.main.menu.acq.view_local_inv.label "Open Invoices">
+<!ENTITY staff.main.menu.acq.view_local_inv.accesskey "I">
+<!ENTITY staff.main.menu.acq.create_invoice.label "Create Invoice">
+<!ENTITY staff.main.menu.acq.create_invoice.accesskey "V">
 
 <!ENTITY staff.main.menu.booking.label "Booking">
 <!ENTITY staff.main.menu.booking.accesskey "B">
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 d094383c6..d81e384da 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
@@ -268,25 +268,20 @@
 <!-- The Acquisitions menu on the main menu -->
 <menu id="main.menu.acq" label="&staff.main.menu.acq.label;" accesskey="&staff.main.menu.acq.accesskey;">
     <menupopup id="main.menu.acq.popup">
-        <menu id="main.menu.acq.search" label="&staff.main.menu.acq.search.label;" accesskey="&staff.main.menu.acq.search.accesskey;">
-            <menupopup id="main.menu.acq.search.popup">
-                <menuitem label="&staff.main.menu.acq.unified_search.label;" accesskey="&staff.main.menu.acq.unified_search.accesskey;" command="cmd_acq_unified_search"/>
-                <menuseparator />
-                <menuitem label="&staff.main.menu.acq.view_my_pl.label;" accesskey="&staff.main.menu.acq.view_my_pl.accesskey;" command="cmd_acq_view_my_pl"/>
-                <menuitem label="&staff.main.menu.acq.view_local_po.label;" accesskey="&staff.main.menu.acq.view_local_po.accesskey;" command="cmd_acq_view_local_po"/>
-                <menuitem label="&staff.main.menu.acq.view_local_inv.label;" accesskey="&staff.main.menu.acq.view_local_inv.accesskey;" command="cmd_acq_view_local_inv"/>
-                <menuseparator />
-                <menuitem label="&staff.main.menu.acq.bib_search.label;" accesskey="&staff.main.menu.acq.bib_search.accesskey;" command="cmd_acq_bib_search"/>
-            </menupopup>
-        </menu>
-        <menuitem label="&staff.main.menu.acq.from_bib.label;" accesskey="&staff.main.menu.acq.from_bib.accesskey;" command="cmd_acq_from_bib"/>
+        <menuitem label="&staff.main.menu.acq.unified_search.label;" accesskey="&staff.main.menu.acq.unified_search.accesskey;" command="cmd_acq_unified_search"/>
         <menuseparator />
-        <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.view_my_pl.label;" accesskey="&staff.main.menu.acq.view_my_pl.accesskey;" command="cmd_acq_view_my_pl"/>
         <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.user_requests.label;" accesskey="&staff.main.menu.acq.user_requests.accesskey;" command="cmd_acq_user_requests" />
+        <menuitem label="&staff.main.menu.acq.bib_search.label;" accesskey="&staff.main.menu.acq.bib_search.accesskey;" command="cmd_acq_bib_search"/>
+        <menuitem label="&staff.main.menu.acq.from_bib.label;" accesskey="&staff.main.menu.acq.from_bib.accesskey;" command="cmd_acq_from_bib"/>
+        <menuseparator />
+        <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.view_local_po.label;" accesskey="&staff.main.menu.acq.view_local_po.accesskey;" command="cmd_acq_view_local_po"/>
         <menuseparator />
         <menuitem label="&staff.main.menu.acq.claim_eligible.label;" accesskey="&staff.main.menu.acq.claim_eligible.accesskey;" command="cmd_acq_claim_eligible" />
+        <menuitem label="&staff.main.menu.acq.view_local_inv.label;" accesskey="&staff.main.menu.acq.view_local_inv.accesskey;" command="cmd_acq_view_local_inv"/>
+        <menuitem label="&staff.main.menu.acq.create_invoice.label;" accesskey="&staff.main.menu.acq.create_invoice.accesskey;" command="cmd_acq_create_invoice"/>
     </menupopup>
 </menu>
 
-- 
2.11.0