From 4af0667611ba84e2d312da5c96a1c5f12c7369bc Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 15 Dec 2010 10:28:50 -0500 Subject: [PATCH] more js_common imports; started work on body.xml --- Open-ILS/web/opac/skin/kcls/xml/body.xml | 165 ++------------------- .../web/opac/skin/kcls/xml/common/js_common.xml | 49 +++--- .../skin/kcls/xml/common/js_common_postbody.xml | 32 +++- 3 files changed, 73 insertions(+), 173 deletions(-) diff --git a/Open-ILS/web/opac/skin/kcls/xml/body.xml b/Open-ILS/web/opac/skin/kcls/xml/body.xml index 505ba5ee07..1b761aa677 100644 --- a/Open-ILS/web/opac/skin/kcls/xml/body.xml +++ b/Open-ILS/web/opac/skin/kcls/xml/body.xml @@ -1,93 +1,4 @@ - - -

#toptable { display: none; } @@ -99,18 +10,14 @@

- -if(grabUser()) { - var str = '

'; - str += '

\n'; - str += '

'; - document.write(str); -} - -]]> +

@@ -146,17 +53,6 @@ if(grabUser()) {

@@ -164,44 +60,9 @@ try {

- -

- - dojo.addOnLoad(init); - dojo.require("dijit._Calendar"); - dojo.require("dijit.form.DateTextBox"); - dojo.require("dijit.form.FilteringSelect"); - dojo.require("dojo.date.locale"); - dojo.require("dojo.date.stamp"); - dojo.require("dojo.parser"); - dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N - dojo.require("dijit.form.NumberSpinner"); - dojo.require("dijit.form.CheckBox"); - dojo.require("openils.widget.ProgressDialog"); - dojo.require('openils.BibTemplate'); - dojo.addOnLoad(opac_init); - -]]> + + + + + diff --git a/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml b/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml index cc0f12edc2..d88358bb8e 100644 --- a/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml +++ b/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml @@ -300,6 +300,36 @@ dojo.require("dojo.date.stamp"); dojo.require("dojo.parser"); dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N + dojo.addOnLoad(opac_init) + + try { + document.getElementById('toptable').style.display = 'table'; + } catch(e) { + try { + document.getElementById('toptable').style.display = ''; + } catch(ee) {} + } + + attachEvt("common", "unload", function(){ + if(typeof(G)!="undefined") destroyObj(G); + if(typeof(HTTP)!="undefined") destroyObj(HTTP); + if(typeof(_c)!="undefined") destroyObj(_c); + if(typeof(_l)!="undefined") destroyObj(_l); + if(typeof(config)!="undefined") destroyObj(config); + if(typeof(facet_list)!="undefined") destroyObj(facet_list); + if(typeof(globalOrgTree)!="undefined") destroyObj(globalOrgTree); + if(typeof(globalOrgTypes)!="undefined") destroyObj(globalOrgTypes); + if(typeof(google)!="undefined") destroyObj(google); + if(typeof(orgArraySearcher)!="undefined") destroyObj(orgArraySearcher); + if(typeof(recordsCache)!="undefined") destroyObj(recordsCache); + if(typeof(search_list)!="undefined") destroyObj(search_list); + if(typeof(subjectCache)!="undefined") destroyObj(subjectCache); + if(typeof(xrefCacheIndex)!="undefined") destroyObj(xrefCacheIndex); + if(typeof(x)!="undefined") destroyObj(x); + if(typeof(string)!="undefined") string = ""; + //removeChildren(document); + //alert(errCounter+'\n'+errCounter2); + }); ]]> @@ -311,23 +341,4 @@ - - - - - - diff --git a/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml b/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml index a90b39cb6e..0cc7a6845a 100644 --- a/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml +++ b/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml @@ -261,18 +261,46 @@ } catch (E) { void(0); } + + try { + document.getElementById('toptable').style.display = 'table'; + } catch(e) { + try { + document.getElementById('toptable').style.display = ''; + } catch(ee) {} + } + + attachEvt("common", "unload", function(){ + if(typeof(G)!="undefined") destroyObj(G); + if(typeof(HTTP)!="undefined") destroyObj(HTTP); + if(typeof(_c)!="undefined") destroyObj(_c); + if(typeof(_l)!="undefined") destroyObj(_l); + if(typeof(config)!="undefined") destroyObj(config); + if(typeof(facet_list)!="undefined") destroyObj(facet_list); + if(typeof(globalOrgTree)!="undefined") destroyObj(globalOrgTree); + if(typeof(globalOrgTypes)!="undefined") destroyObj(globalOrgTypes); + if(typeof(google)!="undefined") destroyObj(google); + if(typeof(orgArraySearcher)!="undefined") destroyObj(orgArraySearcher); + if(typeof(recordsCache)!="undefined") destroyObj(recordsCache); + if(typeof(search_list)!="undefined") destroyObj(search_list); + if(typeof(subjectCache)!="undefined") destroyObj(subjectCache); + if(typeof(xrefCacheIndex)!="undefined") destroyObj(xrefCacheIndex); + if(typeof(x)!="undefined") destroyObj(x); + if(typeof(string)!="undefined") string = ""; + //removeChildren(document); + //alert(errCounter+'\n'+errCounter2); + }); } dojo.addOnLoad( function() { skin_init(); - isFrontPage = true; - init(); + opac_init(); } ); ]]> -- 2.11.0