[open-ils-commits] r12409 - in trunk/Open-ILS: web/opac/locale/en-US xul/staff_client/chrome/content/main xul/staff_client/chrome/skin/media/images xul/staff_client/server/admin (phasefx)
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Mar 4 17:39:58 EST 2009
Author: phasefx
Date: 2009-03-04 17:39:53 -0500 (Wed, 04 Mar 2009)
New Revision: 12409
Added:
trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/Arrow-rightup-small.png
trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_famiglia_32x32.png
trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_indici_32x32.png
trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_lente_32x32.png
trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_libro_32x32.png
trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/center.png
trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/licenses.txt
Modified:
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
Log:
optional button bar between top-level menu and tabbed interfaces
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2009-03-04 22:35:28 UTC (rev 12408)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2009-03-04 22:39:53 UTC (rev 12409)
@@ -587,6 +587,16 @@
<!ENTITY staff.main.auth.status "Status">
<!ENTITY staff.main.auth.version "Version">
<!ENTITY staff.main.auth.workstation "Workstation">
+<!ENTITY staff.main.button_bar.check_out.label "Check Out">
+<!ENTITY staff.main.button_bar.check_out.accesskey "">
+<!ENTITY staff.main.button_bar.check_in.label "Check In">
+<!ENTITY staff.main.button_bar.check_in.accesskey "">
+<!ENTITY staff.main.button_bar.item_status.label "Item Status">
+<!ENTITY staff.main.button_bar.item_status.accesskey "">
+<!ENTITY staff.main.button_bar.patron_search.label "Patron Search">
+<!ENTITY staff.main.button_bar.patron_search.accesskey "">
+<!ENTITY staff.main.button_bar.patron_registration.label "Patron Registration">
+<!ENTITY staff.main.button_bar.patron_registration.accesskey "">
<!ENTITY staff.main.menu.acquisitions.accesskey "q">
<!ENTITY staff.main.menu.acquisitions.label "Acquisitions">
<!ENTITY staff.main.menu.admin.accesskey "-">
@@ -636,6 +646,8 @@
<!ENTITY staff.main.menu.admin.xuleditor.label "XUL Test">
<!ENTITY staff.main.menu.admin.venkman.label "Venkman">
<!ENTITY staff.main.menu.admin.ping "Ping Server">
+<!ENTITY staff.main.menu.admin.toggle_buttonbar.accesskey "B">
+<!ENTITY staff.main.menu.admin.toggle_buttonbar.label "Toggle Button Bar">
<!ENTITY staff.main.menu.cat.accesskey "g">
<!ENTITY staff.main.menu.cat.add_bib.key "B">
<!ENTITY staff.main.menu.cat.add_bib.label "Add Bib Record">
@@ -2666,5 +2678,7 @@
<!ENTITY ev.staff.patron.ue_xhtml.alias.label "Alias">
<!ENTITY staff.portal.title "Evergreen Staff Client Portal Page">
<!ENTITY staff.portal.default.welcome "This is the Evergreen staff client portal page. You can customize this with the information or functionality your organization needs to support its operations. For example, you could add links to process and procedure documents.">
-<!ENTITY ui.circ.patron_summary.horizontal "Alternative Horizontal Patron Summary Panel">
+<!ENTITY ui.circ.patron_summary.horizontal "GUI: Alternative Horizontal Patron Summary Panel">
<!ENTITY ui.circ.patron_summary.horizontal.desc "This replaces the vertical Patron Summary Sidebar.">
+<!ENTITY ui.general.button_bar "GUI: Above-Tab Button Bar">
+<!ENTITY ui.general.button_bar.desc "This enables a row of buttons and/or icons between the top-level menu system and the tabbed interfaces.">
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2009-03-04 22:35:28 UTC (rev 12408)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2009-03-04 22:39:53 UTC (rev 12409)
@@ -54,6 +54,12 @@
JSAN.use('OpenILS.data'); obj.data = new OpenILS.data(); obj.data.init({'via':'stash'});
+ var button_bar = String( obj.data.hash.aous['ui.general.button_bar'] ) == 'true';
+ if (button_bar) {
+ var x = document.getElementById('main_toolbar');
+ if (x) x.setAttribute('hidden','false');
+ }
+
var cmd_map = {
'cmd_broken' : [
['oncommand'],
@@ -401,6 +407,14 @@
}
],
+ 'cmd_toggle_buttonbar' : [
+ ['oncommand'],
+ function() {
+ var x = document.getElementById('main_toolbar');
+ if (x) x.hidden = ! x.hidden;
+ }
+ ],
+
'cmd_open_vandelay' : [
['oncommand'],
function() {
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2009-03-04 22:35:28 UTC (rev 12408)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2009-03-04 22:39:53 UTC (rev 12409)
@@ -54,6 +54,7 @@
<command id="cmd_manage_offline_xacts" />
<command id="cmd_download_patrons" />
<command id="cmd_local_admin" />
+ <command id="cmd_toggle_buttonbar" />
<command id="cmd_extension_manager"/>
<command id="cmd_theme_manager"/>
@@ -99,7 +100,6 @@
<key id="retrieve_last_record_key" keycode="VK_F8" modifiers="shift" command="cmd_retrieve_last_record"/>
</keyset>
-
<!-- The File menu on the main menu -->
<menu id="main.menu.file" label="&staff.main.menu.file.label;" accesskey="&staff.main.menu.file.accesskey;" >
<menupopup id="main.menu.file.popup">
@@ -206,6 +206,7 @@
<menuitem label="&staff.main.menu.admin.user_edit.label;" accesskey="&staff.main.menu.admin.user_edit.accesskey;" command="cmd_adv_user_edit"/>
<menuitem label="&staff.main.menu.admin.template_edit.label;" accesskey="&staff.main.menu.admin.template_edit.accesskey;" command="cmd_print_list_template_edit"/>
<menuitem label="&staff.main.menu.admin.survey_wizard.label;" accesskey="&staff.main.menu.admin.survey_wizard.accesskey;" command="cmd_survey_wizard"/>
+ <menuitem label="&staff.main.menu.admin.toggle_buttonbar.label;" accesskey="&staff.main.menu.admin.toggle_buttonbar.accesskey;" command="cmd_toggle_buttonbar"/>
<menuseparator />
<menu id="main.menu.admin.sub" accesskey="&staff.main.menu.admin.developer.accesskey;" label="&staff.main.menu.admin.developer.label;">
<menupopup id="main.menu.admin.sub.popup">
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul 2009-03-04 22:35:28 UTC (rev 12408)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul 2009-03-04 22:39:53 UTC (rev 12409)
@@ -75,6 +75,34 @@
<menu id="main.menu.admin" />
<menu id="main.menu.help" />
</menubar>
+ <toolbar id="main_toolbar" hidden="true">
+ <toolbarbutton id="tb_checkout"
+ command="cmd_circ_checkout"
+ image="chrome://open_ils_staff_client/skin/media/images/Arrow-rightup-small.png"
+ label="&staff.main.button_bar.check_out.label;"
+ accesskey="&staff.main.button_bar.check_out.accesskey;" />
+ <toolbarbutton id="tb_checkin"
+ command="cmd_circ_checkin"
+ image="chrome://open_ils_staff_client/skin/media/images/center.png"
+ label="&staff.main.button_bar.check_in.label;"
+ accesskey="&staff.main.button_bar.check_in.accesskey;" />
+ <toolbarbutton id="tb_item_status"
+ command="cmd_copy_status"
+ image="chrome://open_ils_staff_client/skin/media/images/HILLBLU_libro_32x32.png"
+ label="&staff.main.button_bar.item_status.label;"
+ accesskey="&staff.main.button_bar.item_status.accesskey;" />
+ <toolbarseparator />
+ <toolbarbutton id="tb_patron_search"
+ command="cmd_patron_search"
+ image="chrome://open_ils_staff_client/skin/media/images/HILLBLU_lente_32x32.png"
+ label="&staff.main.button_bar.patron_search.label;"
+ accesskey="&staff.main.button_bar.patron_search.accesskey;" />
+ <toolbarbutton id="tb_patron_registration"
+ command="cmd_patron_register"
+ image="chrome://open_ils_staff_client/skin/media/images/HILLBLU_famiglia_32x32.png"
+ label="&staff.main.button_bar.patron_registration.label;"
+ accesskey="&staff.main.button_bar.patron_registration.accesskey;" />
+ </toolbar>
</toolbox>
</overlay>
Added: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/Arrow-rightup-small.png
===================================================================
(Binary files differ)
Property changes on: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/Arrow-rightup-small.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_famiglia_32x32.png
===================================================================
(Binary files differ)
Property changes on: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_famiglia_32x32.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_indici_32x32.png
===================================================================
(Binary files differ)
Property changes on: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_indici_32x32.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_lente_32x32.png
===================================================================
(Binary files differ)
Property changes on: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_lente_32x32.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_libro_32x32.png
===================================================================
(Binary files differ)
Property changes on: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_libro_32x32.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/center.png
===================================================================
(Binary files differ)
Property changes on: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/center.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/licenses.txt
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/licenses.txt (rev 0)
+++ trunk/Open-ILS/xul/staff_client/chrome/skin/media/images/licenses.txt 2009-03-04 22:39:53 UTC (rev 12409)
@@ -0,0 +1,28 @@
+HILLBLU_lente_32x32 derived from:
+http://commons.wikimedia.org/wiki/File:HILLBLU_lente.png
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".
+
+HILLBLU_indici_32x32 derived from:
+http://commons.wikimedia.org/wiki/File:HILLBLU_indici.png
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".
+
+HILLBLU_libro_32x32 derived from:
+http://commons.wikimedia.org/wiki/File:HILLBLU_libro.png
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".
+
+HILLBLU_famiglia_32x32 derived from:
+http://commons.wikimedia.org/wiki/File:HILLBLU_famiglia.png
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".
+
+Arrow-right-up-small.png derived from:
+http://commons.wikimedia.org/wiki/File:Arrow-rightup-small.svg
+Copyright © Vadim Plessky, all rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, and this list of conditions;
+Redistributions in binary form must reproduce the above copyright notice, and this list of conditions in the documentation and/or other materials provided with the distribution;
+Neither the name of Vadim Plessky nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+Center.png derived from:
+http://commons.wikimedia.org/wiki/File:Center.svg
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".
+
+
Modified: trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml 2009-03-04 22:35:28 UTC (rev 12408)
+++ trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml 2009-03-04 22:39:53 UTC (rev 12409)
@@ -141,6 +141,15 @@
desc : '&ui.circ.patron_summary.horizontal.desc;',
type : 'bool'
},
+ 'ui.general.button_bar' : {
+ label : '&ui.general.button_bar;',
+ desc : '&ui.general.button_bar.desc;',
+ type : 'bool'
+ },
+ 'circ.mark_lost_overdue_interval' : {
+ label : '&staff.server.admin.org_settings.circ.mark_lost_overdue_interval;',
+ desc : '&staff.server.admin.org_settings.circ.mark_lost_overdue_interval.desc;',
+ },
'circ.void_item_billing_on_lost_return' : {
label : '&staff.server.admin.org_settings.circ.void_item_billing_on_lost_return;',
desc : '&staff.server.admin.org_settings.circ.void_item_billing_on_lost_return.desc;',
More information about the open-ils-commits
mailing list