From 3b9cc9ee3ced5e2dfd0d191d6d86cc0e521750cc Mon Sep 17 00:00:00 2001 From: phasefx Date: Fri, 1 Jul 2005 02:49:34 +0000 Subject: [PATCH] patron search git-svn-id: svn://svn.open-ils.org/ILS/trunk@1019 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../content/evergreen/main/app_shell_overlay.xul | 2 +- .../content/evergreen/patron/patron_search.js | 32 +++++++++++++ .../content/evergreen/patron/patron_search.xul | 32 +++++++++++++ .../evergreen/patron/patron_search_overlay.xul | 22 +++++++++ .../chrome/content/evergreen/util/error.js | 13 +++--- .../chrome/content/evergreen/util/spawn_win.js | 53 ++++++++++++++-------- .../locale/en-US/evergreen/OpenILS.properties | 1 + .../locale/en-US/evergreen/patron_search.dtd | 1 + .../chrome/skin/evergreen/patron_search.css | 3 ++ 9 files changed, 133 insertions(+), 26 deletions(-) create mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js create mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.xul create mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul create mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/patron_search.dtd create mode 100644 Evergreen/staff_client/chrome/skin/evergreen/patron_search.css 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 8e7b334ed0..3e862147eb 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 @@ -26,7 +26,7 @@ mw.spawn_check_out(document,'replace_tab','main_tabbox',{}); "/> + mw.spawn_patron_search(document,'replace_tab','main_tabbox',{}); "/> diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js new file mode 100644 index 0000000000..71845019ed --- /dev/null +++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js @@ -0,0 +1,32 @@ +sdump('D_TRACE','Loading patron_search.js\n'); + +var test_variable = false; + +function patron_search_init(p) { + dump("TESTING: patron_search.js: " + mw.G['main_test_variable'] + '\n'); + + var clamshell = spawn_clamshell( + p.w.document, 'new_iframe', p.clamshell, { + + 'onload' : function (w) { + var form = spawn_patron_search_form( + w.document, + 'new_iframe', + w.first_deck, { + 'onload' : function(w2) { + w2.register_search_callback( + function (ev) { + alert('Submitted: ' + + js2JSON(form.crazy_search_hash) + '\n'); + test_variable = true; }); + + w.new_card_in_second_deck( + 'chrome://evergreen/content/main/about.xul', {}); + } + } + ); + + } + } + ); +} diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.xul new file mode 100644 index 0000000000..2c43672277 --- /dev/null +++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.xul @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul new file mode 100644 index 0000000000..16b5874037 --- /dev/null +++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/error.js b/Evergreen/staff_client/chrome/content/evergreen/util/error.js index 0e20b4a806..5debb90cf9 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/error.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/error.js @@ -6,19 +6,20 @@ var sdump_levels = { 'D_UTIL' : false, 'D_EXPLODE' : false, 'D_PRINT' : false, - 'D_SES' : true, + 'D_SES' : false, 'D_SPAWN' : true, - 'D_TAB' : true, + 'D_TAB' : false, 'D_OPAC' : true, - 'D_STRING' : true, - 'D_WIN' : true, + 'D_STRING' : false, + 'D_WIN' : false, + 'D_PATRON_SEARCH' : true, 'D_PATRON_SEARCH_FORM' : true }; function sdump(level,msg) { try { if (sdump_levels[level]) - debug(msg); + debug(level + ': ' + msg); } catch(E) {} } @@ -35,7 +36,7 @@ function arg_dump(args,dump_these) { if (dump_these[i]) { var arg = args[i]; - dump('dump_these[i] = ' + dump_these[i] + ' arg = ' + arg + '\n'); + //dump('dump_these[i] = ' + dump_these[i] + ' arg = ' + arg + '\n'); if (typeof(dump_these[i])=='string') { 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 7373c2ee99..5a003cb5b6 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js @@ -26,6 +26,7 @@ function spawn_interface(d,placement,place,chrome,label,passthru_params) { case 'new_editor' : var el = placement.slice(4); var frame = d.createElement( el ); + frame.setAttribute('flex','1'); get_widget( d, place ).appendChild( frame ); w = spawn_interface(d,'set_frame',frame,chrome,label,passthru_params); break; @@ -42,42 +43,47 @@ function spawn_interface(d,placement,place,chrome,label,passthru_params) { function spawn_batch_copy_editor(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/cat/copy_edit.xul'; - spawn_interface(d,placement,place,chrome,getString('copies_editor_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('copies_editor_interface_label'),passthru_params); } function spawn_bill_pay(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/bill/bill.xul'; - spawn_interface(d,placement,place,chrome,getString('bills_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('bills_interface_label'),passthru_params); } function spawn_check_in(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/circ/checkin.xul'; - spawn_interface(d,placement,place,chrome,getString('checkin_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('checkin_interface_label'),passthru_params); } function spawn_check_out(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/circ/checkout.xul'; - spawn_interface(d,placement,place,chrome,getString('checkout_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('checkout_interface_label'),passthru_params); } function spawn_circ_display(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/circ/circ_deck_patron.xul'; - spawn_interface(d,placement,place,chrome,getString('display_patron_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('display_patron_interface_label'),passthru_params); } function spawn_circ_list(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/circ/circ_list.xul'; - spawn_interface(d,placement,place,chrome,getString('items_out_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('items_out_interface_label'),passthru_params); } function spawn_circ_search(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/circ/circ_deck_search.xul'; - spawn_interface(d,placement,place,chrome,getString('patron_search_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('patron_search_interface_label'),passthru_params); +} + +function spawn_clamshell(d,placement,place,passthru_params) { + var chrome = 'chrome://evergreen/content/main/clam_shell.xul'; + return spawn_interface(d,placement,place,chrome,'clamshell',passthru_params); } function spawn_copy_browser(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/cat/browse_list.xul'; - spawn_interface(d,placement,place,chrome,getString('copy_browser_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('copy_browser_interface_label'),passthru_params); } function spawn_main() { @@ -101,13 +107,13 @@ function spawn_main() { function spawn_marc_editor(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/cat/marc.xul'; - spawn_interface(d,placement,place,chrome,getString('marc_editor_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('marc_editor_interface_label'),passthru_params); } function spawn_opac_navigator(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/opac/opac.xul'; //var chrome = 'http://google.com/'; - spawn_interface(d,placement,place,chrome,getString('opac_navigator_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('opac_navigator_interface_label'),passthru_params); } function spawn_oclc_import(d,placement,place,params) { @@ -139,47 +145,56 @@ function spawn_oclc_import(d,placement,place,params) { function spawn_patron_edit(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/patron/patron_edit.xul'; - spawn_interface(d,placement,place,chrome,getString('patron_editor_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('patron_editor_interface_label'),passthru_params); } function spawn_patron_register(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/patron/patron_new.xul'; - spawn_interface(d,placement,place,chrome,getString('patron_register_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('patron_register_interface_label'),passthru_params); } +function spawn_patron_search(d,placement,place,passthru_params) { + var chrome = 'chrome://evergreen/content/patron/patron_search.xul'; + return spawn_interface(d,placement,place,chrome,getString('patron_interface_label'),passthru_params); +} + +function spawn_patron_search_form(d,placement,place,passthru_params) { + var chrome = 'chrome://evergreen/content/patron/patron_search_form.xul'; + return spawn_interface(d,placement,place,chrome,getString('patron_search_interface_label'),passthru_params); +} function spawn_copy_stat_cat_edit(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/stat_cat/copy_stat_cat_editor.xul'; - spawn_interface(d,placement,place,chrome,getString('copy_stat_cat_editor_interface'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('copy_stat_cat_editor_interface'),passthru_params); } function spawn_patron_stat_cat_edit(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/stat_cat/patron_stat_cat_editor.xul'; - spawn_interface(d,placement,place,chrome,getString('patron_stat_cat_editor_interface'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('patron_stat_cat_editor_interface'),passthru_params); } function spawn_survey_admin_wizard(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/survey/survey_wizard.xul'; - spawn_interface(d,placement,place,chrome,getString('survey_admin_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('survey_admin_interface_label'),passthru_params); } function spawn_z3950_import(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/z39_50/z39_50.xul'; - spawn_interface(d,placement,place,chrome,getString('z39_50_import_interface_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('z39_50_import_interface_label'),passthru_params); } function spawn_javascript_console(d,placement,place,passthru_params) { var chrome = 'chrome://global/cotnent/console.xul'; - spawn_interface(d,placement,place,chrome,getString('javascript_console_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('javascript_console_label'),passthru_params); } function spawn_xuleditor(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/util/xuledit.xul'; - spawn_interface(d,placement,place,chrome,getString('xuleditor_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('xuleditor_label'),passthru_params); } function spawn_javascript_shell(d,placement,place,passthru_params) { var chrome = 'chrome://evergreen/content/util/shell.html'; - spawn_interface(d,placement,place,chrome,getString('javascript_shell_label'),passthru_params); + return spawn_interface(d,placement,place,chrome,getString('javascript_shell_label'),passthru_params); } diff --git a/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties b/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties index ce2dd3516a..b16ec784dd 100644 --- a/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties +++ b/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties @@ -10,6 +10,7 @@ opac_navigator_interface_label=CATALOG NAVIGATOR patron_editor_interface_label=PATRON EDIT patron_search_interface_label=PATRON SEARCH patron_register_interface_label=NEW PATRON +patron_interface_label=PATRON survey_admin_interface_label=SURVEY ADMIN copy_stat_cat_editor_interface_label=COPY STAT-CATS patron_stat_cat_editor_interface_label=PATRON STAT-CATS diff --git a/Evergreen/staff_client/chrome/locale/en-US/evergreen/patron_search.dtd b/Evergreen/staff_client/chrome/locale/en-US/evergreen/patron_search.dtd new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/Evergreen/staff_client/chrome/locale/en-US/evergreen/patron_search.dtd @@ -0,0 +1 @@ + diff --git a/Evergreen/staff_client/chrome/skin/evergreen/patron_search.css b/Evergreen/staff_client/chrome/skin/evergreen/patron_search.css new file mode 100644 index 0000000000..19db78ef40 --- /dev/null +++ b/Evergreen/staff_client/chrome/skin/evergreen/patron_search.css @@ -0,0 +1,3 @@ +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/TR/REC-html40"); + -- 2.11.0