From 217cfae290b9a56ac6c675dac824b3393ddabbcc Mon Sep 17 00:00:00 2001
From: Bill Erickson <erickson@esilibrary.com>
Date: Wed, 15 Dec 2010 16:51:44 -0500
Subject: [PATCH] moved google analytics code into main script block; minor
 cleanup;  only need 1 novelist/chilfresh chunk since it requires separate 
 script chunk anyway

---
 Open-ILS/web/opac/skin/kcls/xml/body.xml           | 11 +++++++++++
 .../web/opac/skin/kcls/xml/common/js_common.xml    | 22 ++++++++++++----------
 .../skin/kcls/xml/common/js_common_postbody.xml    | 22 ++++++++++++----------
 Open-ILS/web/opac/skin/kcls/xml/footer.xml         | 16 ----------------
 4 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/Open-ILS/web/opac/skin/kcls/xml/body.xml b/Open-ILS/web/opac/skin/kcls/xml/body.xml
index 1ace5ad2b9..271a638016 100644
--- a/Open-ILS/web/opac/skin/kcls/xml/body.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/body.xml
@@ -67,4 +67,15 @@
 <!--#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/kcls/xml/common/js_common.xml b/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml
index b91960a02a..5a86bad8a2 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
@@ -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/kcls/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>
@@ -55,7 +55,7 @@
 <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"-->/DP_DateExtensions.js'></script>
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js'></script>
 <!--END COMPRESSION--> 
 <!--#endif -->
@@ -328,14 +328,16 @@
         //alert(errCounter+'\n'+errCounter2);
     });
 
-]]> </script>
+    /* google analytics */
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-3018520-10']);
+    _gaq.push(['_trackPageview']);
 
-<!-- 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-->
+    (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
 
+]]> </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 e9b7c28cf3..89c66741e2 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
@@ -36,7 +36,6 @@
 
     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/kcls/js/combined.js')
@@ -47,6 +46,7 @@
         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');
@@ -292,6 +292,17 @@
         });
     }
 
+    /* google analytics */
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-3018520-10']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+
     dojo.addOnLoad(
 
         function() {
@@ -304,12 +315,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-->
-
diff --git a/Open-ILS/web/opac/skin/kcls/xml/footer.xml b/Open-ILS/web/opac/skin/kcls/xml/footer.xml
index 9692f713c4..8066152383 100644
--- a/Open-ILS/web/opac/skin/kcls/xml/footer.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/footer.xml
@@ -4,22 +4,6 @@
 <div id="footer">
 
 <a href="http://www.kcls.org/usingthelibrary/request/">Request a Purchase</a> &nbsp;|&nbsp; <a href="http://www.kcls.org/usingthelibrary/request/">Interlibrary Loan</a> &nbsp;|&nbsp; <a href="http://www.kcls.org/about/contact/">Contact Us</a> &nbsp;|&nbsp; <a href="http://www.kcls.org/usingthelibrary/catalog_help/">Site Help</a> &nbsp;|&nbsp; <a href="http://www.kcls.org/usingthelibrary/policies/privacy.cfm">Privacy Statement</a> &nbsp;|&nbsp; <a href="http://www.kcls.org/about/support/">Support KCLS</a> &nbsp;|&nbsp; <a href="http://www.kcls.org/employment/">Employment</a>
-<!--Google Analytics-->
-
-<script type="text/javascript">
-
- var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-3018520-10']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
-<!--End Google Analytics-->
  
 </div>
 <!-- ****************** end: footer.xml ***************************** -->]]>
-- 
2.11.0