Merge pull request #443 from SEEG-Oxford/loose-ends

Google analytics in content frames bug
SEEG-Oxford · Mar 30, 2016 · 1ba03a6 · 1ba03a6
2 parents 43eb8f6 + 760c12d
commit 1ba03a6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/src/PublicSite/web/WEB-INF/freemarker/analytics.ftl b/src/PublicSite/web/WEB-INF/freemarker/analytics.ftl
@@ -0,0 +1,11 @@
+<script>
+    // Setup temporary Google Analytics objects.
+    window.GoogleAnalyticsObject = "ga";
+    window.ga = function () { (window.ga.q = window.ga.q || []).push(arguments); };
+    window.ga.l = 1 * new Date();
+
+    // Setup analytics account
+    window.ga("create", "${googleAnalyticsKey}", {
+        "cookieDomain": window.location.hostname
+    });
+</script>
diff --git a/src/PublicSite/web/WEB-INF/freemarker/atlas/content.ftl b/src/PublicSite/web/WEB-INF/freemarker/atlas/content.ftl
@@ -26,6 +26,7 @@
     <link rel="stylesheet" href="<@spring.url "/ext/jquery/flipclock/flipclock.css" />">
     <link rel="stylesheet" href="<@spring.url "/css/map.css" />">
     <link rel="stylesheet" href="<@spring.url "/css/atlas.css" />">
+    <#include "../analytics.ftl"/>
 </head>
 <body>
     <div id="map">

diff --git a/src/PublicSite/web/WEB-INF/freemarker/datavalidation/content.ftl b/src/PublicSite/web/WEB-INF/freemarker/datavalidation/content.ftl
@@ -23,6 +23,7 @@
     <link rel="stylesheet" href="<@spring.url "/ext/jquery/flipclock/flipclock.css" />">
     <link rel="stylesheet" href="<@spring.url "/css/map.css" />">
     <link rel="stylesheet" href="<@spring.url "/css/dataValidation.css" />">
+    <#include "../analytics.ftl"/>
 </head>
 <body>
     <div id="dataValidation">

diff --git a/src/PublicSite/web/WEB-INF/freemarker/layout/common.ftl b/src/PublicSite/web/WEB-INF/freemarker/layout/common.ftl
@@ -11,17 +11,7 @@
             <link rel="stylesheet" href="<@spring.url "/css/login.css" />">
         </#if>
         <link rel="stylesheet" href="<@spring.url "/ext/jquery/cookiecuttr/jquery.cookiecuttr.css" />">
-        <script>
-            // Setup temporary Google Analytics objects.
-            window.GoogleAnalyticsObject = "ga";
-            window.ga = function () { (window.ga.q = window.ga.q || []).push(arguments); };
-            window.ga.l = 1 * new Date();
-
-            // Setup analytics account
-            window.ga("create", "${googleAnalyticsKey}", {
-                "cookieDomain": window.location.hostname
-            });
-        </script>
+        <#include "../analytics.ftl"/>
         ${endOfHead}
     </#assign>