21305: Refactor piwik and GA tracking a little bit
authorPeter Amstutz <peter.amstutz@curii.com>
Thu, 21 Dec 2023 14:49:24 +0000 (09:49 -0500)
committerPeter Amstutz <peter.amstutz@curii.com>
Thu, 21 Dec 2023 14:49:24 +0000 (09:49 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

doc/_layouts/default.html.liquid

index 15196481aac1abf7e5938c63f03a4eca30d2b99b..311659de7e09307065cfa58bde20d45f8fed8dd3 100644 (file)
@@ -30,15 +30,27 @@ SPDX-License-Identifier: CC-BY-SA-3.0
     <script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
     <script src="https://hypothes.is/embed.js" async></script>
 
+    <!-- Matomo analytics (used to be called "Piwik") -->
+    <script type="text/javascript">
+      var _paq = _paq || [];
+      _paq.push(["trackPageView"]);
+      _paq.push(["enableLinkTracking"]);
+      _paq.push(["setTrackerUrl", "https://piwik.arvados.org/piwik.php"]);
+      _paq.push(["setSiteId", "3"]);
+    </script>
+    <script defer src="https://piwik.arvados.org/piwik.js"></script>
+    <!-- End Matomo code -->
+
     <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-EFLSBXJ5SQ"></script>
     <script>
       window.dataLayer = window.dataLayer || [];
       function gtag(){dataLayer.push(arguments);}
       gtag('js', new Date());
-
       gtag('config', 'G-EFLSBXJ5SQ');
     </script>
+    <script defer src="https://www.googletagmanager.com/gtag/js?id=G-EFLSBXJ5SQ"></script>
+    <!-- End Google Analytics -->
+
   </head>
   <body class="nopad">
     {% include 'navbar_top' %}
@@ -74,34 +86,5 @@ Code samples in this documentation are licensed under the
 </p>
 {% endif %}
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-
-  (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.arvados.org/";
-    _paq.push(["setTrackerUrl", u+"piwik.php"]);
-    _paq.push(["setSiteId", "3"]);
-    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>
-<!-- End Piwik Code -->
-
-<!-- Google Analytics -->
-<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', 'UA-40055979-2', 'auto');
-  ga('send', 'pageview');
-
-</script>
-<!-- End Google Analytics -->
-
   </body>
 </html>