From 1402e2bd3a5ee18bb91b4f92cb49a65cb5d8fa26 Mon Sep 17 00:00:00 2001 From: phasefx Date: Tue, 30 Aug 2005 03:55:33 +0000 Subject: [PATCH] brief display data. misc. git-svn-id: svn://svn.open-ils.org/ILS/trunk@1761 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../chrome/content/evergreen/cat/brief.xul | 46 ++++++++++++++++++ .../chrome/content/evergreen/cat/details.xul | 48 ++++++++++++------- .../chrome/content/evergreen/cat/marc.js | 19 ++++---- .../chrome/content/evergreen/opac/opac.js | 9 +--- .../content/evergreen/util/spawn_win.js | 5 ++ 5 files changed, 95 insertions(+), 32 deletions(-) create mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/brief.xul diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/brief.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/brief.xul new file mode 100644 index 0000000000..387f768e8e --- /dev/null +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/brief.xul @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/details.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/details.xul index 01adef5edb..4509631122 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/details.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/details.xul @@ -25,21 +25,29 @@ function my_init() { chain_exec( + my_init_spawn_brief_view, my_init_spawn_marc_view, - my_init_spawn_marc_editor, my_init_spawn_copy_browser, + my_init_spawn_marc_editor, my_init_spawn_opac_view ); } + function my_init_spawn_brief_view() { + spawn_brief_view( + document, 'replace_iframe', 'brief_view', { + 'find_this_id' : find_this_id + } + ).find_this_id = find_this_id; + } + function my_init_spawn_marc_view() { var html = user_request( "open-ils.search", "open-ils.search.biblio.record.html", [ find_this_id ] )[0]; - dump('html = ' + html + '\n'); spawn_interface( document, 'replace_browser', 'marc_view', 'data:text/html,' + html, @@ -64,24 +72,32 @@ } function my_init_spawn_opac_view() { + dump('trying to spawn: ' + params.opac_url + '\n'); + spawn_interface( + document, 'replace_browser', 'opac_view', + params.opac_url, 'OPAC View', {} + ); } ]]> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/marc.js b/Evergreen/staff_client/chrome/content/evergreen/cat/marc.js index 13787a21b2..830fd8f510 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/marc.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/marc.js @@ -17,6 +17,7 @@ function my_init() { if (! params.import_tree ) { tree = retrieve_record( find_this_id ); + /* meta = retrieve_meta_record( find_this_id ); document.getElementById('meta_create_date').setAttribute('value', meta.create_date().split('.')[0] @@ -41,17 +42,19 @@ function my_init() { text ); } + */ } else { tree = params.import_tree; - if (tree.name() == 'collection') { - tree = find_list( - tree.children(), - function (obj) { - return (obj.name() == 'record'); - } - ); - } } + if (tree.name() == 'collection') { + tree = find_list( + tree.children(), + function (obj) { + return (obj.name() == 'record'); + } + ); + } + //mw.sdump('D_CAT','Retrieved: ' + js2JSON(tree) + '\n'); //mw.sdump('D_CAT','Retrieved: ' + js2JSON(meta) + '\n'); build_grid( diff --git a/Evergreen/staff_client/chrome/content/evergreen/opac/opac.js b/Evergreen/staff_client/chrome/content/evergreen/opac/opac.js index 6e24f7af58..6b2427f8a2 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/opac/opac.js +++ b/Evergreen/staff_client/chrome/content/evergreen/opac/opac.js @@ -69,13 +69,6 @@ function set_opac_vars(p) { p.opac_iframe.contentWindow.xulG = mw.G; p.opac_iframe.contentWindow.attachEvt("rresult", "recordDrawn", function(id,node){opac_make_details_page(p,id,node)}); - dump('p.opac_iframe = ' + p.opac_iframe + '\n'); - dump('p.opac_iframe.contentWindow = ' + p.opac_iframe.contentWindow + '\n'); - dump('p.opac_iframe.contentWindow = ' + p.opac_iframe.contentWindow + '\n'); - dump('p.opac_iframe.contentWindow.G = ' + p.opac_iframe.contentWindow.G + '\n'); - dump('p.opac_iframe.contentWindow.G.evt = ' + p.opac_iframe.contentWindow.G.evt + '\n'); - dump('p.opac_iframe.contentWindow.G.evt.rresult = ' + p.opac_iframe.contentWindow.G.evt.rresult + '\n'); - dump('p.opac_iframe.contentWindow.G.evt.rresult.recordDrawn = ' + p.opac_iframe.contentWindow.G.evt.rresult.recordDrawn + '\n'); p.opac_iframe.removeProgressListener(p.opac_progressListener); p.opac_iframe.addProgressListener(p.opac_progressListener, Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT ); @@ -88,7 +81,7 @@ function opac_make_details_page(p, id, node) { var f = function(ev) { spawn_record_details( p.w.app_shell, 'new_tab', 'main_tabbox', { - 'find_this_id' : id + 'find_this_id' : id, 'opac_url' : node.getAttribute('href') } ).find_this_id = id; ev.preventDefault(); 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 ebdd1c32e9..c2114ca280 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js @@ -151,6 +151,11 @@ function spawn_copy_browser(d,placement,place,passthru_params,clone) { return spawn_interface(d,placement,place,chrome,getString('copy_browser_interface_label'),passthru_params,clone); } +function spawn_brief_view(d,placement,place,passthru_params,clone) { + var chrome = 'chrome://evergreen/content/cat/brief.xul'; + return spawn_interface(d,placement,place,chrome,'BRIEF VIEW',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); -- 2.43.2