From 6636aa5136abfd8b7725a52c7eb5f48048bb3941 Mon Sep 17 00:00:00 2001
From: senator <lebbeous@esilibrary.com>
Date: Mon, 13 Dec 2010 10:44:41 -0500
Subject: [PATCH] work to date, including mine and berick's. henceforth,
 incremental commits.

---
 Open-ILS/web/opac/skin/default/js/adv_global.js    |   3 +-
 Open-ILS/web/opac/skin/default/js/advanced.js      |  12 +-
 .../web/opac/skin/default/js/password_reset.js     |   1 +
 Open-ILS/web/opac/skin/default/js/result_common.js |  29 +++
 .../skin/default/xml/advanced/advanced_global.xml  |  19 --
 Open-ILS/web/opac/skin/default/xml/body.xml        |  29 +--
 .../web/opac/skin/default/xml/common/altcanvas.xml |   2 +
 .../web/opac/skin/default/xml/common/fonts.xml     |  14 +-
 .../web/opac/skin/default/xml/common/holds.xml     |   8 +-
 .../web/opac/skin/default/xml/common/js_common.xml |  68 +-----
 .../skin/default/xml/common/js_common_postbody.xml | 259 +++++++++++++++++++++
 .../web/opac/skin/default/xml/common/libselect.xml |   1 -
 .../web/opac/skin/default/xml/common/login.xml     |   2 +
 Open-ILS/web/opac/skin/default/xml/common/logo.xml |   2 +
 .../web/opac/skin/default/xml/common/searchbar.xml |  45 ++--
 .../web/opac/skin/default/xml/common/sidebar.xml   |  25 +-
 .../web/opac/skin/default/xml/common/statusbar.xml |   5 -
 .../web/opac/skin/default/xml/home/homesearch.xml  |  40 +---
 .../web/opac/skin/default/xml/home/index_body.xml  |  39 +---
 .../web/opac/skin/default/xml/page_advanced.xml    |   2 -
 .../web/opac/skin/default/xml/page_rdetail.xml     |  13 --
 .../web/opac/skin/default/xml/page_rresult.xml     |  12 +-
 .../default/xml/rdetail/rdetail_cn_details.xml     |   2 -
 .../skin/default/xml/rdetail/rdetail_copyinfo.xml  |  16 --
 .../skin/default/xml/rdetail/rdetail_extras.xml    |   5 -
 .../skin/default/xml/rdetail/rdetail_summary.xml   |  29 ---
 .../opac/skin/default/xml/result/result_common.xml |   2 +
 .../opac/skin/default/xml/result/result_table.xml  |   2 +
 28 files changed, 398 insertions(+), 288 deletions(-)
 create mode 100644 Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml

diff --git a/Open-ILS/web/opac/skin/default/js/adv_global.js b/Open-ILS/web/opac/skin/default/js/adv_global.js
index 5cacdda71e..aa1982cc26 100644
--- a/Open-ILS/web/opac/skin/default/js/adv_global.js
+++ b/Open-ILS/web/opac/skin/default/js/adv_global.js
@@ -1,4 +1,4 @@
-
+console.log("begin adv_global.js");
 attachEvt("common", "run", advgInit);
 attachEvt("common", "locationChanged", advSyncCopyLocLink );
 
@@ -342,3 +342,4 @@ function advShowCopyLocations(r) {
 }
 
 
+console.log("end adv_global.js");
diff --git a/Open-ILS/web/opac/skin/default/js/advanced.js b/Open-ILS/web/opac/skin/default/js/advanced.js
index 12728c123c..dc4689f340 100644
--- a/Open-ILS/web/opac/skin/default/js/advanced.js
+++ b/Open-ILS/web/opac/skin/default/js/advanced.js
@@ -1,5 +1,5 @@
 /* advanced search interface */
-
+console.log("begin advanced.js");
 attachEvt("common", "run", advInit);
 
 function advInit() { 
@@ -168,5 +168,13 @@ function advDrawBarcode(r) {
     location.href = buildOPACLink(args);
 }
 
+function __setsortsel() {
+    var sel = $('adv_global_sort_by');
+    if (sel.selectedIndex == 0) {
+        $("adv_global_sort_dir").disabled = true;
+        $("adv_global_sort_dir").selectedIndex = 0;
+    } else $("adv_global_sort_dir").disabled = false;
+}
 
-
+__setsortsel();
+console.log("end advanced.js");
diff --git a/Open-ILS/web/opac/skin/default/js/password_reset.js b/Open-ILS/web/opac/skin/default/js/password_reset.js
index 83db2721d9..f203b252ee 100644
--- a/Open-ILS/web/opac/skin/default/js/password_reset.js
+++ b/Open-ILS/web/opac/skin/default/js/password_reset.js
@@ -7,6 +7,7 @@ dojo.requireLocalization("openils.opac", "opac");
 opac_strings = dojo.i18n.getLocalization("openils.opac", "opac");
 
 dojo.addOnLoad(function() {
+    return; //XXX
 
     // Create the password reset dialog
     var pwResetFormDlg = createResetDialog();
diff --git a/Open-ILS/web/opac/skin/default/js/result_common.js b/Open-ILS/web/opac/skin/default/js/result_common.js
index dc3ae94921..9c7953c274 100644
--- a/Open-ILS/web/opac/skin/default/js/result_common.js
+++ b/Open-ILS/web/opac/skin/default/js/result_common.js
@@ -1,5 +1,34 @@
 dojo.require('openils.BibTemplate');
 
+config.ids.result = {};
+config.css.result = {};
+config.names.result = {};
+config.ids.result.offset_start	= "offset_start";
+config.ids.result.offset_end		= "offset_end";
+config.ids.result.result_count	= "result_count";
+config.ids.result.next_link		= 'next_link';
+config.ids.result.prev_link		= 'prev_link';
+config.ids.result.home_link		= 'search_home_link';
+config.ids.result.end_link			= 'end_link';
+config.ids.result.main_table		= 'result_table';
+config.ids.result.row_template	= 'result_table_template';
+config.ids.result.num_pages		= 'num_pages';
+config.ids.result.current_page	= 'current_page';
+config.css.result.nav_active		= "nav_link_active";
+config.ids.result.top_div			= "result_table_div";
+config.ids.result.nav_links		= "search_nav_links";
+config.ids.result.info				= "result_info_div";
+config.css.result.cc_cell_even	= "copy_count_cell_even";
+config.names.result.item_jacket	= "item_jacket";
+config.names.result.item_title	= "item_title";
+config.names.result.item_author	= "item_author";
+config.names.result.counts_row	= "counts_row";
+config.names.result.count_cell	= "copy_count_cell";
+config.names.result.format_cell = 'result_table_format_cell';
+config.names.result.format_link = 'resource_link'
+config.names.result.format_pic = 'format_pic'
+
+
 var recordsHandled = 0;
 var recordsCache = [];
 var lowHitCount = 4;
diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
index cf186e7b99..eb15987c40 100644
--- a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
+++ b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
@@ -6,8 +6,6 @@
 		.adv_adv_link { font-size: 8pt; color: red; }
 	</style>
 
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/adv_global.js'> </script>
-
 	<tr style='border-bottom: none;'>
 
 		<!-- Contains the user-addable(?) rows to define search class, containment and text -->
@@ -19,10 +17,6 @@
 				</thead>
 				<tbody id='adv_global_tbody'>
 
-					<script language='javascript' type='text/javascript'>
-						config.ids.common.now_searching = 'now_searching_location';
-					</script>
-
 					<!--#set var="adv_global_row_id" value="adv_global_trow"-->
 					<!--#include virtual="adv_global_row.xml"-->
 
@@ -238,16 +232,6 @@
 							<tbody>
 								<tr>
 
-                           <script language='javascript' type='text/javascript'>
-                              function __setsortsel() {
-                                 var sel = $('adv_global_sort_by')
-										   if(sel.selectedIndex == 0) {
-											   $("adv_global_sort_dir").disabled = true;
-											   $("adv_global_sort_dir").selectedIndex = 0;
-										   } else $("adv_global_sort_dir").disabled = false;
-                              }
-                           </script>
-
 									<td align=''>
 										<select id='adv_global_sort_by' onchange='__setsortsel();'>
 											<option value='rel'>&advanced.relevance;</option>
@@ -273,9 +257,6 @@
 										</select>
 									</td>
 
-                           <!-- force the enable/disable sort dir code to run -->
-                           <script language='javascript' type='text/javascript'>__setsortsel();</script>
-
 									<td align='center'>
 										<!--#include virtual="../common/libselect.xml"-->
 									</td>
diff --git a/Open-ILS/web/opac/skin/default/xml/body.xml b/Open-ILS/web/opac/skin/default/xml/body.xml
index 41068c2360..0f44a62651 100644
--- a/Open-ILS/web/opac/skin/default/xml/body.xml
+++ b/Open-ILS/web/opac/skin/default/xml/body.xml
@@ -29,7 +29,6 @@
 		<!--#include virtual='footer.xml'-->
     <center>
         <div id='gcfPrompt' class='hide_me'>
-            <script>dojo.require('dojo.cookie')</script>;
             <div><span>&common.googlechromeframe.why;</span></div>
             <button onclick='CFInstall.check({preventPrompt: false, mode: "popup"});'>&common.googlechromeframe.install;</button>
             <button onclick='dojo.cookie("noGCF", "true", {path:"/", expires: 365}); hideMe($("gcfPrompt"));'>&common.googlechromeframe.dontask;</button>
@@ -37,24 +36,20 @@
     </center>
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
     <script><![CDATA[ 
-        CFInstall.check({
-            preventPrompt: true,
-            onmissing: function() {
-                if (dojo.cookie("noGCF") != "true")
-                    unHideMe($('gcfPrompt'));
+        dojo.addOnLoad(
+            function() {
+                CFInstall.check({
+                    preventPrompt: true,
+                    onmissing: function() {
+                        if (dojo.cookie("noGCF") != "true")
+                            unHideMe($('gcfPrompt'));
+                    }
+                });
             }
-        });]]>
+        );
+        ]]>
     </script>
 
-    <script language="javascript" type="text/javascript">
-        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
-    </script>
+    <!--#include virtual='common/js_common_postbody.xml'-->
 
 </body>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml
index 97448daa77..cbaf0ad95e 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml
@@ -15,12 +15,14 @@
 	<!-- ============================================================================= -->
 	<!-- Register the alternate canvases  -->
 	<script language='javascript' type='text/javascript'>
+        /*
 		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.altcanvas.cnbrowse		= 'cn_browse';
+        */
 	</script>
 
 	<!--#if expr="$FRONT_PAGE!='true'"-->
diff --git a/Open-ILS/web/opac/skin/default/xml/common/fonts.xml b/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
index c7ebef3801..76888e8ae9 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
@@ -1,5 +1,4 @@
 <div id='fonts_div'>
-
 	<div id='text_size_div' style='position:absolute; top: 2px; right: 6px;'>
 		<span style='vertical-align: top;'>&common.textsize.title;</span>
 		<span style='vertical-align: top;'><a href="javascript:void(0);" onclick="setFontSize('regular');"> &common.textsize.regular; </a></span>
@@ -9,17 +8,12 @@
 		<span style='vertical-align: top;'>&common.language;</span>
 		<span id='translation_switch' dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore"
             searchAttr="label" required="false" jsId='opacLocaleSelector'>
-            <script type="text/javascript">
-                dojo.addOnLoad(function() {
-                    opacLocaleSelector.setValue(locale);
-                    dojo.connect(opacLocaleSelector, 'onChange', 
-                        function () {
-                            location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
-                        }
-                    );
+            <script type='dojo/connect' event='startup'>
+                this.attr('value', locale);
+                dojo.connect(this, 'onChange', function() {
+                    location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.attr('value') + '/skin');
                 });
             </script>
 		</span>
 	</div>
-	
 </div>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/holds.xml b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
index 962a366fbe..4bfcd618e2 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
@@ -149,7 +149,13 @@
 
                 <tr id='hold_frozen_thaw_row' class='hide_me'>
                     <td class='holds_cell'>
-                        <script language='javascript' type='text/javascript'> if($('holds_frozen_chkbox').checked) unHideMe($("hold_frozen_thaw_row"));</script>
+                        <script language='javascript' type='text/javascript'> 
+                            dojo.addOnLoad(function(){
+                                setTimeout(function(){
+                                    if($('holds_frozen_chkbox').checked) unHideMe($("hold_frozen_thaw_row"));
+                                },0)
+                            });
+                        </script>
                         &opac.holds.freeze.thaw_date;
                     </td>
                     <td class='holds_cell'>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
index fd7d5ad556..985cc73fb4 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
@@ -1,76 +1,12 @@
-<!--#if expr="$OILS_PAGE='myopac.xml'"-->
-<!-- my acccount uses a lot more classes -->
-<script language='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'
-    type='text/javascript'></script>
-<!--#else-->
-<script language='javascript'  
-    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs'
-    type='text/javascript'></script>
-<!--#endif-->
-
 <script language='javascript' 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
+         isDebug: true,
      }, lang, bidi;
 </script>
 
 <script language='javascript' src='/js/dojo/dojo/dojo.js'></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>
-<script language='javascript' type="text/javascript" src='<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js'></script>
-
-<!--#if expr="$OILS_OPAC_COMBINED_JS"-->
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/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"-->/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>
-<!--END COMPRESSION--> 
-<!--#endif -->
-
-<!-- Some global js -->
-<script language='javascript' type='text/javascript'>
-    config.css.color_1 = "color_1";
-    config.css.color_2 = "color_2";
-    config.css.color_3 = "color_3";
-    <!-- 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 -->
-    <!-- builds the "Now searching: <org_unit>" text on the home page -->
-    function home_init() {
-        getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED})); 
-        getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));
-    }
-    <!--#if expr="$OILS_OPAC_FORCE_LOGIN_SSL"-->
-        forceLoginSSL = true;
-    <!--#endif -->
-</script>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
new file mode 100644
index 0000000000..3ff1fd41bf
--- /dev/null
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
@@ -0,0 +1,259 @@
+<script type="text/javascript">
+    alert("hERE");
+    dojo.require('openils.Util');
+
+    var idlPath = '/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs';
+
+    <!--#if expr="$OILS_PAGE='myopac.xml'"-->
+    <!-- my acccount uses a lot more classes -->
+    openils.Util.requireLegacy(idlPath + ',accs,au,ahr,ahrn,acn,actscecm,cbreb,cbreb,cbrebi,acp,cust,ac,aua,mous,circ,mbts,mb,ausp,csp');
+    <!--#else-->
+    openils.Util.requireLegacy(idlPath);
+    <!--#endif-->
+
+    <!-- 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 -->
+
+    openils.Util.requireLegacy('/js/dojo/dojo/openils_dojo.js');
+    openils.Util.requireLegacy('/js/dojo/fieldmapper/AutoIDL.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
+
+    function skin_init() {
+        console.log('begin skin_init()');
+
+        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');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js');
+
+        <!--#if expr="$OILS_OPAC_COMBINED_JS"-->
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/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"-->/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');
+        <!--END COMPRESSION-->
+        <!--#endif -->
+
+        console.log('middle of main script');
+
+
+        config.css.color_1 = "color_1";
+        config.css.color_2 = "color_2";
+        config.css.color_3 = "color_3";
+
+        <!--#if expr="$OILS_OPAC_FORCE_LOGIN_SSL"-->
+            forceLoginSSL = true;
+        <!--#endif -->
+
+        openils.Util.requireLegacy('/opac/skin/default/js/depth_selector.js');
+        <!--#if expr="$OILS_PAGE!='advanced.xml'"-->
+        openils.Util.requireLegacy('/opac/skin/default/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;
+
+
+        <!--#if expr="$OILS_PAGE='rresult.xml'"-->
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js');
+        <!--#endif-->
+
+        <!--#if expr="$OILS_PAGE='rdetail.xml'"-->
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rdetail.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/copy_details.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.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';
+
+        var here = findOrgUnit(getLocation());
+        if (getDepth() > 0 || getDepth === 0 ) {
+            while (getDepth() < findOrgDepth(here))
+                here = findOrgUnit( here.parent_ou() );
+        }
+
+        dojo.require('openils.BibTemplate');
+        new openils.BibTemplate(
+            { record : new CGI().param('r'), org_unit : here.shortname() }
+        ).render();
+
+        var chilifresh = '<!--#echo var="OILS_CHILIFRESH_ACCOUNT"-->';
+        if (chilifresh == '(none)') { chilifresh = false; }
+        var novelist = '<!--#echo var="OILS_NOVELIST_URL"-->';
+        if (novelist == '(none)') { novelist = false; }
+
+        <!--if expr="${OILS_CHILIFRESH_ACCOUNT} && ${OILS_CHILIFRESH_ACCOUNT}!='(none)'"-->
+        openils.Util.requireLegacy('<!--#echo var='OILS_CHILIFRESH_URL'-->');
+        <!--#endif-->
+
+        <!--if expr="${OILS_NOVELIST_URL} && ${OILS_NOVELIST_URL}!='(none)'"-->
+        openils.Util.requireLegacy('<!--#echo var='OILS_NOVELIST_URL'-->');
+        <!--endif-->
+
+
+
+        <!--#endif--><!-- (rdetail) -->
+
+        <!--#if expr="$OILS_PAGE='advanced.xml'"-->
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/advanced.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/adv_global.js');
+        <!--#endif-->
+
+        console.log('end of main script');
+    }
+
+    dojo.addOnLoad(
+
+        function() {
+
+            skin_init();
+
+            <!--#if expr="$OILS_PAGE='index.xml'"-->
+            isFrontPage = true;
+            <!--#endif-->
+
+            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) {}
+            }
+            <!--#endif-->
+        }
+    );
+</script>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/libselect.xml b/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
index 45a7da780c..c976539da7 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
@@ -1,5 +1,4 @@
 <span>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/depth_selector.js'></script>
 	<span class='hide_me' id='depth_selector_span'>
 		<!--#if expr="$SHOW_DEPTHSEL_TEXT='true'"-->
 		<span>&library.select; </span>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/login.xml b/Open-ILS/web/opac/skin/default/xml/common/login.xml
index e59ba2985e..faaf38073d 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/login.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/login.xml
@@ -2,6 +2,7 @@
 <div id='login_box' class='hide_me canvas' style='margin-top: 6px;'>
 
 	<script language='javascript' type='text/javascript'>
+        /*
 		config.ids.login = {};
 		config.css.login = {};
 		config.ids.login.form			= "login_form";
@@ -12,6 +13,7 @@
 		config.ids.login.button		= "login_button";
 		config.ids.login.cancel		= "login_cancel_button";
 		config.ids.altcanvas.login			= config.ids.login.box;
+        */
 	</script>
 	<script type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/password_reset.js'></script>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/common/logo.xml b/Open-ILS/web/opac/skin/default/xml/common/logo.xml
index fffec7f2ce..ae188658da 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/logo.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/logo.xml
@@ -1,4 +1,6 @@
 <div id='logo_div'>
+    <!--
 	<script language='javascript' type='text/javascript'>config.ids.common.top_logo = "top_left_logo";</script>
+    -->
 	<img style='margin-right: 4px; height: 48px; width: 187px;' src='<!--#echo var="OILS_BASE"-->/images/small_logo.jpg' id='top_left_logo' border='0' class='logo' />
 </div>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml b/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
index 1638370e78..89ee173f79 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
@@ -9,32 +9,35 @@
         dojo.byId('search_submit').click();
     </script>
     <script type='dojo/method' event='populate'><![CDATA[
-        var searcher = this;
-        attachEvt("result", "allRecordsReceived", function () {
-            if(!resultCompiledSearch) {
-                return;
-            }
-        
-            var all_search = dojo.query( '.classedSearch', searcher.classedSearches );
-            if (all_search.length > 1) {
-                for (var i = 1; i < all_search.length; i++) {
-                    dojo.destroy(all_search[i]);
+        setTimeout(function(){
+            var searcher = this;
+            attachEvt("result", "allRecordsReceived", function () {
+                if(!resultCompiledSearch) {
+                    return;
                 }
-            }
-
-            var csearch = dijit.byNode(dojo.query( '.classedSearch', searcher.classedSearches )[0]);
-        
-            for (var type in resultCompiledSearch.searches) {
-                csearch.matchIndex.attr('value',type);
-                csearch.searchValue.attr('value',resultCompiledSearch.searches[type].term);
-                csearch = searcher.addClassAnd();
-            }
-        });
+            
+                var all_search = dojo.query( '.classedSearch', searcher.classedSearches );
+                if (all_search.length > 1) {
+                    for (var i = 1; i < all_search.length; i++) {
+                        dojo.destroy(all_search[i]);
+                    }
+                }
+
+                var csearch = dijit.byNode(dojo.query( '.classedSearch', searcher.classedSearches )[0]);
+            
+                for (var type in resultCompiledSearch.searches) {
+                    csearch.matchIndex.attr('value',type);
+                    csearch.searchValue.attr('value',resultCompiledSearch.searches[type].term);
+                    csearch = searcher.addClassAnd();
+                }
+            });
+        },0);
     ]]></script>
 
 
 	<!-- load my js -->
 	<script language='javascript' type='text/javascript'>
+        /*
 		config.ids.searchbar = {};
 		config.css.searchbar = {};
 		config.ids.searchbar.text				= 'search_box';	
@@ -50,6 +53,7 @@
 		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';
+        */
 	</script>
 
 
@@ -86,7 +90,6 @@
 			</tr>
 		</tbody>
 	</table>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/search_bar.js'></script>
 </div>
 
 
diff --git a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
index 39c0a94d9d..b0b086d068 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
@@ -64,15 +64,19 @@
      <div dojoType='openils.widget.FacetSidebar' searchBox='facet_box' searchSubmit='search_submit' facetLimit='5' classOrder='["author","subject","series","title","keyword"]'>
             <script type='dojo/method' event='populate'><![CDATA[
                 var fblob = this;
-                attachEvt("result", "allRecordsReceived", function () {
-                    if(!resultFacetKey) return;
-                    if (fblob.facetCacheKey) return; // already rendered it
-
-                    dojo.removeClass('facetSidebarContainer','hide_me');
-
-                    fblob.facetCacheKey = resultFacetKey;
-                    fblob.render();
-                });
+                setTimeout(
+                    function(){
+                        attachEvt("result", "allRecordsReceived", function () {
+                            if (!resultFacetKey) return;
+                            if (fblob.facetCacheKey) return; // already rendered it
+        
+                            dojo.removeClass('facetSidebarContainer','hide_me');
+        
+                            fblob.facetCacheKey = resultFacetKey;
+                            fblob.render();
+                        });
+                    },0
+                )
             ]]></script>
         </div>
 	</div>
@@ -145,9 +149,9 @@
 
 	<!-- ============================================================================= -->
 	<!-- Our javascript -->
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js'></script>
 
 	<script language='javascript' type='text/javascript'>
+        /*
 		config.ids.sidebar = {};
 		config.css.sidebar = {};
 		config.names.sidebar = {};
@@ -171,6 +175,7 @@
 		config.ids.sidebar.myopac_link	= 'myopac_link'
 		
 		config.css.encircled				= 'encircled';
+        */
 	</script>
 
 </div>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml b/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
index 237be6264b..555e5e4789 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
@@ -20,9 +20,4 @@
 			</tr>
 		</tbody>
 	</table>
-
-	<script language='javascript' type='text/javascript'>
-		config.ids.common.now_searching = 'now_searching_location';
-	</script>
-
 </div>
diff --git a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
index 30ca9a3481..fef5918110 100644
--- a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
+++ b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
@@ -3,30 +3,6 @@
 	style='-moz-border-radius: 6px; padding: 6px; margin-top: 65px;' 
 	xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-	<!-- load my js -->
-	<script language='javascript' type='text/javascript'
-		src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/depth_selector.js"> </script>
-	<script language='javascript' type='text/javascript'
-		src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/search_bar.js"> </script>
-
-	<script language='javascript' type='text/javascript'>
-		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';
-	</script>
-
-
 	<div style='width: 100%; text-align: center'>
 		<img src='<!--#echo var="OILS_BASE"-->/images/main_logo.jpg' />
 	</div>
@@ -41,7 +17,7 @@
 			<tr class='color_3'>
 
 				<script language='javascript' type='text/javascript'>
-					config.ids.common.now_searching = 'now_searching_location';
+					//config.ids.common.now_searching = 'now_searching_location';
 				</script>
 
 				<td style='padding: 6px;' class='border_5' align='center'>
@@ -110,22 +86,16 @@
 		        <span style='vertical-align: top;'>&common.language;</span>
 		        <span dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore" 
                     searchAttr="label" required="false" jsId='opacLocaleSelector'>
-                    <script type="text/javascript">
-                        dojo.addOnLoad(function() {
-                            opacLocaleSelector.setValue(locale);
-                            dojo.connect(opacLocaleSelector, 'onChange', 
-                                function () {
-					                location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
-                                }
-                            );
+                    <script type='dojo/connect' event='startup'>
+                        this.attr('value', locale);
+                        dojo.connect(this, 'onChange', function() {
+                            location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.attr('value') + '/skin');
                         });
                     </script>
 		        </span>
             </td></tr>
-
 		</tbody>
 	</table>
-
 </div>
 
 
diff --git a/Open-ILS/web/opac/skin/default/xml/home/index_body.xml b/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
index d2f031dda0..25306f0f02 100644
--- a/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
+++ b/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
@@ -32,36 +32,19 @@
     </center>
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
     <script><![CDATA[ 
-        CFInstall.check({
-            preventPrompt: true,
-            onmissing: function() {
-                if (dojo.cookie("noGCF") != "true")
-                    unHideMe($('gcfPrompt'));
-            }
-        });]]>
+        dojo.addOnLoad(function() {
+            CFInstall.check({
+                preventPrompt: true,
+                onmissing: function() {
+                    if (dojo.cookie("noGCF") != "true")
+                        unHideMe($('gcfPrompt'));
+                }
+            });
+        });
+        ]]>
     </script>
 
-    <script language="javascript" type="text/javascript">
-        isFrontPage = true;
-        dojo.addOnLoad(init);
-        dojo.addOnLoad(home_init);
-
-        try { 
-            dojo.style(dojo.byId('toptable'), 'display', 'table'); 
-        } catch(e) {
-            try {
-                dojo.style(dojo.byId('toptable'), 'display', ''); 
-            } catch(ee) {}
-        }
-
-        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
-    </script>
+    <!--#include virtual='../common/js_common_postbody.xml'-->
 </body>
 
 
diff --git a/Open-ILS/web/opac/skin/default/xml/page_advanced.xml b/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
index 0218dfb8d2..76e329703c 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
@@ -1,7 +1,5 @@
 <div id='canvas_main' class='canvas' style='margin-top: 20px;'>
 
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/advanced.js'></script>
-
 	<style type='text/css'>
 		.advanced_div { text-align: center; margin: 8px; margin-left: 2px; width: 95%; padding: 5px; }
 	</style>
diff --git a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
index c816b6d827..c34a42cf07 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
@@ -1,18 +1,5 @@
 <div id='canvas_main' class='canvas'>
 
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rdetail.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js'></script>
-
-	<script language='javascript' type='text/javascript'>
-		config.ids.rdetail = {};
-		config.ids.rdetail.view_marc = "rdetail_view_marc";
-	</script>
-
 	<table width='100%' id='np_table' class='hide_me' style='margin-top: 3px;'>
 		<tbody>
 			<tr class='color_4' style='height: 1em;'>
diff --git a/Open-ILS/web/opac/skin/default/xml/page_rresult.xml b/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
index 2d0f2f6a86..81467721a4 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
@@ -1,9 +1,11 @@
 <div>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'></script>   
+    <!--
+	<script language='javascript' type='text/javascript' src='<!==#echo var="OILS_OPAC_JS_HOST"==>/skin/default/js/sidebar_extras.js'></script>
+	<script language='javascript' type='text/javascript' src='<!==#echo var="OILS_OPAC_JS_HOST"==>/skin/default/js/rresult.js'></script>
+	<script language='javascript' type='text/javascript' src='<!==#echo var="OILS_OPAC_JS_HOST"==>/skin/default/js/result_common.js'></script>
+	<script language='javascript' type='text/javascript' src='<!==#echo var="OILS_OPAC_JS_HOST"==>/skin/default/js/tips.js'></script>
+	<script language='javascript' type='text/javascript' src='<!==#echo var="OILS_OPAC_JS_HOST"==>/skin/default/js/holds.js'></script>   
+    -->
 	<!--#include virtual="result/result_common.xml"-->
 </div>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
index 09765fd4e9..47459069a0 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
@@ -1,6 +1,4 @@
 <table class='hide_me'>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/copy_details.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js'></script>
 	<tbody>
 		<tr style='border: 3px solid #E0E0E0;' id='rdetail_volume_details_row' templateRow='1'>
 			<td colspan='10'>
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml
index 01e463bf7d..500e1f5b4c 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml
@@ -1,4 +1,3 @@
-
 <!-- This holds information for copies attached to this record -->
 <div id='rdetail_copy_info_div' class='rdetail_extras_div'>
 
@@ -71,19 +70,4 @@
 
 	<div id='rdetail_copy_info_none' class='hide_me'>&rdetail.noneAvailable;</div>
 
-	<script language='javascript' type='text/javascript'>
-		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';
-	</script>
-
 </div> <!-- copy info -->
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml
index 4a2b94dcf5..74a39cc0a5 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml
@@ -142,10 +142,6 @@
 	<div id='rdetail_preview_badge' class='hide_me'>&rdetail.extras.preview.badge;</div>
 
     <!-- ChiliFresh setup -->
-    <script language='javascript' type='text/javascript'>
-        var chilifresh = '<!--#echo var="OILS_CHILIFRESH_ACCOUNT"-->';
-        if (chilifresh == '(none)') { chilifresh = false; }
-    </script>
     <!--if expr="${OILS_CHILIFRESH_ACCOUNT} && ${OILS_CHILIFRESH_ACCOUNT}!='(none)'"-->
         <input type="hidden" id="chilifresh_account" name="chilifresh_account"
             value="<!--#echo var='OILS_CHILIFRESH_ACCOUNT'-->" />
@@ -153,7 +149,6 @@
             value="<!--#echo var='OILS_CHILIFRESH_PROFILE'-->" />
         <input type="hidden" id="chilifresh_version" name="chilifresh_version" value="onsite_v1" />
         <input type="hidden" id="chilifresh_type" name="chilifresh_type" value="search" />
-        <script language="javascript" type="text/javascript" src="<!--#echo var='OILS_CHILIFRESH_URL'-->"></script>
     <!--endif-->
 
     <!-- Novelist setup -->
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
index bd5f8c6277..00a80bdafd 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
@@ -206,34 +206,5 @@
 	<abbr name="unapi" class="unapi-id">
 		<!-- unAPI URI goes here -->
 	</abbr>
-
-	<script language='javascript' type='text/javascript'><![CDATA[
-
-		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';
-
-        dojo.addOnLoad(function() {
-            setTimeout( function () {
-                var here = findOrgUnit(getLocation());
-                if (getDepth() > 0 || getDepth === 0 ) {
-                    while (getDepth() < findOrgDepth(here))
-                        here = findOrgUnit( here.parent_ou() );
-                }
-    
-                dojo.require('openils.BibTemplate');
-                new openils.BibTemplate({ record : new CGI().param('r'), org_unit : here.shortname() }).render();
-            }, 0);
-        });
-	]]></script>
-
 </div> <!-- details_body -->
 
diff --git a/Open-ILS/web/opac/skin/default/xml/result/result_common.xml b/Open-ILS/web/opac/skin/default/xml/result/result_common.xml
index 86848ab51f..07cc8b7f60 100644
--- a/Open-ILS/web/opac/skin/default/xml/result/result_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result/result_common.xml
@@ -2,6 +2,7 @@
 <div id='canvas_main' class='canvas' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
 	<script language='javascript' type='text/javascript'>
+        /*
 		config.ids.result = {};
 		config.css.result = {};
 		config.names.result = {};
@@ -26,6 +27,7 @@
 		config.names.result.item_author	= "item_author";
 		config.names.result.counts_row	= "counts_row";
 		config.names.result.count_cell	= "copy_count_cell";
+        */
 	</script>
 
 	<!--#include virtual="result_table.xml"-->
diff --git a/Open-ILS/web/opac/skin/default/xml/result/result_table.xml b/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
index 46edda88c0..f6253954b5 100644
--- a/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
@@ -213,11 +213,13 @@
    <!-- ====================== -->
 
 
+    <!--
 	<script language='javascript' type='text/javascript'>
 		config.names.result.format_cell = 'result_table_format_cell';
 		config.names.result.format_link = 'resource_link'
 		config.names.result.format_pic = 'format_pic'
 	</script>
+    -->
 
     <!-- ChiliFresh setup -->
     <script language='javascript' type='text/javascript'>
-- 
2.11.0