[arvados] updated: 2.7.0-5653-g1ce5e9e86f
git repository hosting
git at public.arvados.org
Thu Dec 21 15:56:16 UTC 2023
Summary of changes:
doc/_config.yml | 3 +++
doc/_includes/_google_analytics.liquid | 21 +++++++++++++++++++++
doc/_includes/_matomo_analytics.liquid | 16 ++++++++++++++++
doc/_layouts/default.html.liquid | 22 ++--------------------
4 files changed, 42 insertions(+), 20 deletions(-)
create mode 100644 doc/_includes/_google_analytics.liquid
create mode 100644 doc/_includes/_matomo_analytics.liquid
via 1ce5e9e86f6387a77fe90b8ccd2f87d17b0288de (commit)
from 05094973696294e4d9effe87b9e9e45b06d89835 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 1ce5e9e86f6387a77fe90b8ccd2f87d17b0288de
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Dec 21 10:16:14 2023 -0500
21305: Refactor and respect do not track for GA
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/doc/_config.yml b/doc/_config.yml
index 2422a2248c..ad2864ca3a 100644
--- 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
index 0000000000..05de01a1c5
--- /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
index 0000000000..5b65cf5077
--- /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 311659de7e..2144695d1a 100644
--- 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">
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list