From cc54d45e50d153d67c1e3b103c32e0874ecc6ca2 Mon Sep 17 00:00:00 2001
From: Jason Etheridge <jason@esilibrary.com>
Date: Sun, 10 Apr 2011 14:47:13 -0400
Subject: [PATCH] more DTD tweaks and some menu re-arrangement.  Embed parts
 and multi-home interfaces into opac wrapper bottom pane (like MARC Edit,
 Holdings Maintenance, etc.)

---
 Open-ILS/web/opac/locale/en-US/lang.dtd            | 11 +++----
 .../xul/staff_client/chrome/content/cat/opac.js    | 35 +++++++++++++++-------
 .../xul/staff_client/chrome/content/cat/opac.xul   | 10 +++----
 .../chrome/locale/en-US/offline.properties         |  1 -
 .../server/cat/manage_multi_home_items.xul         |  5 ++--
 5 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index c707923893..402713a2cd 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -286,9 +286,9 @@
 <!ENTITY staff.cat.opac.default.label "Set bottom interface as Default">
 <!ENTITY staff.cat.opac.manage_parts.accesskey "P">
 <!ENTITY staff.cat.opac.manage_parts.label "Manage Parts">
-<!ENTITY staff.cat.opac.manage_multi_home_items.accesskey "B">
+<!ENTITY staff.cat.opac.manage_multi_home_items.accesskey "F">
 <!ENTITY staff.cat.opac.manage_multi_home_items.label "Manage Foreign Items">
-<!ENTITY staff.cat.opac.mark_for_multi_home.accesskey "B">
+<!ENTITY staff.cat.opac.mark_for_multi_home.accesskey "F">
 <!ENTITY staff.cat.opac.mark_for_multi_home.label "Mark as Target for Foreign Items">
 <!ENTITY staff.cat.opac.marc_edit.accesskey "E">
 <!ENTITY staff.cat.opac.marc_edit.label "MARC Edit">
@@ -2459,6 +2459,7 @@
 <!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.accesskey "C">
 <!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.label "Apply">
 <!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.accesskey "A">
+<!ENTITY staff.cat.manage_multi_bib_items.caption "Manage Foreign Items">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu.label "Actions for Selected Items">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu.accesskey "f">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu_entry.show_in_opac.label "Show in Catalog">
@@ -2471,8 +2472,8 @@
 <!ENTITY staff.cat.manage_multi_bib_items.peer_type.menu.accesskey "T">
 <!ENTITY staff.cat.manage_multi_bib_items.barcode.textbox.label "Barcode:">
 <!ENTITY staff.cat.manage_multi_bib_items.barcode.textbox.accesskey "B">
-<!ENTITY staff.cat.manage_multi_bib_items.barcode.submit.label "Add to Bib">
-<!ENTITY staff.cat.manage_multi_bib_items.barcode.submit.accesskey "A">
+<!ENTITY staff.cat.manage_multi_bib_items.barcode.submit.label "Link to Bib (Submit)">
+<!ENTITY staff.cat.manage_multi_bib_items.barcode.submit.accesskey "S">
 <!ENTITY staff.cat.copy_browser.actions.sel_clip.label "Copy to Clipboard">
 <!ENTITY staff.cat.copy_browser.actions.sel_clip.accesskey "C">
 <!ENTITY staff.cat.copy_browser.actions.cmd_add_items_to_buckets.label "Add Items to Buckets">
@@ -2489,7 +2490,7 @@
 <!ENTITY staff.cat.copy_browser.actions.cmd_edit_items.accesskey "E">
 <!ENTITY staff.cat.copy_browser.actions.cmd_transfer_items.label "Transfer Items to Previously Marked Volume">
 <!ENTITY staff.cat.copy_browser.actions.cmd_transfer_items.accesskey "T">
-<!ENTITY staff.cat.copy_browser.actions.cmd_link_as_multi_bib.label "Link as Foriegn Items to Previously Marked Bib Record">
+<!ENTITY staff.cat.copy_browser.actions.cmd_link_as_multi_bib.label "Link as Foreign Items to Previously Marked Bib Record">
 <!ENTITY staff.cat.copy_browser.actions.cmd_link_as_multi_bib.accesskey "B">
 <!ENTITY staff.cat.copy_browser.actions.cmd_add_volumes.label "Add Volumes">
 <!ENTITY staff.cat.copy_browser.actions.cmd_add_volumes.accesskey "V">
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 ec40e54ed7..ebab0f8167 100644
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
@@ -3,6 +3,8 @@ var docid; var marc_html; var top_pane; var bottom_pane; var opac_frame; var opa
 var marc_view_reset = true;
 var marc_edit_reset = true;
 var copy_browser_reset = true;
+var manage_parts_reset = true;
+var manage_multi_home_reset = true;
 var hold_browser_reset = true;
 var serctrl_view_reset = true;
 
@@ -786,6 +788,9 @@ function refresh_display(id) {
         marc_edit_reset = true;
         copy_browser_reset = true;
         hold_browser_reset = true;
+        manage_parts_reset = true;
+        manage_multi_home_reset = true;
+        serctrl_view_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++) {
@@ -867,15 +872,18 @@ function add_volumes() {
 
 function manage_parts() {
     try {
-        var title = document.getElementById('offlineStrings').getFormattedString('staff.cat.manage_parts.title', [docid]);
+        g.view = 'manage_parts';
         var loc = urls.XUL_BROWSER + "?url=" + window.escape(
             window.xulG.url_prefix(urls.CONIFY_MANAGE_PARTS) + '?r=' + docid
         );
-        var w = xulG.new_tab(
-            loc,
-            { 'tab_name' : title },
-            {}
-        );
+        if (manage_parts_reset) {
+            bottom_pane.reset_iframe( loc,{},xulG);
+            manage_parts_reset =false;
+        } else {
+            bottom_pane.set_iframe( loc,{},xulG);
+        }
+        opac_wrapper_set_help_context();
+        bottom_pane.get_contentWindow().addEventListener('load',opac_wrapper_set_help_context,false);
     } catch(E) {
         alert('Error in chrome/content/cat/opac.js, manage_parts(): ' + E);
     }
@@ -883,11 +891,16 @@ function manage_parts() {
 
 function manage_multi_home_items() {
     try {
-        xulG.new_tab(
-            window.xulG.url_prefix(urls.MANAGE_MULTI_HOME_ITEMS),
-            {},
-            { 'docid' : docid }
-        );
+        g.view = 'manage_multi_home';
+        var loc = window.xulG.url_prefix(urls.MANAGE_MULTI_HOME_ITEMS);
+        if (manage_multi_home_reset) {
+            bottom_pane.reset_iframe( loc,{},{'docid':docid,'no_bib_summary':true});
+            manage_multi_home_reset =false;
+        } else {
+            bottom_pane.set_iframe( loc,{},{'docid':docid,'no_bib_summary':true});
+        }
+        opac_wrapper_set_help_context();
+        bottom_pane.get_contentWindow().addEventListener('load',opac_wrapper_set_help_context,false);
     } catch(E) {
         alert('Error in chrome/content/cat/opac.js, manage_multi_home_items(): ' + E);
     }
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 c697398535..b7d517f9bf 100644
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
@@ -48,6 +48,8 @@
                 <menuitem label="&staff.cat.opac.marc_view.label;" accesskey="&staff.cat.opac.marc_view.accesskey;" id="marc_view" oncommand="set_marc_view();"/>
                 <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.manage_multi_home_items.label;" accesskey="&staff.cat.opac.manage_multi_home_items.accesskey;" id="manage_multi_home_items" oncommand="manage_multi_home_items();"/>
+                <menuitem label="&staff.cat.opac.manage_parts.label;" accesskey="&staff.cat.opac.manage_parts.accesskey;" id="manage_parts" oncommand="manage_parts();"/>
                 <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="open_acq_orders();"/>
                 <menuseparator/>
@@ -59,16 +61,11 @@
                 <menuitem label="&staff.cat.copy_browser.holdings_maintenance.cmd_add_volumes.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_add_volumes.accesskey;" id="add_volumes" oncommand="add_volumes();"/>
                 <menuitem label="&staff.cat.opac.mark_for_hold_transfer.label;" accesskey="&staff.cat.opac.mark_for_hold_transfer.accesskey;" id="mark_for_hold_transfer" oncommand="mark_for_hold_transfer();"/>
                 <menuitem label="&staff.cat.opac.transfer_title_holds.label;" accesskey="&staff.cat.opac.transfer_title_holds.accesskey;" id="transfer_title_holds" oncommand="transfer_title_holds();"/>
-                <menuitem label="&staff.cat.opac.manage_parts.label;" accesskey="&staff.cat.opac.manage_parts.accesskey;" id="manage_parts" oncommand="manage_parts();"/>
                 <menuitem label="&staff.cat.opac.mark_for_multi_home.label;" accesskey="&staff.cat.opac.mark_for_multi_home.accesskey;" id="mark_for_multi_home" oncommand="mark_for_multi_home();"/>
-                <menuitem label="&staff.cat.opac.manage_multi_home_items.label;" accesskey="&staff.cat.opac.manage_multi_home_items.accesskey;" id="manage_multi_home_items" oncommand="manage_multi_home_items();"/>
                 <menuseparator/>
                 <menuitem label="&staff.cat.opac.bib_in_new_tab.label;" id="bib_in_new_tab" oncommand="bib_in_new_tab();"/>
                 <menuitem label="&staff.cat.opac.remove_me.label;" id="remove_me" oncommand="remove_me();"/>
                 <menuseparator/>
-                <menuitem label="&staff.cat.opac.default.label;" id="default" oncommand="set_default();"/>
-                <menuitem label="&staff.cat.opac.refresh_me.label;" id="refresh_me" oncommand="refresh_display(docid);"/>
-                <menuseparator/>
                 <menu id="mfhd_menu" label="&staff.serial.mfhd_menu.label;">
                     <menupopup id="mfhd_popup">
                         <menuitem id="mfhd_add" label="&staff.serial.mfhd_menu.add.label;"/>
@@ -79,6 +76,9 @@
                 <menuitem id="serctrl_view" label="&staff.serial.serctrl_view.label;" oncommand="set_serctrl_view();" />
                 <menuitem label="&staff.cat.opac.alt_serial.label;" accesskey="&staff.cat.opac.alt_serial.accesskey;" id="alt_serial" oncommand="open_alt_serial_mgmt();" />
                 <menuitem label="&staff.cat.opac.batch_receive.label;" accesskey="&staff.cat.opac.batch_receive.accesskey;" id="batch_receive" oncommand="batch_receive_in_new_tab();"/>
+                <menuseparator/>
+                <menuitem label="&staff.cat.opac.default.label;" id="default" oncommand="set_default();"/>
+                <menuitem label="&staff.cat.opac.refresh_me.label;" id="refresh_me" oncommand="refresh_display(docid);"/>
                 </menupopup>
                 </menu>
             </menubar>
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 6f6ff7306a..e8b5a03367 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
@@ -259,7 +259,6 @@ staff.cat.util.copy_editor.edit=Edit
 staff.cat.util.copy_editor.view=View
 staff.circ.copy_status.add_volumes.perm_failure=You do not have permission to add volumes to the workstation library.
 staff.circ.copy_status.add_volumes.title=Add Volume/Item for Record # %1$s
-staff.cat.manage_parts.title=Manage Parts for Record # %1$s
 staff.cat.copy_browser.marked_record_for_multi_home_indicator.tcn.label=Record with TCN %1$s targeted for Multi-Bib items.
 staff.cat.copy_browser.marked_record_for_multi_home_indicator.record_id.label=Record with ID %1$s targeted for Multi-Bib items.
 staff.cat.z3950.marked_record_for_overlay_indicator.tcn.label=Record with TCN %1$s marked for overlay.
diff --git a/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul b/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul
index e090a55c61..7283340640 100644
--- a/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul
+++ b/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul
@@ -53,7 +53,8 @@
         </popup>
     </popupset>
 
-    <vbox flex="1" class="my_overflow">
+    <groupbox flex="1" class="my_overflow">
+        <caption label="&staff.cat.manage_multi_bib_items.caption;"/>
         <hbox>
             <label control="bpt_menu"
                 value="&staff.cat.manage_multi_bib_items.peer_type.menu.label;"
@@ -79,7 +80,7 @@
         </hbox>
         <tree id="list" flex="1" enableColumnDrag="true" context="actions"/>
         <hbox id="list_actions" />
-    </vbox>
+    </groupbox>
 
 </window>
 
-- 
2.11.0