From d77de32a0d05188c8154b6646a02050cd63c0e85 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sun, 21 Sep 2008 19:31:18 +0000
Subject: [PATCH] By hiding the contents of an unseen tabpanel, we can avoid
 problems with colliding accesskeys

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10665 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/opac/locale/en-US/lang.dtd          |  3 +++
 .../staff_client/server/cat/record_buckets.js    | 16 +++++++++++++++-
 .../server/cat/record_buckets_overlay.xul        | 11 ++++++++---
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 04f05bf1d4..16461ccfec 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1947,6 +1947,7 @@
 <!ENTITY staff.cat.record_buckets_overlay.query_help.button.label "Help">
 <!ENTITY staff.cat.record_buckets_overlay.query_help.button.accesskey "H">
 <!ENTITY staff.cat.record_buckets_overlay.query_list_actions.label "List Actions">
+<!ENTITY staff.cat.record_buckets_overlay.query_list_actions.accesskey "L">
 <!ENTITY staff.cat.record_buckets_overlay.menuitem.sel_clip0.label "Copy Field from selected row to Clipboard">
 <!ENTITY staff.cat.record_buckets_overlay.menuitem.query_csv_to_printer.label "Print List CSV">
 <!ENTITY staff.cat.record_buckets_overlay.menuitem.query_csv_to_clipboard.label "Copy List CSV to Clipboard">
@@ -1955,6 +1956,7 @@
 <!ENTITY staff.cat.record_buckets_overlay.add_all_query_to_pending.label "Add All to Pending Records">
 <!ENTITY staff.cat.record_buckets_overlay.add_sel_query_to_pending.label "Add Selected to Pending Records">
 <!ENTITY staff.cat.record_buckets_overlay.pending_buckets_list_actions.label "List Actions">
+<!ENTITY staff.cat.record_buckets_overlay.pending_buckets_list_actions.accesskey "L">
 <!ENTITY staff.cat.record_buckets_overlay.menuitem.sel_clip1.label "Copy Field from selected row to Clipboard">
 <!ENTITY staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_printer.label "Print List CSV">
 <!ENTITY staff.cat.record_buckets_overlay.menuitem.pending_buckets_csv_to_clipboard.label "Copy List CSV to Clipboard">
@@ -1968,6 +1970,7 @@
 <!ENTITY staff.cat.record_buckets_overlay.info_box.label "Bucket #">
 <!ENTITY staff.cat.record_buckets_overlay.bucket_owner.label "Owner:">
 <!ENTITY staff.cat.record_buckets_overlay.record_buckets_list_actions.label "List Actions">
+<!ENTITY staff.cat.record_buckets_overlay.record_buckets_list_actions.accesskey "L">
 <!ENTITY staff.cat.record_buckets_overlay.menuitem.sel_clip2.label "Copy Field from selected row to Clipboard">
 <!ENTITY staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_printer.label "Print List CSV">
 <!ENTITY staff.cat.record_buckets_overlay.menuitem.record_buckets_csv_to_clipboard.label "Copy List CSV to Clipboard">
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets.js b/Open-ILS/xul/staff_client/server/cat/record_buckets.js
index 2300f6b6e5..f36c351b02 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets.js
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets.js
@@ -11,7 +11,21 @@ cat.record_buckets = function (params) {
 	JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'});
 	this.first_pause = true;
     var x = document.getElementById("record_buckets_tabbox");
-    if (x) x.selectedIndex = 2;
+    if (x) {
+        x.addEventListener(
+            'select',
+            function(ev) {
+                if (ev.target.tagName == 'tabpanels') {
+                    for (var i = 0; i < ev.target.childNodes.length; i++) {
+                        var p = ev.target.childNodes[i].firstChild;
+                        p.hidden = x.selectedIndex != i;
+                    }
+                }
+            },
+            false
+        );
+        x.selectedIndex = 2;
+    }
 };
 
 cat.record_buckets.pick_file = function (defaultFileName) {
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul b/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
index 46bf52ec81..3e971b8275 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
@@ -85,7 +85,10 @@
 </hbox>
 
 <hbox id="record_query_bottom_ui">
-	<button id="record_query_list_actions" label="&staff.cat.record_buckets_overlay.query_list_actions.label;" type="menu" allowevents="true">
+	<button id="record_query_list_actions" 
+        label="&staff.cat.record_buckets_overlay.query_list_actions.label;" 
+        accesskey="&staff.cat.record_buckets_overlay.query_list_actions.accesskey;" 
+        type="menu" allowevents="true">
         <menupopup id="record_query_list_actions_popup">
         	<menuitem command="sel_clip0" label="&staff.cat.record_buckets_overlay.menuitem.sel_clip0.label;" disabled="true" />
     	    <menuitem command="cmd_record_query_csv_to_printer" label="&staff.cat.record_buckets_overlay.menuitem.query_csv_to_printer.label;" />
@@ -104,8 +107,9 @@
 </hbox>
 
 <hbox id="pending_buckets_bottom_ui">
-	<button id="pending_buckets_list_actions"
+	<button id="pending_buckets_list_actions" 
       label="&staff.cat.record_buckets_overlay.pending_buckets_list_actions.label;"
+      accesskey="&staff.cat.record_buckets_overlay.pending_buckets_list_actions.accesskey;"
       type="menu" allowevents="true">
         <menupopup id="pending_buckets_list_actions_popup">
         	<menuitem command="sel_clip1" label="&staff.cat.record_buckets_overlay.menuitem.sel_clip1.label;" disabled="true" />
@@ -143,8 +147,9 @@
 </hbox>
 
 <hbox id="record_buckets_bottom_ui">
-	<button id="record_buckets_list_actions"
+	<button id="record_buckets_list_actions" 
       label="&staff.cat.record_buckets_overlay.record_buckets_list_actions.label;"
+      accesskey="&staff.cat.record_buckets_overlay.record_buckets_list_actions.accesskey;"
       type="menu" allowevents="true" disabled="true">
         <menupopup id="record_buckets_list_actions_popup">
 	        <menuitem command="sel_clip2"
-- 
2.43.2