Merge branch 'master' of github.com:chrisglass/tribaal-mnmlist

templates/analytics.html

@@ -1,11 +1,12 @@
 {% if GOOGLE_ANALYTICS %}
-    <script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript async src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+    <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', '{{GOOGLE_ANALYTICS}}', 'auto');
+    ga('send', 'pageview');
+
     </script>
-    <script type="text/javascript">
-    try {
-        var pageTracker = _gat._getTracker("{{GOOGLE_ANALYTICS}}");
-    pageTracker._trackPageview();
-    } catch(err) {}</script>
 {% endif %}