projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0509497)
21305: Refactor and respect do not track for GA 21305-doc-maintenance
authorPeter Amstutz <peter.amstutz@curii.com>
Thu, 21 Dec 2023 15:16:14 +0000 (10:16 -0500)
committerPeter Amstutz <peter.amstutz@curii.com>
Thu, 21 Dec 2023 15:55:57 +0000 (10:55 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

doc/_config.yml patch | blob | history
doc/_includes/_google_analytics.liquid [new file with mode: 0644] patch | blob
doc/_includes/_matomo_analytics.liquid [new file with mode: 0644] patch | blob
doc/_layouts/default.html.liquid patch | blob | history

diff --git a/doc/_config.yml b/doc/_config.yml
index 2422a2248c56f11a6035a4bfd416f8d4f16e6732..ad2864ca3a2361e526197c046bf184bc4eda8e18 100644 (file)
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -15,6 +15,9 @@ latest_version:
 arvados_api_host: localhost
 arvados_cluster_uuid: local
 arvados_workbench_host: http://localhost
+google_analytics: "G-EFLSBXJ5SQ"
+matomo_analytics_url: "https://piwik.arvados.org"
+matomo_analytics_siteid: "3"
 
 exclude: ["Rakefile", "tmp", "vendor"]
 
diff --git a/doc/_includes/_google_analytics.liquid b/doc/_includes/_google_analytics.liquid
new file mode 100644 (file)
index 0000000..05de01a
--- /dev/null
+++ b/doc/_includes/_google_analytics.liquid
@@ -0,0 +1,21 @@
+{% comment %}
+Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: CC-BY-SA-3.0
+{% endcomment %}
+
+<script>
+  window['ga-disable-{{ site.google_analytics }}'] =
+    window.doNotTrack === '1' ||
+    navigator.doNotTrack === '1' ||
+    navigator.doNotTrack === 'yes' ||
+    navigator.msDoNotTrack === '1';
+  window.dataLayer = window.dataLayer || [];
+  function gtag() {
+    window.dataLayer.push(arguments);
+  }
+  gtag('js', new Date());
+
+  gtag('config', '{{ site.google_analytics }}');
+</script>
+<script defer src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
\ No newline at end of file
diff --git a/doc/_includes/_matomo_analytics.liquid b/doc/_includes/_matomo_analytics.liquid
new file mode 100644 (file)
index 0000000..5b65cf5
--- /dev/null
+++ b/doc/_includes/_matomo_analytics.liquid
@@ -0,0 +1,16 @@
+{% comment %}
+Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: CC-BY-SA-3.0
+{% endcomment %}
+
+<!-- Matomo analytics (used to be called "Piwik") -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+  _paq.push(["setTrackerUrl", "{{ site.matomo_analytics_url }}/piwik.php"]);
+  _paq.push(["setSiteId", "{{ site.matomo_analytics_siteid }}"]);
+</script>
+<script defer src="{{ site.matomo_analytics_url }}/piwik.js"></script>
+<!-- End Matomo code -->
diff --git a/doc/_layouts/default.html.liquid b/doc/_layouts/default.html.liquid
index 311659de7e09307065cfa58bde20d45f8fed8dd3..2144695d1a2b004a8b7735a07b6cfa5efa030d8f 100644 (file)
--- a/doc/_layouts/default.html.liquid
+++ b/doc/_layouts/default.html.liquid
@@ -30,26 +30,8 @@ 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>
-      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 -->
+    {% include 'matomo_analytics' %}
+    {% include 'google_analytics' %}
 
   </head>
   <body class="nopad">