From bb344b27fea4a5b31c511b9a229db00a42be5419 Mon Sep 17 00:00:00 2001 From: phasefx Date: Sun, 17 Jul 2005 01:32:21 +0000 Subject: [PATCH] segregate stuff during this code migration git-svn-id: svn://svn.open-ils.org/ILS/trunk@1237 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../content/evergreen/main/app_shell_overlay.xul | 2 +- .../chrome/content/evergreen/util/spawn_win.js | 154 +++++++-------------- 2 files changed, 50 insertions(+), 106 deletions(-) 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 d84868eeeb..1b9908191f 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 @@ -67,7 +67,7 @@ mw.spawn_filter_console(document,'new_tab','main_tabbox',{}); "/> + mw.spawn_checkin(document,'new_tab','main_tabbox',{}); "/> 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 9a839a53c7..9d18d2a360 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js @@ -48,60 +48,29 @@ function spawn_interface(d,placement,place,chrome,label,passthru_params,clone) { return w; } -function spawn_batch_copy_editor(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/cat/copy_edit.xul'; - return spawn_interface(d,placement,place,chrome,getString('copies_editor_interface_label'),passthru_params,clone); -} - -function spawn_bill_pay(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/bill/bill.xul'; - return spawn_interface(d,placement,place,chrome,getString('bills_interface_label'),passthru_params,clone); -} - -function spawn_check_in(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/circ/checkin.xul'; - return spawn_interface(d,placement,place,chrome,getString('checkin_interface_label'),passthru_params,clone); -} - -function spawn_check_out(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/circ/checkout.xul'; - return spawn_interface(d,placement,place,chrome,getString('checkout_interface_label'),passthru_params,clone); -} +/* developer utilities */ -function spawn_circ_display(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/circ/circ_deck_patron.xul'; - return spawn_interface(d,placement,place,chrome,getString('display_patron_interface_label'),passthru_params,clone); -} - -function spawn_circ_tree(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/circ/circ_tree.xul'; - return spawn_interface(d,placement,place,chrome,'circ_tree',passthru_params,clone); -} - -function spawn_circ_list(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/circ/circ_list.xul'; - return spawn_interface(d,placement,place,chrome,getString('items_out_interface_label'),passthru_params,clone); +function spawn_javascript_console(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://global/content/console.xul'; + return spawn_interface(d,placement,place,chrome,getString('javascript_console_label'),passthru_params,clone); } -function spawn_circ_search(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/circ/circ_deck_search.xul'; - return spawn_interface(d,placement,place,chrome,getString('patron_search_interface_label'),passthru_params,clone); +function spawn_xuleditor(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://evergreen/content/util/xuledit.xul'; + return spawn_interface(d,placement,place,chrome,getString('xuleditor_label'),passthru_params,clone); } -function spawn_clamshell(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/main/clam_shell.xul'; - return spawn_interface(d,placement,place,chrome,'clamshell',passthru_params,clone); +function spawn_javascript_shell(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://evergreen/content/util/shell.html'; + return spawn_interface(d,placement,place,chrome,getString('javascript_shell_label'),passthru_params,clone); } -function spawn_clamshell_vertical(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/main/clam_shell_vertical.xul'; - return spawn_interface(d,placement,place,chrome,'clamshell',passthru_params,clone); +function spawn_filter_console(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://evergreen/content/util/filter_console.xul'; + return spawn_interface(d,placement,place,chrome,getString('filter_console_label'),passthru_params,clone); } -function spawn_copy_browser(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/cat/browse_list.xul'; - return spawn_interface(d,placement,place,chrome,getString('copy_browser_interface_label'),passthru_params,clone); -} +/* current */ function spawn_main() { sdump('D_SPAWN','trying to spawn app_shell\n'); @@ -116,15 +85,12 @@ function spawn_main() { } } catch(E) { dump(js2JSON(E)+'\n'); - //incr_progressmeter('auth_meter',-100); - //alert('Login failed on new_window: ' + js2JSON(E)); enable_login_prompts(); return; } - //incr_progressmeter('auth_meter',100); } -function spawn_marc_editor(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/cat/marc.xul'; - return spawn_interface(d,placement,place,chrome,getString('marc_editor_interface_label'),passthru_params,clone); +function spawn_checkin(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://evergreen/content/circ/checkin.xul'; + return spawn_interface(d,placement,place,chrome,getString('checkin_interface_label'),passthru_params,clone); } function spawn_opac_navigator(d,placement,place,passthru_params,clone) { @@ -133,6 +99,38 @@ function spawn_opac_navigator(d,placement,place,passthru_params,clone) { return spawn_interface(d,placement,place,chrome,getString('opac_navigator_interface_label'),passthru_params,clone); } +function spawn_patron_display(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://evergreen/content/patron/patron_display.xul'; + return spawn_interface(d,placement,place,chrome,getString('patron_display_interface_label'),passthru_params,clone); +} + +function spawn_patron_search(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://evergreen/content/patron/patron_search.xul'; + return spawn_interface(d,placement,place,chrome,getString('patron_search_interface_label'),passthru_params,clone); +} + +/* legacy code, may be removed or refactored */ + +function spawn_batch_copy_editor(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://evergreen/content/cat/copy_edit.xul'; + return spawn_interface(d,placement,place,chrome,getString('copies_editor_interface_label'),passthru_params,clone); +} + +function spawn_bill_pay(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://evergreen/content/bill/bill.xul'; + return spawn_interface(d,placement,place,chrome,getString('bills_interface_label'),passthru_params,clone); +} + +function spawn_copy_browser(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://evergreen/content/cat/browse_list.xul'; + return spawn_interface(d,placement,place,chrome,getString('copy_browser_interface_label'),passthru_params,clone); +} + +function spawn_marc_editor(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://evergreen/content/cat/marc.xul'; + return spawn_interface(d,placement,place,chrome,getString('marc_editor_interface_label'),passthru_params,clone); +} + function spawn_oclc_import(d,placement,place,passthru_params,clone) { sdump('D_SPAWN','trying to spawn_oclc_import('+js2JSON(passthru_params)+')\n'); // sample TCN: 03715963 @@ -160,26 +158,6 @@ function spawn_oclc_import(d,placement,place,passthru_params,clone) { } } -function spawn_paged_tree(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/main/paged_tree.xul'; - return spawn_interface(d,placement,place,chrome,'paged_tree',passthru_params,clone); -} - -function spawn_patron_display(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/patron/patron_display.xul'; - return spawn_interface(d,placement,place,chrome,getString('patron_display_interface_label'),passthru_params,clone); -} - -function spawn_patron_display_status(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/patron/patron_display_status.xul'; - return spawn_interface(d,placement,place,chrome,getString('patron_display_interface_label'),passthru_params,clone); -} - -function spawn_patron_display_contact(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/patron/patron_display_contact.xul'; - return spawn_interface(d,placement,place,chrome,getString('patron_display_interface_label'),passthru_params,clone); -} - function spawn_patron_edit(d,placement,place,passthru_params,clone) { var chrome = 'chrome://evergreen/content/patron/patron_edit.xul'; return spawn_interface(d,placement,place,chrome,getString('patron_editor_interface_label'),passthru_params,clone); @@ -190,21 +168,6 @@ function spawn_patron_register(d,placement,place,passthru_params,clone) { return spawn_interface(d,placement,place,chrome,getString('patron_register_interface_label'),passthru_params,clone); } -function spawn_patron_search(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/patron/patron_search.xul'; - return spawn_interface(d,placement,place,chrome,getString('patron_search_interface_label'),passthru_params,clone); -} - -function spawn_patron_search_form(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/patron/patron_search_form.xul'; - return spawn_interface(d,placement,place,chrome,getString('patron_search_interface_label'),passthru_params,clone); -} - -function spawn_patron_search_results(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/patron/patron_search_results.xul'; - return spawn_interface(d,placement,place,chrome,getString('patron_search_interface_label'),passthru_params,clone); -} - function spawn_copy_stat_cat_edit(d,placement,place,passthru_params,clone) { var chrome = 'chrome://evergreen/content/stat_cat/copy_stat_cat_editor.xul'; return spawn_interface(d,placement,place,chrome,getString('copy_stat_cat_editor_interface'),passthru_params,clone); @@ -220,28 +183,9 @@ function spawn_survey_admin_wizard(d,placement,place,passthru_params,clone) { return spawn_interface(d,placement,place,chrome,getString('survey_admin_interface_label'),passthru_params,clone); } - function spawn_z3950_import(d,placement,place,passthru_params,clone) { var chrome = 'chrome://evergreen/content/z39_50/z39_50.xul'; return spawn_interface(d,placement,place,chrome,getString('z39_50_import_interface_label'),passthru_params,clone); } -function spawn_javascript_console(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://global/content/console.xul'; - return spawn_interface(d,placement,place,chrome,getString('javascript_console_label'),passthru_params,clone); -} - -function spawn_xuleditor(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/util/xuledit.xul'; - return spawn_interface(d,placement,place,chrome,getString('xuleditor_label'),passthru_params,clone); -} - -function spawn_javascript_shell(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/util/shell.html'; - return spawn_interface(d,placement,place,chrome,getString('javascript_shell_label'),passthru_params,clone); -} -function spawn_filter_console(d,placement,place,passthru_params,clone) { - var chrome = 'chrome://evergreen/content/util/filter_console.xul'; - return spawn_interface(d,placement,place,chrome,getString('filter_console_label'),passthru_params,clone); -} -- 2.11.0