[open-ils-commits] r10665 - in trunk/Open-ILS: web/opac/locale/en-US xul/staff_client/server/cat

svn at svn.open-ils.org svn at svn.open-ils.org
Sun Sep 21 15:31:22 EDT 2008


Author: phasefx
Date: 2008-09-21 15:31:18 -0400 (Sun, 21 Sep 2008)
New Revision: 10665

Modified:
   trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
   trunk/Open-ILS/xul/staff_client/server/cat/record_buckets.js
   trunk/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
Log:
By hiding the contents of an unseen tabpanel, we can avoid problems with colliding accesskeys

Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2008-09-21 18:22:11 UTC (rev 10664)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2008-09-21 19:31:18 UTC (rev 10665)
@@ -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">

Modified: trunk/Open-ILS/xul/staff_client/server/cat/record_buckets.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/record_buckets.js	2008-09-21 18:22:11 UTC (rev 10664)
+++ trunk/Open-ILS/xul/staff_client/server/cat/record_buckets.js	2008-09-21 19:31:18 UTC (rev 10665)
@@ -11,7 +11,21 @@
 	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) {

Modified: trunk/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul	2008-09-21 18:22:11 UTC (rev 10664)
+++ trunk/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul	2008-09-21 19:31:18 UTC (rev 10665)
@@ -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"



More information about the open-ils-commits mailing list