From: phasefx Date: Wed, 4 Mar 2009 22:39:53 +0000 (+0000) Subject: optional button bar between top-level menu and tabbed interfaces X-Git-Tag: sprint4-merge-nov22~10614 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2d1e33b63816199496b4d488a10b0b82ea4e82e5;p=working%2FEvergreen.git optional button bar between top-level menu and tabbed interfaces git-svn-id: svn://svn.open-ils.org/ILS/trunk@12409 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index 96262d8565..53f8888a7d 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -587,6 +587,16 @@ + + + + + + + + + + @@ -636,6 +646,8 @@ + + @@ -2666,5 +2678,7 @@ - + + + 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 996058f840..f24e3d6401 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js +++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js @@ -54,6 +54,12 @@ main.menu.prototype = { 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 @@ main.menu.prototype = { } ], + 'cmd_toggle_buttonbar' : [ + ['oncommand'], + function() { + var x = document.getElementById('main_toolbar'); + if (x) x.hidden = ! x.hidden; + } + ], + 'cmd_open_vandelay' : [ ['oncommand'], function() { diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul index b12c99d4c7..4bd6fe5bdb 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul +++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul @@ -54,6 +54,7 @@ + @@ -99,7 +100,6 @@ - @@ -206,6 +206,7 @@ + diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul index ccf591e2a0..7f76a97d0b 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul +++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul @@ -75,6 +75,34 @@ + diff --git a/Open-ILS/xul/staff_client/chrome/skin/media/images/Arrow-rightup-small.png b/Open-ILS/xul/staff_client/chrome/skin/media/images/Arrow-rightup-small.png new file mode 100644 index 0000000000..d09eebcec0 Binary files /dev/null and b/Open-ILS/xul/staff_client/chrome/skin/media/images/Arrow-rightup-small.png differ diff --git a/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_famiglia_32x32.png b/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_famiglia_32x32.png new file mode 100644 index 0000000000..a48e54cf65 Binary files /dev/null and b/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_famiglia_32x32.png differ diff --git a/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_indici_32x32.png b/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_indici_32x32.png new file mode 100644 index 0000000000..c3009d7037 Binary files /dev/null and b/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_indici_32x32.png differ diff --git a/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_lente_32x32.png b/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_lente_32x32.png new file mode 100644 index 0000000000..3452dee62b Binary files /dev/null and b/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_lente_32x32.png differ diff --git a/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_libro_32x32.png b/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_libro_32x32.png new file mode 100644 index 0000000000..90a82b8485 Binary files /dev/null and b/Open-ILS/xul/staff_client/chrome/skin/media/images/HILLBLU_libro_32x32.png differ diff --git a/Open-ILS/xul/staff_client/chrome/skin/media/images/center.png b/Open-ILS/xul/staff_client/chrome/skin/media/images/center.png new file mode 100644 index 0000000000..230a35c517 Binary files /dev/null and b/Open-ILS/xul/staff_client/chrome/skin/media/images/center.png differ diff --git a/Open-ILS/xul/staff_client/chrome/skin/media/images/licenses.txt b/Open-ILS/xul/staff_client/chrome/skin/media/images/licenses.txt new file mode 100644 index 0000000000..ba77bf8610 --- /dev/null +++ b/Open-ILS/xul/staff_client/chrome/skin/media/images/licenses.txt @@ -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". + + diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml index 2ac8677d46..99da18ec48 100644 --- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml @@ -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;',