[open-ils-commits] [GIT] Evergreen ILS branch master updated. ad86ef5d3c689c9b514cc09bfc93e7f451461dc7
Evergreen Git
git at git.evergreen-ils.org
Thu Jun 6 15:50:04 EDT 2013
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 ad86ef5d3c689c9b514cc09bfc93e7f451461dc7 (commit)
from 96c877ea56afaf59927859eb63ad4ddd2172d0db (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 ad86ef5d3c689c9b514cc09bfc93e7f451461dc7
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Thu Mar 7 12:17:09 2013 +0200
Allow translating the staff client tab names
Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index f2fcb14..d611c41 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -3623,6 +3623,7 @@
<!ENTITY staff.printing.advanced.html_templates.warning.header "Also...">
<!ENTITY staff.printing.advanced.html_templates.warning.text "If using Receipt Templates with either the DOS LPT1 Print strategy or the Custom/External Print strategy (with "receipt.txt"), the client will try to translate any HTML markup to text, but this process may be imperfect, and for the best fidelity you should consider reworking your templates to be plain text if you are using a plain text print strategy. However, if using a plain text print strategy with HTML markup, you may include special character codes in 2-digit hexadecimal in a "hex" attribute for any given element. Such codes will be converted to actual characters and inserted at the place of the tag. For example, <p hex="0C">Hello World</p> will translate to form feed control character + Hello World. <p>Hello World</p hex="0C"> will translate to Hello World + form feed control character.">
<!ENTITY staff.client.portal.title "Evergreen Staff Client Portal">
+<!ENTITY staff.client.portal.tab_name "Portal">
<!ENTITY staff.client.portal.welcome "Welcome to Evergreen">
<!ENTITY staff.client.portal.circpatron "Circulation and Patrons">
<!ENTITY staff.client.portal.checkout "Check Out Items">
@@ -3632,6 +3633,8 @@
<!ENTITY staff.client.portal.checkin.description "Check In Items">
<!ENTITY staff.client.portal.patronreg "Register Patron(s)">
<!ENTITY staff.client.portal.patronreg.description "Register Patron(s)">
+<!ENTITY staff.client.portal.patronreg.tab_name "Register Patron">
+<!ENTITY staff.client.portal.patronreg_edit.tab_name "Editing Related Patron">
<!ENTITY staff.client.portal.patronsearch "Search For Patron By Name">
<!ENTITY staff.client.portal.patronsearch.description "Search For Patron By Name">
<!ENTITY staff.client.portal.holdlist "Pull List for Hold Requests">
@@ -3643,23 +3646,31 @@
<!ENTITY staff.client.portal.itemstatus.description "Item Status / Display">
<!ENTITY staff.client.portal.marcutil "MARC Batch Import / Export">
<!ENTITY staff.client.portal.marcutil.description "MARC Batch Import / Export">
+<!ENTITY staff.client.portal.marcutil.tab_name "Server Settings">
<!ENTITY staff.client.portal.z3950 "z39.50 Import">
<!ENTITY staff.client.portal.z3950.description "z39.50 Import">
<!ENTITY staff.client.portal.copybuckets "Copy Buckets">
<!ENTITY staff.client.portal.copybuckets.description "Copy Buckets">
<!ENTITY staff.client.portal.recordbuckets "Record Buckets">
<!ENTITY staff.client.portal.recordbuckets.description "Record Buckets">
+<!ENTITY staff.client.portal.recordbuckets.tab_name "Record Buckets">
<!ENTITY staff.client.portal.admin "Administration">
<!ENTITY staff.client.portal.helpdesk "Get Help with Evergreen">
<!ENTITY staff.client.portal.helpdesk.description "Submit A Helpdesk Ticket">
<!ENTITY staff.client.portal.reports "Reports">
<!ENTITY staff.client.portal.reports.description "Reports">
+<!ENTITY staff.client.portal.reports.tab_name "Reports">
<!ENTITY staff.client.portal.receipts "Edit Receipt Templates">
<!ENTITY staff.client.portal.receipts.description "Edit Receipt Templates">
<!ENTITY staff.client.portal.copyright "Copyright © 2006-2012 Georgia Public Library Service, and others">
<!ENTITY staff.client.portal.poweredby "Powered by">
<!ENTITY staff.client.portal.open_new_tab.description "Open in a new tab">
<!ENTITY staff.client.portal.search.button "Search">
+<!ENTITY staff.client.portal.address_map.tab_name "Locate Address In Map">
+<!ENTITY staff.client.portal.local_admin.tab_name "Local Administration">
+<!ENTITY staff.client.portal.on_shelf_pull_list.tab_name "On Shelf Pull List">
+<!ENTITY staff.client.portal.catalog.tab_name "Catalog">
+<!ENTITY staff.client.portal.copybuckets.tab_name "Copy Buckets">
<!ENTITY staff.item.batch.hold.groupbox_caption "Request Details">
<!ENTITY staff.item.batch.hold.hold_type_menu.label "Hold Type">
<!ENTITY staff.item.batch.hold.hold_type_menu.accesskey "T">
diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml
index dabaa56..4af4121 100644
--- a/Open-ILS/xul/staff_client/server/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/index.xhtml
@@ -15,7 +15,11 @@
<script type="text/javascript">
// <![CDATA[
- // FIXME - some I18N love still needed in this file. See @alt on img tags, and javascript for tab names
+ function get_i18n_str(id) {
+ var e = document.getElementById(id);
+ if (e) return e.textContent;
+ return "Error: i18n string not present: " + id;
+ }
function SearchOnBlur() {
var textbox = document.getElementById("quicksearch");
@@ -45,7 +49,7 @@
if (urls.opac_rresult.match(/\/eg\/opac\/results/)) {
opac_url = xulG.url_prefix('opac_rresult') + "?query=" + encodeURIComponent(textbox.value);
}
- var params = {'tab_name':'Catalog'};
+ var params = {'tab_name': get_i18n_str('staff.client.portal.catalog.tab_name') };
var content_params = { 'session' : ses(), 'authtime' : ses('authtime'), 'opac_url' : opac_url };
xulG.set_tab(urls.XUL_OPAC_WRAPPER, params, content_params);
}
@@ -90,7 +94,7 @@
data.stash_retrieve();
document.getElementById('staffname').innerHTML = ", " + data.list.au[0].first_given_name();
home_ou_id = data.list.au[0].ws_ou();
- xulG.set_tab_name('Portal');
+ xulG.set_tab_name(get_i18n_str('staff.client.portal.tab_name'));
}
function jb_open_eg_web_page(path, label) {
var loc = urls.XUL_BROWSER + '?url=' + window.escape(xulG.url_prefix('EG_WEB_BASE') + '/' + path);
@@ -120,7 +124,7 @@
//http://208.119.72.68/evergreen/evergreenmap.html
function address_map(newtab) {
loc = "http://maps.google.com";
- var params = {'tab_name':'Locate Address In Map'};
+ var params = {'tab_name':get_i18n_str('staff.client.portal.address_map.tab_name')};
if(newtab)
xulG.new_tab(loc, params, {});
@@ -129,7 +133,7 @@
}
function local_admin(newtab) {
var loc = urls.XUL_REMOTE_BROWSER + '?url=' + window.escape(urls.XUL_LOCAL_ADMIN + '?ses=' + window.escape(ses()) + '&session=' + window.escape(ses()));
- var params = {'tab_name':'Local Administration', 'browser' : true };
+ var params = {'tab_name': get_i18n_str('staff.client.portal.local_admin.tab_name') , 'browser' : true };
var content_params = { 'no_xulG' : false, 'show_nav_buttons' : true, 'show_print_button' : true };
if(newtab)
@@ -145,7 +149,7 @@
}
function hold_pull_list(newtab) {
var loc = urls.XUL_REMOTE_BROWSER + '?url=' + window.escape(urls.XUL_HOLD_PULL_LIST + '?ses=' + window.escape(ses()));
- var params = {'tab_name':'On Shelf Pull List'};
+ var params = {'tab_name': get_i18n_str('staff.client.portal.on_shelf_pull_list.tab_name') };
if(newtab)
xulG.new_tab(loc, params);
@@ -159,7 +163,7 @@
xulG.set_tab(urls.XUL_PATRON_BARCODE_ENTRY,{},{});
}
function catalog(newtab) {
- var params = {'tab_name':'Catalog'};
+ var params = {'tab_name': get_i18n_str('staff.client.portal.catalog.tab_name') };
var content_params = { 'session' : ses(), 'authtime' : ses('authtime') };
if(newtab)
@@ -174,14 +178,14 @@
xulG.set_tab(urls.XUL_Z3950_IMPORT,{},{});
}
function copy_buckets(newtab) {
- params = {'tab_name':'Copy Buckets'};
+ params = {'tab_name': get_i18n_str('staff.client.portal.copybuckets.tab_name') };
if(newtab)
xulG.new_tab(urls.XUL_COPY_BUCKETS, params, {});
else
xulG.set_tab(urls.XUL_COPY_BUCKETS, params, {});
}
function record_buckets(newtab) {
- params = {'tab_name':'Record Buckets'};
+ params = {'tab_name': get_i18n_str('staff.client.portal.recordbuckets.tab_name') };
if(newtab)
xulG.new_tab(urls.XUL_RECORD_BUCKETS, params, {});
else
@@ -200,14 +204,15 @@
xulG.set_tab(urls.XUL_CHECKIN,{},{});
}
function MARC_batch_import(newtab) {
+ var tabstr = get_i18n_str('staff.client.portal.marcutil.tab_name');
if(newtab)
- jb_open_eg_web_page_newtab('vandelay/vandelay', 'Server Settings');
+ jb_open_eg_web_page_newtab('vandelay/vandelay', tabstr );
else
- jb_open_eg_web_page('vandelay/vandelay', 'Server Settings');
+ jb_open_eg_web_page('vandelay/vandelay', tabstr );
}
function local_admin_reports(newtab) {
var loc = urls.XUL_BROWSER + '?url=' + window.escape( xulG.url_prefix('XUL_REPORTS') + '?ses=' + ses());
- params = {'tab_name' : 'Reports', 'browser' : false }
+ params = {'tab_name' : get_i18n_str('staff.client.portal.reports.tab_name') , 'browser' : false }
content_params = {'no_xulG' : false, 'show_print_button' : false, show_nav_buttons : true }
if(newtab)
xulG.new_tab(loc, params, content_params);
@@ -233,13 +238,13 @@
url += i + '=' + window.escape(p[i]);
}
var loc = urls.XUL_REMOTE_BROWSER + '?url=' + window.escape( url );
- xulG.new_tab(loc, {}, { 'show_print_button' : true , 'tab_name' : 'Editing Related Patron' , 'passthru_content_params' : {'spawn_search' : function(s) { spawn_search(s); }, 'spawn_editor' : spawn_editor }});
+ xulG.new_tab(loc, {}, { 'show_print_button' : true , 'tab_name' : get_i18n_str('staff.client.portal.patronreg_edit.tab_name') , 'passthru_content_params' : {'spawn_search' : function(s) { spawn_search(s); }, 'spawn_editor' : spawn_editor }});
}
var loc = urls.XUL_REMOTE_BROWSER + '?url=' + window.escape( urls.XUL_PATRON_EDIT + '?ses=' + window.escape( ses() ) );
var content_params = {
'show_print_button' : true ,
- 'tab_name' : 'Register Patron' ,
+ 'tab_name' : get_i18n_str('staff.client.portal.patronreg.tab_name') ,
'passthru_content_params' : { 'spawn_search' : function(s) { spawn_search(s); },
'spawn_editor' : spawn_editor }
}
@@ -545,6 +550,23 @@
<div class="attribution c1">&staff.client.portal.copyright;<br />
&staff.client.portal.poweredby; <img src="skin/media/images/portal/eg_tiny_logo.jpg" alt="Evergreen logo" /></div>
+
+<div style="display:none">
+ <span id="tpac_toggled_on">&staff.client.portal.toggle_tpac.message_on;</span>
+ <span id="tpac_toggled_off">&staff.client.portal.toggle_tpac.message_off;</span>
+ <span id="staff.client.portal.catalog.tab_name">&staff.client.portal.catalog.tab_name;</span>
+ <span id="staff.client.portal.tab_name">&staff.client.portal.tab_name;</span>
+ <span id="staff.client.portal.address_map.tab_name">&staff.client.portal.address_map.tab_name;</span>
+ <span id="staff.client.portal.local_admin.tab_name">&staff.client.portal.local_admin.tab_name;</span>
+ <span id="staff.client.portal.on_shelf_pull_list.tab_name">&staff.client.portal.on_shelf_pull_list.tab_name;</span>
+ <span id="staff.client.portal.catalog.tab_name">&staff.client.portal.catalog.tab_name;</span>
+ <span id="staff.client.portal.copybuckets.tab_name">&staff.client.portal.copybuckets.tab_name;</span>
+ <span id="staff.client.portal.recordbuckets.tab_name">&staff.client.portal.recordbuckets.tab_name;</span>
+ <span id="staff.client.portal.marcutil.tab_name">&staff.client.portal.marcutil.tab_name;</span>
+ <span id="staff.client.portal.reports.tab_name">&staff.client.portal.reports.tab_name;</span>
+ <span id="staff.client.portal.patronreg_edit.tab_name">&staff.client.portal.patronreg_edit.tab_name;</span>
+ <span id="staff.client.portal.patronreg.tab_name">&staff.client.portal.patronreg.tab_name;</span>
+</div>
</body>
</html>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/web/opac/locale/en-US/lang.dtd | 11 ++++++
Open-ILS/xul/staff_client/server/index.xhtml | 50 ++++++++++++++++++-------
2 files changed, 47 insertions(+), 14 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list