Update Google analytics code

diff --git a/app/templates/base.html b/app/templates/base.html
index 7eeabbbbadf5e84d94a6ba4f6383527d340cd7fa..cf3fac5c37011fe22f3c11c0eee0cef04865f21b 100644 (file)
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -219,12 +219,4 @@
     {% endspaceless %}
 
 </body>
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-XXXXXX-XX', 'auto');
-  ga('send', 'pageview');
-</script>
 </html>

diff --git a/app/templates/includes/footer_scripts.html b/app/templates/includes/footer_scripts.html
index 3d8c5818090bc9127bf10a7772932e110aaabb5c..83ad864685de03acc89ced0192685af47544b23f 100644 (file)
--- a/app/templates/includes/footer_scripts.html
+++ b/app/templates/includes/footer_scripts.html
@@ -18,16 +18,13 @@
 {% editable_loader %}
 {% endcompress %}
 
-<script>
 {% if settings.GOOGLE_ANALYTICS_ID and not request.user.is_staff %}
-var _gaq = _gaq || [['_trackPageview']];
-_gaq.unshift(['_setAccount', '{{ settings.GOOGLE_ANALYTICS_ID }}']);
-(function(d, t) {
-    var g = d.createElement(t),
-        s = d.getElementsByTagName(t)[0];
-    g.async = true;
-    g.src = '//www.google-analytics.com/ga.js';
-    s.parentNode.insertBefore(g, s);
-})(document, 'script');
-{% endif %}
+<script>
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+ga('create', '{{ settings.GOOGLE_ANALYTICS_ID }}', 'auto');
+ga('send', 'pageview');
 </script>
+{% endif %}