From 1f966df13826356c79fcae14580459e30121ae33 Mon Sep 17 00:00:00 2001 From: phasefx Date: Tue, 21 Jun 2005 14:27:29 +0000 Subject: [PATCH] some refactor and localization git-svn-id: svn://svn.open-ils.org/ILS/trunk@885 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../evergreen/Open-ILS/OpenILS_overlay.xul | 25 ++- .../Open-ILS/OpenILS_scripts_overlay.xul | 13 ++ .../evergreen/OpenSRF/OpenSRF_overlay.xul | 1 + .../chrome/content/evergreen/auth/auth.xul | 12 +- .../content/evergreen/auth/auth_overlay.xul | 4 +- .../content/evergreen/main/app_shell.js | 2 + .../content/evergreen/main/app_shell.xul | 3 - .../evergreen/main/app_shell_overlay.xul | 37 ++-- .../content/evergreen/util/spawn_win.js | 173 ++++++++---------- .../chrome/content/evergreen/util/util.js | 30 +++ .../content/evergreen/util/util_overlay.xul | 1 + .../locale/en-US/evergreen/OpenILS.properties | 17 ++ .../locale/en-US/evergreen/app_shell.dtd | 72 ++++++++ 13 files changed, 252 insertions(+), 138 deletions(-) create mode 100644 Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul create mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul index 0519953908..97f636b517 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul @@ -1,12 +1,27 @@ - - - + + + + + + + + + + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul new file mode 100644 index 0000000000..c9925fc7b4 --- /dev/null +++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul @@ -0,0 +1,13 @@ + + + + + + + - + + - + diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul index fba4b5fc64..a9eb2cde5d 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul @@ -6,11 +6,11 @@ + diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.js b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.js index 7d6065d745..7bc2edc619 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.js +++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.js @@ -1,3 +1,5 @@ +sdump('D_TRACE','Loading util.js\n'); + var tab_count = [ false, false, false, false, false, false, false, false, false, false ]; function app_shell_init() { diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul index 35263e2184..5e3cd93acd 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul @@ -10,9 +10,6 @@ onload="mw.OpenILS_init('AppShell');" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - - diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul index fd2cb69505..829e32e0a6 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul @@ -6,70 +6,67 @@ + window.close();" /> + spawn_main_window();" /> + new_tab(document,'main_tabbox');" /> + close_tab(document,'main_tabbox');" /> + spawn_opac_navigator(document,'replace',{}); "/> + spawn_check_out(document,'replace',{}); "/> + spawn_circ_search(document,'replace',{}); "/> + spawn_circ_display(document,'replace',{}); "/> + spawn_check_in(document,'replace',{}); "/> + spawn_opac_navigator(document,'replace',{}); "/> + spawn_patron_register(document,'replace',{}); "/> + spawn_survey_admin_wizard(document,false,{}); "/> + spawn_copy_stat_cat_edit(document,'replace',{}); "/> + spawn_patron_stat_cat_edit(document,'replace',{}); "/> + spawn_z3950_import(document,'replace',{}); "/> - - - + - + diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js index fa048a761d..4002bc229a 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js @@ -1,71 +1,53 @@ -function spawn_batch_copy_editor(d,tab,params) { - sdump('D_SPAWN','trying to spawn_copy_editor(' + params + ')'); +function spawn_interface(d,tab_flag,tabbox,chrome,label,passthru_params) { + sdump('D_SPAWN','trying to spawn_window('+d+','+tab_flag+','+tabbox+','+chrome+','+label+','+js2JSON(passthru_params)+')\n'); var w; - var chrome = 'chrome://evergreen/content/cat/copy_edit.xul'; - if (tab) { - if (tab != 'replace') { new_tab(d,'main_tabbox'); } - w = replace_tab(d,'main_tabbox','COPIES EDITOR',chrome); + if (tab_flag) { + if (tab != 'replace') { new_tab(d,tabbox); } + w = replace_tab(d,tabbox,label,chrome); } else { - w = mw.new_window( chrome ); + w = new_window( chrome ); } w.params = params; } -function spawn_bill_pay(d,tab,patron,params) { - sdump('D_SPAWN','trying to spawn_bill_pay('+js2JSON(patron)+')\n'); - sdump('D_SPAWN','barcode: ' + patron.barcode() + '\n'); - var w; +function spawn_batch_copy_editor(d,tab_flag,passthru_params) { + var chrome = 'chrome://evergreen/content/cat/copy_edit.xul'; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('copies_editor_interface_label'),passthru_params); +} + +function spawn_bill_pay(d,tab_flag,passthru_params) { var chrome = 'chrome://evergreen/content/bill/bill.xul'; - var params = { 'barcode' : patron.barcode() }; - if (tab) { - if (tab != 'replace') { new_tab(d,'main_tabbox'); } - w = replace_tab(d,'main_tabbox','BILLS',chrome,params); - } else { - w = mw.new_window( chrome,params ); - } + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('bills_interface_label'),passthru_params); } -function spawn_check_out(d,tab,patron,params) { - sdump('D_SPAWN','trying to spawn_check_out('+js2JSON(patron)+')\n'); - sdump('D_SPAWN','barcode: ' + patron.barcode() + '\n'); - var w; +function spawn_check_in(d,tab_flag,passthru_params) { + var chrome = 'chrome://evergreen/content/circ/checkin.xul'; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('checkin_interface_label'),passthru_params); +} + +function spawn_check_out(d,tab_flag,passthru_params) { var chrome = 'chrome://evergreen/content/circ/checkout.xul'; - var params = { 'barcode' : patron.barcode() }; - if (tab) { - if (tab != 'replace') { new_tab(d,'main_tabbox'); } - w = replace_tab(d,'main_tabbox','CHECK OUT',chrome,params); - } else { - w = mw.new_window( chrome,params ); - } + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('checkout_interface_label'),passthru_params); } -function spawn_circ_list(d,tab,patron,params) { - sdump('D_SPAWN','trying to spawn_circ_list('+js2JSON(patron)+')\n'); - sdump('D_SPAWN','barcode: ' + patron.barcode() + '\n'); - var w; +function spawn_circ_display(d,tab_flag,passthru_params) { + var chrome = 'chrome://evergreen/content/circ/circ_deck_patron.xul'; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('display_patron_interface_label'),passthru_params); +} + +function spawn_circ_list(d,tab_flag,passthru_params) { var chrome = 'chrome://evergreen/content/circ/circ_list.xul'; - var params = { 'barcode' : patron.barcode() }; - if (tab) { - if (tab != 'replace') { new_tab(d,'main_tabbox'); } - w = replace_tab(d,'main_tabbox','ITEMS OUT',chrome,params); - } else { - w = mw.new_window( chrome,params ); - } + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('items_out_interface_label'),passthru_params); } +function spawn_circ_search(d,tab_flag,passthru_params) { + var chrome = 'chrome://evergreen/content/circ/circ_deck_search.xul'; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('patron_search_interface_label'),passthru_params); +} -function spawn_copy_browser(d,tab,params) { - sdump('D_SPAWN','trying to spawn_copy_browser('+js2JSON(params)+')\n'); - var w; +function spawn_copy_browser(d,tab_flag,passthru_params) { var chrome = 'chrome://evergreen/content/cat/browse_list.xul'; - if (tab) { - if (tab != 'replace') { new_tab(d,'main_tabbox'); } - w = replace_tab(d,'main_tabbox','COPIES',chrome); - } else { - w = mw.new_window( chrome ); - } - w.find_this_id = params[0]; - w.record_columns = params; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('copy_browser_interface_label'),passthru_params); } function spawn_main() { @@ -73,35 +55,29 @@ function spawn_main() { var w = new_window('chrome://evergreen/content/evergreen/main/app_shell.xul'); if (!w) { throw('window ref == null'); } try { - w.document.title = mw.G.user.usrname() + '@' + mw.G.user_ou.name(); + w.document.title = G.user.usrname() + '@' + G.user_ou.name(); } catch(E) { alert('Hrmm. ' + pretty_print( js2JSON(E) ) ); } } catch(E) { - incr_progressmeter('auth_meter',-100); - alert('Login failed on new_window: ' + js2JSON(E)); enable_login_prompts(); return; + //incr_progressmeter('auth_meter',-100); + //alert('Login failed on new_window: ' + js2JSON(E)); enable_login_prompts(); return; } - incr_progressmeter('auth_meter',100); + //incr_progressmeter('auth_meter',100); } - -function spawn_marc_editor(d,tab,params) { - sdump('D_SPAWN','trying to spawn_marc_editor('+js2JSON(params)+')\n'); - var w; +function spawn_marc_editor(d,tab_flag,passthru_params) { var chrome = 'chrome://evergreen/content/cat/marc.xul'; - if (tab) { - if (tab != 'replace') { new_tab(d,'main_tabbox'); } - w = replace_tab(d,'main_tabbox','MARC',chrome); - } else { - w = mw.new_window( chrome ); - } - w.find_this_id = params[0]; - w.record_columns = params; - w.params = params; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('marc_editor_interface_label'),passthru_params); } -function spawn_oclc_import(d,tab,params) { - sdump('D_SPAWN','trying to spawn_marc_editor('+js2JSON(params)+')\n'); +function spawn_opac_navigator(d,tab_flag,passthru_params) { + var chrome = 'chrome://evergreen/content/opac/opac.xul'; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('opac_navigator_interface_label'),passthru_params); +} + +function spawn_oclc_import(d,tab_flag,params) { + sdump('D_SPAWN','trying to spawn_oclc_import('+js2JSON(passthru_params)+')\n'); // sample TCN: 03715963 try { if (params.tcn.length < 6) { @@ -110,7 +86,7 @@ function spawn_oclc_import(d,tab,params) { var result = user_request( 'open-ils.search', 'open-ils.search.z3950.import', - [ mw.G.auth_ses[0], params.tcn ] + [ G.auth_ses[0], params.tcn ] )[0]; if (typeof result == 'object') { if (result.records.length > 0) { @@ -121,42 +97,41 @@ function spawn_oclc_import(d,tab,params) { } else { throw('result: ' + js2JSON(result) + '\n'); } - var w; - var chrome = 'chrome://evergreen/content/cat/marc.xul'; - if (tab) { - if (tab != 'replace') { new_tab(d,'main_tabbox'); } - w = replace_tab(d,'main_tabbox','MARC',chrome); - } else { - w = mw.new_window( chrome ); - } - w.params = params; - w.find_this_id = -1; - //w.record_columns = params; - + spawn_marc_editor(d,tab_flag,params); } catch(E) { handle_error(E); } - } -function spawn_patron_edit(d,tab,patron,params) { - sdump('D_SPAWN','trying to spawn_patron_edit('+js2JSON(patron)+')\n'); - sdump('D_SPAWN','barcode: ' + patron.barcode() + '\n'); - var w; +function spawn_patron_edit(d,tab_flag,passthru_params) { var chrome = 'chrome://evergreen/content/patron/patron_edit.xul'; - var params = { 'barcode' : patron.barcode() }; - if (tab) { - if (tab != 'replace') { new_tab(d,'main_tabbox'); } - w = replace_tab(d,'main_tabbox','PATRON EDIT',chrome,params); - } else { - w = mw.new_window( chrome, params ); - } + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('patron_editor_interface_label'),passthru_params); } -function spawn_test(d) { - var chrome = 'chrome://evergreen/content/patron/patron_edit.xul'; - var params = { 'barcode':'101010101010101' }; - var w = replace_tab(d,'main_tabbox','TEST',chrome,params); +function spawn_patron_register(d,tab_flag,passthru_params) { + var chrome = 'chrome://evergreen/content/patron/patron_new.xul'; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('patron_register_interface_label'),passthru_params); +} + + +function spawn_copy_stat_cat_edit(d,tab_flag,passthru_params) { + var chrome = 'chrome://evergreen/content/stat_cat/copy_stat_cat_editor.xul'; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('copy_stat_cat_editor_interface'),passthru_params); } +function spawn_patron_stat_cat_edit(d,tab_flag,passthru_params) { + var chrome = 'chrome://evergreen/content/stat_cat/patron_stat_cat_editor.xul'; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('patron_stat_cat_editor_interface'),passthru_params); +} + +function spawn_survey_admin_wizard(d,tab_flag,passthru_params) { + var chrome = 'chrome://evergreen/content/survey/survey_wizard.xul'; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('survey_admin_interface_label'),passthru_params); +} + + +function spawn_z3950_import(d,tab_flag,passthru_params) { + var chrome = 'chrome://evergreen/content/z39_50/z39_50.xul'; + spawn_interface(d,tab_flag,'main_tabbox',chrome,getString('z39_50_import_interface_label'),passthru_params); +} diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/util.js b/Evergreen/staff_client/chrome/content/evergreen/util/util.js index 876d9fe718..6a8d5262e9 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/util.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/util.js @@ -3,6 +3,36 @@ sdump('D_TRACE','Loading util.js\n'); var timer = {}; var counter = {}; +function getString( key ) { + var bundles = document.getElementById('string_bundles'); + for (var i = i; i < bundles.childNodes.length; i++) { + var bundle = bundles[i]; + try { + + var string = bundle.getString( key ); + if (string) + return string; + + } catch(E) { + } + } +} + +function getFormattedString( key, strArray ) { + var bundles = document.getElementById('string_bundles'); + for (var i = i; i < bundles.childNodes.length; i++) { + var bundle = bundles[i]; + try { + + var string = bundle.getFormattedString( key, strArray ); + if (string) + return string; + + } catch(E) { + } + } +} + function string_to_array(s) { var my_array = []; for (var i = 0; i < s.length; i++ ) { diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul index 015944b1f2..0a6ddfaa33 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul @@ -8,6 +8,7 @@