From 35f61ca858a4010052ae5662660b0b8cad9594b1 Mon Sep 17 00:00:00 2001
From: berick <berick@esilibrary.com>
Date: Fri, 4 Mar 2011 18:01:46 -0500
Subject: [PATCH] go back to split approach, where FF loads one set of JS via
 requireLegacy and non-FF loads a different set via <script> since IE does not
 play nice with requireLegacy

---
 Open-ILS/web/opac/skin/kcls/js/rdetail.js          |   2 -
 Open-ILS/web/opac/skin/kcls/xml/body.xml           |  12 +
 .../web/opac/skin/kcls/xml/common/js_common.xml    | 153 ++++++++--
 .../skin/kcls/xml/common/js_common_postbody.xml    | 318 +++------------------
 4 files changed, 183 insertions(+), 302 deletions(-)

diff --git a/Open-ILS/web/opac/skin/kcls/js/rdetail.js b/Open-ILS/web/opac/skin/kcls/js/rdetail.js
index 1ac447ed30..37c1824325 100644
--- a/Open-ILS/web/opac/skin/kcls/js/rdetail.js
+++ b/Open-ILS/web/opac/skin/kcls/js/rdetail.js
@@ -181,7 +181,6 @@ function rdetailDraw() {
 		marc = new MarcRecord(getRid());
         runEvt('rdetail', 'recordRetrieved', record.doc_id());
 		drawMarcData();
-        runEvt("rdetail", "recordDrawn");
 		   //var req = new Request(FETCH_RMODS, getRid());
 		   //req.callback(_rdetailDraw);  
 		   //req.send();  
@@ -198,7 +197,6 @@ function rdetailDraw() {
             marc = new MarcRecord(getRid());
             runEvt('rdetail', 'recordRetrieved', record.doc_id());
             drawMarcData();
-            runEvt("rdetail", "recordDrawn");
 		   //var req2 = new Request(FETCH_RMODS, getRid());
 		   //req2.callback(_rdetailDraw);
 		   //req2.send();
diff --git a/Open-ILS/web/opac/skin/kcls/xml/body.xml b/Open-ILS/web/opac/skin/kcls/xml/body.xml
index f9d143102c..a112569608 100644
--- a/Open-ILS/web/opac/skin/kcls/xml/body.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/body.xml
@@ -95,5 +95,17 @@
   <div id="x"></div>
 </div>
 <div dojoType='openils.widget.ProgressDialog' jsId='progressDialog' style="width:300px;"></div>
+<!--#if expr="$HTTP_USER_AGENT = /Firefox/ || $HTTP_USER_AGENT = /xulrunner/" -->
 <!--#include virtual='common/js_common_postbody.xml'-->
+<!--#endif-->
+<!--#if expr="$OILS_PAGE='rresult.xml' || $OILS_PAGE='rdetail.xml' ||  $OILS_PAGE='mresult.xml'"-->
+    <!--#if expr="$OILS_CHILIFRESH_ACCOUNT && $OILS_CHILIFRESH_ACCOUNT != '(none)'"-->
+    <script type='text/javascript' src='<!--#echo var='OILS_CHILIFRESH_URL'-->'></script>
+    <!--#endif-->
+<!--#endif-->
+<!--#if expr="$OILS_PAGE='rdetail.xml'"-->
+    <!--#if expr="${OILS_NOVELIST_URL} && ${OILS_NOVELIST_URL}!='(none)'"-->
+    <script type='text/javascript' id='EIT' src='<!--#echo var='OILS_NOVELIST_URL'-->'></script>
+    <!--#endif-->
+<!--#endif-->
 </body>
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 6414b0d152..10f998ecfc 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
@@ -1,22 +1,143 @@
-<script type="text/javascript">
-	var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
-	if (!locale) locale = '<!--#echo var="locale"-->';
-	var djConfig = {  
-		locale: locale.toLowerCase(),  
-		parseOnLoad: true,  
-		isDebug: false,
-		modulePaths: {
-			"fieldmapper": '/js/dojo/fieldmapper'
-		}
+<script language='javascript' type="text/javascript"><![CDATA[
+    var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
+    if (!locale) locale = '<!--#echo var="locale"-->';
+
+    var djConfig = {
+        locale: locale.toLowerCase(),
+        parseOnLoad: true,
+        isDebug: false
     };
     var lang, bidi;
-</script>
-<script src='/js/dojo/dojo/dojo.js' type="text/javascript"></script>
+]]></script>
+
+<script type='text/javascript' src='/js/dojo/dojo/dojo.js'></script>
+
 <!--#if expr="$OILS_PAGE='myopac.xml'"-->
 <!-- my acccount uses a lot more classes -->
-<script type="text/javascript"
-    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,accs,au,ahr,ahrn,acn,actscecm,cbreb,cbreb,cbrebi,acp,cust,ac,aua,mous,circ,mbts,mb,ausp,csp'></script>
+<script type='text/javascript'
+    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,au,accs,ahr,ahrn,acn,actscecm,cbreb,cbreb,cbrebi,acp,cust,ac,aua,mous,circ,mbts,mb,ausp,csp,acpl'>
+</script>
+<!--#else-->
+<script type='text/javascript'
+    src='/IDL2js?ahr,mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,au'>
+</script>
+
+<!--#endif-->
+
+
+<!--#if expr="$HTTP_USER_AGENT = /Firefox/ || $HTTP_USER_AGENT = /xulrunner/" -->
+<!-- Load all Firefox/Xulrunner JS just prior to </body> -->
 <!--#else-->
-<script type="text/javascript"
-    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,ahr'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON_v1.js'></script>
+<script language='javascript' type="text/javascript" src='/js/dojo/opensrf/opensrf.js'></script>
+<script language='javascript' type="text/javascript" src='/js/dojo/dojo/openils_dojo.js'></script>
+<script language='javascript' type="text/javascript" src='/js/dojo/fieldmapper/AutoIDL.js'></script>
+
+<script language='javascript' type="text/javascript" src='<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/OrgTree.js'></script>
+<script language='javascript' type="text/javascript" src='<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/FacetDefs.js'></script>
+
+<!--#if expr="$OILS_OPAC_COMBINED_JS"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/combined.js'></script>
+<!--#else --> 
+<!-- 
+    When combined JS is enabled in the Apache config, the block 
+    below defines which files are added to the final combined JS file. 
+    Currently, only files in $OPAC/common/js/ are eligible for automatic combination.
+-->
+<!--START COMPRESSION-->
+<script language='javascript' type="text/javascript" src='<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/slimtree.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/org_utils.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/init.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/added_content.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/DP_DateExtensions.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js'></script>
+<!--END COMPRESSION--> 
+<!--#endif -->
+<script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/misc.js" type='text/javascript'></script>
+
+<!--#if expr="$OILS_PAGE!='advanced.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/search_bar.js'></script>
+<!--#endif-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/depth_selector.js'></script>
+
+<!--#if expr="$OILS_PAGE='rresult.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar_extras.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/rresult.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/result_common.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/tips.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/holds.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/rdetail.js'></script>
+<!--#endif-->
+
+<!--#if expr="$OILS_PAGE='rdetail.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar_extras.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/result_common.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/rresult.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/rdetail.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/cn_browse.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/holds.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/container.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/copy_details.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js'></script>
+<script language='javascript' type='text/javascript' src='/opac/skin/kcls/js/marc.js'></script>
+<script type="text/javascript"><![CDATA[
+    attachEvt("common", "init", function() {
+        var here = findOrgUnit(getLocation());
+        if (getDepth() > 0 || getDepth === 0 ) {
+            while (getDepth() < findOrgDepth(here))
+                here = findOrgUnit( here.parent_ou() );
+        }
+
+        new openils.BibTemplate(
+            { record : new CGI().param('r'), org_unit : here.shortname() }
+        ).render();
+    });
+]]></script>
+<!--#endif-->
+
+
+<!--#if expr="$OILS_PAGE='myopac.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/myopac.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/container.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/holds.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js'></script>
+
+<!--#endif-->
+
+<!--#if expr="$OILS_PAGE='mresult.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar_extras.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/mresult.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/result_common.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/tips.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/holds.js'></script>
+<!--#endif-->
+
+<!--#if expr="$OILS_PAGE='cnbrowse.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/cn_browse.js'></script>
+<!--#endif-->
+
+<!--#if expr="$OILS_PAGE='advanced.xml'"-->
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/advanced.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/adv_global.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar.js'></script>
 <!--#endif-->
+
+
+<!-- global js -->
+<script language='javascript' type='text/javascript'><![CDATA[
+    <!--#include virtual="js_shared.xml"-->
+    dojo.addOnLoad(init);
+    dojo.addOnLoad(opac_init)
+]]> </script>
+
+<!--#endif--> <!-- != Firefox/Xulrunner -->
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 1f76e4f3ea..5aee0981aa 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
@@ -1,212 +1,50 @@
-<!--#if expr="$OILS_PAGE='rdetail.xml'"-->
-<script src='https://www.google.com/jsapi' type='text/javascript' language='javascript'></script>
-<!--#endif-->
-<!--#if expr="$OILS_CHILIFRESH_ACCOUNT && $OILS_CHILIFRESH_ACCOUNT != '(none)'"-->
-<script type="text/javascript" src="<!--#echo var='OILS_CHILIFRESH_URL'-->"></script>
-<!--#endif-->
+<script type="text/javascript"><![CDATA[
+    dojo.require('openils.Util');
 
-<!--#if expr="$OILS_PAGE='rdetail.xml' && ${OILS_NOVELIST_URL} && ${OILS_NOVELIST_URL}!='(none)'"-->
-<script id="EIT" src="<!--#echo var='OILS_NOVELIST_URL'-->" type="text/javascript"></script>
-<!--#endif-->
-<script language="javascript" type="text/javascript"><![CDATA[
     // set up some global JS config variables, read from the Apache config
-    var OILS_OPAC_IMAGES_HOST = null;
-    <!--#if expr="$OILS_OPAC_IMAGES_HOST"-->
-        OILS_OPAC_IMAGES_HOST = '<!--#echo var="OILS_OPAC_IMAGES_HOST"-->extras/ac/jacket/';
-    <!--#endif -->
-    var OILS_OPAC_STATIC_PROTOCOL = null;
-    <!--#if expr="$OILS_OPAC_STATIC_PROTOCOL"-->
-        OILS_OPAC_STATIC_PROTOCOL = '<!--#echo var="OILS_OPAC_STATIC_PROTOCOL"-->';
-    <!--#endif -->
 
-    var chilifresh = '<!--#echo var="OILS_CHILIFRESH_ACCOUNT"-->';
-    if (chilifresh == '(none)') { chilifresh = false; }
-    var novelist = '<!--#echo var="OILS_NOVELIST_URL"-->';
-    if (novelist == '(none)') { novelist = false; }
+    openils.Util.requireLegacy('/js/dojo/dojo/openils_dojo.js');
+    openils.Util.requireLegacy('/js/dojo/fieldmapper/AutoIDL.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/OrgTree.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/FacetDefs.js');
+
+    <!--#if expr="$OILS_OPAC_COMBINED_JS"-->
+    openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/combined.js')
+    <!--#else -->
+    /* See js_common.xml for which files are actually combined/compressed by autogen */
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/utils.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/config.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/CGI.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/md5.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/slimtree.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/opac_utils.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/org_utils.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/init.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/added_content.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/DP_DateExtensions.js');
+    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/Cookies.js');
+    <!--#endif -->
 
-    var cookieManager, localSuppressedOrgs;
+    <!--#include virtual="js_shared.xml"-->
 
     function skin_init() {
-        dojo.require('openils.Util');
-
-
-        openils.Util.requireLegacy('/js/dojo/dojo/openils_dojo.js');
-        openils.Util.requireLegacy('/js/dojo/fieldmapper/AutoIDL.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/FacetDefs.js');
-
-        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');    // XXX add test for myopac?
-        dojo.require('dijit.form.CheckBox');    // XXX add test for myopac
-        dojo.require("dojo.cookie");
-        dojo.require('openils.BibTemplate');    // XXX devise and add test for need
-        dojo.require("openils.widget.ProgressDialog");
-
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/OrgTree.js');
-
-        <!--#if expr="$OILS_OPAC_COMBINED_JS"-->
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/combined.js')
-        <!--#else -->
-        /*
-            When combined JS is enabled in the Apache config, the block
-            below defines which files are added to the final combined JS file.
-            Currently, only files in $OPAC/common/js/ are eligible for automatic combination.
-        */
-        <!--START COMPRESSION-->
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/utils.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/config.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/CGI.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/md5.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/slimtree.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/opac_utils.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/org_utils.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/init.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/added_content.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/DP_DateExtensions.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/Cookies.js');
-        <!--END COMPRESSION-->
-        <!--#endif -->
-
-        console.log('middle of main script');
-
-        if(dojo.isIE) {
-            setTimeout(
-                function() {
-                    openils.Util.requireLegacy('http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js');
-                    CFInstall.check({
-                        preventPrompt: true,
-                        onmissing: function() {
-                            if (dojo.cookie("noGCF") != "true")
-                                unHideMe($('gcfPrompt'));
-                        }
-                    });
-            }, 0);
-        }
-
-
-        config.css.color_1 = "";
-        config.css.color_2 = "";
-        config.css.color_3 = "";
-
-        <!--#if expr="$OILS_OPAC_FORCE_LOGIN_SSL"-->
-            forceLoginSSL = true;
-        <!--#endif -->
-
-        cookieManager = new HTTP.Cookies();
-
-        // KCLS suppressed orgs
-        localSuppressedOrgs = {1500:true, 1501:true, 1558:true};  /* change to suit */
-        for (var i in orgArraySearcher) {
-            var org = orgArraySearcher[i];
-            if(localSuppressedOrgs[i]) {
-                org.opac_visible('f');
-            }
-        }
-
-        openils.Util.requireLegacy('/opac/skin/kcls/js/marc.js');
-        openils.Util.requireLegacy('/opac/skin/kcls/js/misc.js');
         openils.Util.requireLegacy('/opac/skin/kcls/js/depth_selector.js');
+        openils.Util.requireLegacy('/opac/skin/kcls/js/misc.js');
+
         <!--#if expr="$OILS_PAGE!='advanced.xml'"-->
         openils.Util.requireLegacy('/opac/skin/kcls/js/search_bar.js');
         <!--#endif -->
 
-        config.ids.searchbar = {};
-        config.css.searchbar = {};
-        config.ids.searchbar.text                = 'search_box';
-        config.ids.searchbar.submit            = 'search_submit';
-        config.ids.searchbar.type_selector    = 'search_type_selector';
-        config.ids.searchbar.depth_selector    = 'depth_selector';
-        config.ids.searchbar.form_selector    = 'form_selector';
-        config.ids.searchbar.extra_row        = 'searchbar_extra';
-        config.ids.searchbar.main_row            = 'searchbar_main_row';
-        config.ids.searchbar.table                = 'searchbar_table';
-        config.ids.searchbar.location_tag    = 'search_location_tag_link';
-        config.ids.searchbar.lib_sel_span    = 'lib_selector_span';
-        config.ids.searchbar.lib_sel_link    = 'lib_selector_link';
-        config.ids.searchbar.depth_sel_span    = 'depth_selector_span';
-        config.ids.altcanvas.org_tree        = config.ids.common.org_container;
-        config.ids.altcanvas.holds            = 'holds_box';
-        config.ids.altcanvas.check_holds    = 'check_holds_box';
-        config.ids.altcanvas.xulholds        = 'xulholds_box';
-        config.ids.altcanvas.loading        = 'loading_alt';
-        config.ids.common.now_searching = 'now_searching_location';
-        config.ids.searchbar = {};
-        config.css.searchbar = {};
-        config.ids.searchbar.text                = 'search_box';
-        config.ids.searchbar.facets                = 'facet_box';
-        config.ids.searchbar.submit            = 'search_submit';
-        config.ids.searchbar.type_selector    = 'search_type_selector';
-        config.ids.searchbar.depth_selector    = 'depth_selector';
-        config.ids.searchbar.form_selector    = 'form_selector';
-        config.ids.searchbar.extra_row        = 'searchbar_extra';
-        config.ids.searchbar.main_row            = 'searchbar_main_row';
-        config.ids.searchbar.table                = 'searchbar_table';
-        config.ids.searchbar.location_tag    = 'search_location_tag_link';
-        config.ids.searchbar.lib_sel_span    = 'lib_selector_span';
-        config.ids.searchbar.lib_sel_link    = 'lib_selector_link';
-        config.ids.searchbar.depth_sel_span    = 'depth_selector_span';
-        config.ids.common.top_logo = "top_left_logo";
-        config.ids.sidebar = {};
-        config.css.sidebar = {};
-        config.names.sidebar = {};
-        config.css.sidebar.item = {};
-        config.ids.sidebar.home                = 'home_link_div';
-        config.ids.sidebar.advanced        = 'advanced_link_div';
-        config.ids.sidebar.myopac            = 'myopac_link_div';
-        config.ids.sidebar.prefs            = 'prefs_link_div';
-        config.ids.sidebar.mresult            = 'mresult_link_div';
-        config.ids.sidebar.rresult            = 'result_link_div';
-        config.ids.sidebar.rdetail            = "rdetail_link_div";
-        config.ids.sidebar.login            = 'login_link';
-        config.ids.sidebar.logout            = 'logout_link';
-        config.ids.sidebar.logoutbox        = 'logout_link_div';
-        config.ids.sidebar.loginbox        = 'login_link_div';
-        config.ids.sidebar.logged_in_as    = 'logged_in_as_div';
-        config.ids.sidebar.username_dest    = 'username_dest';
-
-        config.ids.sidebar.home_link        = 'home_link'
-        config.ids.sidebar.advanced_link    = 'advanced_link'
-        config.ids.sidebar.myopac_link    = 'myopac_link'
-
-        config.css.encircled                = 'encircled';
-
-        config.ids.login = {};
-        config.css.login = {};
-        config.ids.login.form            = "login_form";
-        config.ids.login.box            = "login_box";
-        config.ids.login.tbody            = "login_tbody";
-        config.ids.login.username    = "login_username";
-        config.ids.login.password    = "login_password";
-        config.ids.login.button        = "login_button";
-        config.ids.login.cancel        = "login_cancel_button";
-        config.ids.altcanvas.login            = config.ids.login.box;
-
-        config.ids.altcanvas.myopac_reload = 'myopac_reloading';
-        config.ids.myopac = {};
-        config.css.myopac = {};
-        config.names.myopac = {};
-
-        <!--#if expr="$FRONT_PAGE!='true'"-->
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/password_reset.js');
-        <!--#else -->
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/contentslider.js');
-        <!--#endif -->
-
         <!--#if expr="$OILS_PAGE='rresult.xml'"-->
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar_extras.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/rresult.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/result_common.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/rdetail.js'); /* sigh; it's needed */
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/tips.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/holds.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/rdetail.js');
         <!--#endif-->
 
         <!--#if expr="$OILS_PAGE='rdetail.xml'"-->
@@ -220,31 +58,8 @@
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/holds.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/container.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/copy_details.js');
-
-        config.ids.rdetail              = {};
-        config.ids.rdetail.view_marc    = "rdetail_view_marc";
-        config.ids.rdetail.details_body = 'rdetail_details_body';
-        config.ids.rdetail.title        = 'rdetail_title';
-        config.ids.rdetail.author       = 'rdetail_author';
-        config.ids.rdetail.isbn         = 'rdetail_isbn';
-        config.ids.rdetail.edition      = 'rdetail_edition';
-        config.ids.rdetail.pubdate      = 'rdetail_pubdate';
-        config.ids.rdetail.publisher    = 'rdetail_publisher';
-        config.ids.rdetail.tor          = 'rdetail_tor';
-        config.ids.rdetail.abstr        = 'rdetail_abstract';
-        config.ids.rdetail.image        = 'rdetail_image';
-        config.ids.rdetail.tor_pic      = 'rdetail_tor_pic';
-
-        config.ids.rdetail.cp_status        = "rdetail_copy_info_status";
-        config.ids.rdetail.cp_info_row      = "rdetail_copy_info_row";
-        config.ids.rdetail.cp_info_loading  = "rdetail_copy_info_loading";
-        config.ids.rdetail.cp_info_local    = "copy_info_local_link";
-        config.ids.rdetail.cp_info_all      = "copy_info_all_link";
-        config.ids.rdetail.cp_info_none     = "rdetail_copy_info_none";
-        config.names.rdetail.lib_cell       = "rdetail_library_cell";
-        config.names.rdetail.cn_cell        = "rdetail_callnumber_cell";
-        config.names.rdetail.cp_count_cell  = "rdetail_copy_count_cell";
-        config.names.rdetail.cp_status      = 'rdetail_status_cell';
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js');
+        openils.Util.requireLegacy('/opac/skin/kcls/js/marc.js');
 
         attachEvt("common", "init", function() {
             var here = findOrgUnit(getLocation());
@@ -260,14 +75,12 @@
 
         <!--#endif--> /* if rdetail.xml */
 
-
         <!--#if expr="$OILS_PAGE='myopac.xml'"-->
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/myopac.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/container.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/holds.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar.js');
-
-        $('myopac_holds_actions_none').selected = true;
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js');
 
         <!--#endif-->
 
@@ -286,73 +99,10 @@
         <!--#if expr="$OILS_PAGE='advanced.xml'"-->
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/advanced.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/adv_global.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar.js');
         <!--#endif-->
-
-        /* I'm not sure how to test for the situation where this block is
-           needed, but this won't hurt. */
-        try {
-            if ($('holds_frozen_chkbox').checked)
-                unHideMe($("hold_frozen_thaw_row"));
-        } catch (E) {
-            void(0);
-        }
-
-        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() {
-            <!--#if expr="$OILS_PAGE='index.xml'"-->
-            isFrontPage = true;
-            <!--#endif-->
-            console.log("begin skin_init()"); skin_init(); console.log("end skin_init()");
-            console.log("begin init()"); init(); console.log("end init()");
-            console.log("begin opac_init()"); opac_init(); console.log("end opac_init()");
-            <!--#if expr="$OILS_PAGE='index.xml'"-->
-
-            getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED}));
-            getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));
-
-            try {
-                dojo.style(dojo.byId('toptable'), 'display', 'table');
-            } catch(e) {
-                try {
-                    dojo.style(dojo.byId('toptable'), 'display', '');
-                } catch(ee) {}
-            }
-
-            featuredcontentslider.init({
-                id: "homebanner",
-                contentsource: ["inline", ""],
-                toc: "markup",
-                nextprev: ["", ""],
-                enablefade: [true, 0.04],
-                onChange: function(previndex, curindex){},
-
+    dojo.addOnLoad( function() { skin_init(); init(); opac_init(); });
 
-                autorotate: [true, 3000] //pause time (in milliseconds)
-            });
-            <!--#endif-->
-        }
-    );
 ]]></script>
-- 
2.11.0