[open-ils-commits] [GIT] Evergreen ILS branch master updated. c4df2e9ccacb369304dfeca0cfe94286b35d801a

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  c4df2e9ccacb369304dfeca0cfe94286b35d801a (commit)
      from  7e35393865d42452a366b8be734ce81c0a1e9892 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c4df2e9ccacb369304dfeca0cfe94286b35d801a
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Wed Jun 13 02:30:36 2012 -0400

    expose hard-coded toolbar layout option
    
    If the open-ils.menu.toolbar preference or ui.general.button_bar org unit
    setting references a non-existent toolbar, then a hard-coded stock toolbar
    will render.  However, the menu entry 'None' will be selected under the
    Admin -> Workstation Administration -> Toolbars -> Current menu, which is
    confusing.
    
    With this change, a Default menu entry will be selected whenever the hard-
    coded layout has cause to render, and you can also explicitly select that
    menu entry to use the default and save it as your workstation default.
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

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 e0db32e..7b781a1 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -1732,6 +1732,14 @@ main.menu.prototype = {
                     )
                 );
 
+                x.appendChild(
+                    create_menuitem(
+                        offlineStrings.getString('staff.main.button_bar.default'),
+                        'default',
+                        true
+                    )
+                );
+
                 for (var i = 0; i < this.data.list.atb.length; i++) {
                     var def = this.data.list.atb[i];
                     x.appendChild(
@@ -1778,6 +1786,7 @@ main.menu.prototype = {
                 var x = document.getElementById('main.menu.admin.client.toolbars.current.popup');
                 if (x) {
                     var selectitems = x.getElementsByAttribute('value',button_bar);
+                    if(selectitems.length < 1) selecteditems = x.getElementsByAttribute('value','default');
                     if(selectitems.length > 0) selectitems[0].setAttribute('checked','true');
                 }
             }
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 39e4974..8a44950 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
@@ -321,6 +321,7 @@ barcode_choice.asset_label=Item : %1$s
 barcode_choice.serial_label=Serial : %1$s
 barcode_choice.booking_label=Booking : %1$s
 staff.main.button_bar.none=None
+staff.main.button_bar.default=Default
 util.hide_elements.title=Hide UI Elements
 util.hide_elements.desc=This is a list of hideable elements for this interface.  Check the ones that you want hidden and the library (and descendants) you want to affect:
 util.hide_elements.current_setting_preamble=Workstation library %1$s is currently hiding these elements based on a setting inherited from %2$s:

-----------------------------------------------------------------------

Summary of changes:
 .../xul/staff_client/chrome/content/main/menu.js   |    9 +++++++++
 .../chrome/locale/en-US/offline.properties         |    1 +
 2 files changed, 10 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS