condense and protect chilifresh and novelist loading; move org lasso into condense...

diff --git a/Open-ILS/web/opac/skin/default/xml/body.xml b/Open-ILS/web/opac/skin/default/xml/body.xml
index b9b3bb8..0e44596 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/body.xml
+++ b/Open-ILS/web/opac/skin/default/xml/body.xml
@@ -39,4 +39,16 @@
 <!--#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' src='<!--#echo var='OILS_NOVELIST_URL'-->'></script>
+    <!--#endif-->
+<!--#endif-->
+
 </body>

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 82ce698..b818155 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
@@ -34,7 +34,6 @@
 
 <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>
@@ -45,6 +44,7 @@
     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>
@@ -301,15 +301,6 @@
 
 ]]> </script>
 
-<!-- these can't be loaded via XHR -->
-<!--#if expr="$OILS_CHILIFRESH_ACCOUNT && $OILS_CHILIFRESH_ACCOUNT != '(none)'"-->
-<script type='text/javascript' src='<!--#echo var='OILS_CHILIFRESH_URL'-->'></script>
-<!--#endif-->
-<!--#if expr="${OILS_NOVELIST_URL} && ${OILS_NOVELIST_URL}!='(none)'"-->
-<script type='text/javascript' src='<!--#echo var='OILS_NOVELIST_URL'-->'></script>
-<!--#endif-->
-
-
 <!--#if expr="$HTTP_USER_AGENT = /MSIE/"-->
 <script language='javascript' type='text/javascript' 
     src='<!--#echo var="OILS_PROTOCOL"-->://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js'></script>
@@ -329,5 +320,4 @@
 <!--#endif-->
 
 
-
 <!--#endif-->

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
index 301e482..d10ee3d 100644 (file)
--- 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
@@ -29,33 +29,33 @@
     dojo.require("dojo.cookie");
     dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N
 
-    function 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');
+
+    <!--#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"-->/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');
+    /* END COMPRESSION */
+    <!--#endif -->
 
-        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 -->
+    function skin_init() {
 
         config.css.color_1 = "color_1";
         config.css.color_2 = "color_2";
@@ -275,12 +275,3 @@
         }
     );
 ]]></script>
-
-<!-- these can't be loaded via XHR -->
-<!--#if expr="$OILS_CHILIFRESH_ACCOUNT && $OILS_CHILIFRESH_ACCOUNT != '(none)'"-->
-<script type='text/javascript' src='<!--#echo var='OILS_CHILIFRESH_URL'-->'></script>
-<!--#endif-->
-<!--#if expr="${OILS_NOVELIST_URL} && ${OILS_NOVELIST_URL}!='(none)'"-->
-<script type='text/javascript' src='<!--#echo var='OILS_NOVELIST_URL'-->'></script>
-<!--#endif-->
-