From e7537865c2486e643d47d3974eb6e7d519c2c201 Mon Sep 17 00:00:00 2001
From: Dan Scott <dan@coffeecode.net>
Date: Fri, 19 Aug 2011 16:35:12 -0400
Subject: [PATCH] Disable Google Analytics in T-PAC by default

The option to enable Google Analytics has been turned into a config
setting in parts/config.tt2 for now, with a place to set the GA account
code.

Also, get consistent with foo.enabled instead of a mix of foo.enable /
foo.enabled in config.tt2.

Also, be a bit more careful about whitespace and hide comments in the
HTML source about things that are disabled (such as ChiliFresh and
Google Analytics) until they are enabled.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---
 Open-ILS/src/templates/default/opac/parts/chilifresh.tt2 |  9 +++------
 Open-ILS/src/templates/default/opac/parts/config.tt2     | 11 ++++++++++-
 Open-ILS/src/templates/default/opac/parts/js.tt2         | 16 +++++++++-------
 .../src/templates/default/opac/parts/record/summary.tt2  |  6 +++---
 .../src/templates/default/opac/parts/result/table.tt2    |  2 +-
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Open-ILS/src/templates/default/opac/parts/chilifresh.tt2 b/Open-ILS/src/templates/default/opac/parts/chilifresh.tt2
index d58b3f5b97..937e20f3f7 100644
--- a/Open-ILS/src/templates/default/opac/parts/chilifresh.tt2
+++ b/Open-ILS/src/templates/default/opac/parts/chilifresh.tt2
@@ -1,13 +1,11 @@
-
-<!-- Set up the chilifresh account information and load the JS -->
-
-[%  IF ENV.OILS_CHILIFRESH_URL AND ENV.OILS_CHILIFRESH_ACCOUNT 
+[%-  IF ENV.OILS_CHILIFRESH_URL AND ENV.OILS_CHILIFRESH_ACCOUNT 
             AND (ctx.page == 'rresult' OR ctx.page == 'record');
         chili_url = ENV.OILS_CHILIFRESH_URL;
         IF CGI.https AND ENV.OILS_CHILIFRESH_HTTPS_URL;
             chili_url = ENV.OILS_CHILIFRESH_HTTPS_URL;
         END; 
 %]
+    <!-- Set up the chilifresh account information and load the JS -->
     <input type="hidden" id="chilifresh_account" name="chilifresh_account" value="[% ENV.OILS_CHILIFRESH_ACCOUNT %]"/>
     <!--
     <input type="hidden" id="chilifresh_profile" name="chilifresh_profile" value="[% ENV.OILS_CHILIFRESH_PROFILE %]"/>
@@ -16,5 +14,4 @@
     <input type="hidden" id="chilifresh_type" name="chilifresh_type" value="search" />
     <script type="text/javascript" src="[% chili_url %]"></script>
     <script>try { setTimeout(chili_init, 0); } catch(E) {}</script>
-[% END %]
-
+[%- END %]
diff --git a/Open-ILS/src/templates/default/opac/parts/config.tt2 b/Open-ILS/src/templates/default/opac/parts/config.tt2
index 4c2630175e..a792838227 100644
--- a/Open-ILS/src/templates/default/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/default/opac/parts/config.tt2
@@ -9,7 +9,7 @@
 # RefWorks configuration
 ##############################################################################
 # RefWorks is a Web-based citation manager
-ctx.refworks.enable = 'false';
+ctx.refworks.enabled = 'false';
 
 # Base URL for RefWorks
 ctx.refworks.url = 'http://www.refworks.com';
@@ -32,4 +32,13 @@ ctx.refworks.url = 'http://www.refworks.com';
 openurl.enabled = 'false';
 openurl.baseurl = 'http://sfx.example.com/instance';
 
+##############################################################################
+# Google Analytics support
+##############################################################################
+# You can enable Google Analytics support in Evergreen by entering a
+# valid Google Analytics code and changing 'false' to 'true'
+##############################################################################
+google_analytics.enabled = 'false';
+google_analytics.code = 'UA-9999999-99';
+
 %]
diff --git a/Open-ILS/src/templates/default/opac/parts/js.tt2 b/Open-ILS/src/templates/default/opac/parts/js.tt2
index b69c90b1c4..b117131342 100644
--- a/Open-ILS/src/templates/default/opac/parts/js.tt2
+++ b/Open-ILS/src/templates/default/opac/parts/js.tt2
@@ -1,22 +1,24 @@
 <!-- JS imports, etc.  -->
-
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/simple.js"></script>
 
-[% IF ctx.is_staff %]
+[%- PROCESS "default/opac/parts/config.tt2"; %]
+
+[%- IF ctx.is_staff %]
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/staff.js"></script>
-[% END %]
+[%- END %]
 
-[% IF ENV.OILS_NOVELIST_URL AND ctx.page == 'record';
+[%- IF ENV.OILS_NOVELIST_URL AND ctx.page == 'record';
     url = ENV.OILS_NOVELIST_URL;
     IF CGI.https; url = url.replace('^http:', 'https:'); END; %]
 <script type='text/javascript' id='EIT' src='[% url %]'></script>
-[% END %]
+[%- END %]
 
+[%- IF google_analytics.enabled == 'true' %]
 <!-- Google Analytics -->
 <script type="text/javascript">
 /* uncomment when ready */ /*
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-3018520-10']);
+  _gaq.push(['_setAccount', '[% google_analytics.code %]']);
   _gaq.push(['_trackPageview']);
 
   (function() {
@@ -27,4 +29,4 @@
 */
 </script>
 <!-- End Google Analytics -->
-
+[%- END %]
diff --git a/Open-ILS/src/templates/default/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/default/opac/parts/record/summary.tt2
index 4aca69342d..4fed6d024d 100644
--- a/Open-ILS/src/templates/default/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/default/opac/parts/record/summary.tt2
@@ -5,9 +5,9 @@
 <!-- ****************** rdetail_summary.xml ***************************** -->
 <abbr class="unapi-id" title='tag:[% ctx.hostname %],[% date.format(date.now, '%Y') %]:biblio-record_entry/[% ctx.bre_id %]'></abbr>
 
-[% IF ctx.refworks.enable == 'true' %]
+[%- IF ctx.refworks.enabled == 'true' %]
     [% INCLUDE 'default/opac/parts/record/refworks.tt2' %]
-[% END %]
+[%- END %]
 
 <!-- This holds the record summary information -->
 
@@ -80,7 +80,7 @@
                             </td>
                             <td valign="top" id='rdetail_physical_desc'>[% attrs.phys_desc | html %]</td>
                         </tr>
-                        [% IF openurl.enabled == 'true';
+                        [%- IF openurl.enabled == 'true';
                             FOR issn IN args.issns;
                                 sfx = ResolverResolver.resolve_issn(issn, openurl.baseurl);
                                 FOR res IN sfx;
diff --git a/Open-ILS/src/templates/default/opac/parts/result/table.tt2 b/Open-ILS/src/templates/default/opac/parts/result/table.tt2
index 9884045e6b..75751ff4d2 100644
--- a/Open-ILS/src/templates/default/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/default/opac/parts/result/table.tt2
@@ -97,7 +97,7 @@
                                                                 <td>[% attrs.isbns.0 | html %]</td>
                                                             </tr>
                                                         [% END %]
-                                                        [% IF openurl.enabled == 'true';
+                                                        [%- IF openurl.enabled == 'true';
                                                             FOR issn IN args.issns;
                                                                 sfx = ResolverResolver.resolve_issn(issn, openurl.baseurl);
                                                                 FOR res IN sfx;
-- 
2.11.0