From 31c62b6d11301ab527628d3e9eaa527b4bc19af8 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 27 Oct 2016 12:19:01 +0200
Subject: [PATCH] Update Google analytics code

---
 app/templates/base.html                    |  8 --------
 app/templates/includes/footer_scripts.html | 19 ++++++++-----------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/app/templates/base.html b/app/templates/base.html
index 7eeabbbb..cf3fac5c 100644
--- 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 3d8c5818..83ad8646 100644
--- 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 %}
-- 
2.39.5