From 6f63ec40cdfc9f3104f259d2be185062541f440d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Adri=C3=A1n=20Ca=C3=B1ones=20Castellano?=
 <davidarcano@gmail.com>
Date: Fri, 8 Sep 2017 17:31:50 +0200
Subject: [PATCH] Opengraph and Twittercard URLS fixing + new g.analytics
 global tracker

---
 templates/analytics.html | 31 +++++++++++++++----------------
 templates/article.html   |  4 ++--
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/templates/analytics.html b/templates/analytics.html
index e27adf8..6332927 100644
--- a/templates/analytics.html
+++ b/templates/analytics.html
@@ -1,17 +1,16 @@
 {% if GOOGLE_ANALYTICS %}
-    <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '{{GOOGLE_ANALYTICS}}']);
-    _gaq.push(['_trackPageview']);
-    (function() {
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-    </script>
+<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', '{{GOOGLE_ANALYTICS}}', 'auto');
+    ga('send', 'pageview');
+</script>
 {% endif %}
 {% if GAUGES %}
-    <script type="text/javascript">
+<script type="text/javascript">
     var _gauges = _gauges || [];
     (function() {
         var t   = document.createElement('script');
@@ -23,14 +22,14 @@
         var s = document.getElementsByTagName('script')[0];
         s.parentNode.insertBefore(t, s);
     })();
-    </script>
+</script>
 {% endif %}
 {% if PIWIK_URL and PIWIK_SITE_ID %}
-    <script type="text/javascript">
+<script type="text/javascript">
     {% if PIWIK_SSL_URL %}
-        var pkBaseURL = "{{ PIWIK_SSL_URL }}";
+    var pkBaseURL = "{{ PIWIK_SSL_URL }}";
     {% else %}
-        var pkBaseURL = "{{ PIWIK_URL }}";
+    var pkBaseURL = "{{ PIWIK_URL }}";
     {% endif %}
     var _paq = _paq || [];
     _paq.push(["trackPageView"]);
@@ -42,5 +41,5 @@
         var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
         g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
     })();
-    </script>
+</script>
 {% endif %}
diff --git a/templates/article.html b/templates/article.html
index fa5c53a..609dbe7 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -38,7 +38,7 @@
                 <meta property="twitter:image" content="{{ SITEURL }}/{{ article.twitter_image }}">
             {% endif %}
         {% elif article.header_cover %}
-            <meta name="twitter:image" content="{{ SITEURL }}/{{ article.header_cover }}">
+            <meta name="twitter:image" content="{{ SITEURL }}{{ article.header_cover }}">
         {% elif HEADER_COVER %}
             <meta name="twitter:image" content="{{ SITEURL }}/{{ HEADER_COVER }}">
         {% else %}
@@ -78,7 +78,7 @@
                 <meta property="og:image" content="{{ SITEURL }}/{{ article.og_image }}">
             {% endif %}
         {% elif article.header_cover %}
-            <meta property="og:image" content="{{ SITEURL }}/{{ article.header_cover }}">
+            <meta property="og:image" content="{{ SITEURL }}{{ article.header_cover }}">
         {% elif HEADER_COVER %}
             <meta property="og:image" content="{{ SITEURL }}/{{ HEADER_COVER }}">
         {% else %}