[arvados] updated: 2.1.0-136-gaae8d2efb3

[git repository hosting]

Summary of changes:
 doc/_config.yml                        |  4 ++++
 doc/_includes/_google_analytics.liquid | 21 +++++++++++++++++++++
 doc/_includes/_matomo_analytics.liquid | 16 ++++++++++++++++
 doc/_layouts/default.html.liquid       | 17 +++++++----------
 4 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 doc/_includes/_google_analytics.liquid
 create mode 100644 doc/_includes/_matomo_analytics.liquid

       via  aae8d2efb32f662aa79ddc28e731ea594af29214 (commit)
      from  0813955cbdc8694ef656128326234bac67b59940 (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 aae8d2efb32f662aa79ddc28e731ea594af29214
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Dec 21 13:51:09 2023 -0500

    Merge branch '21305-doc-maintenance' refs #21305
    
    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 ebb70fa152..7874b71597 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -13,9 +13,13 @@
 baseurl:
 current_version:
 all_versions:
+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 f07f330544..2144695d1a 100644
--- a/doc/_layouts/default.html.liquid
+++ b/doc/_layouts/default.html.liquid
@@ -10,8 +10,11 @@ SPDX-License-Identifier: CC-BY-SA-3.0
     <meta charset="utf-8">
     <title>{% unless page.title == "Arvados | Documentation" %} Arvados {% if page.navmenu %}| {{ page.navmenu }} {% endif %} | {% endunless %}{{ page.title }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
+    <meta name="description" content="Arvados documentation site">
+    <meta name="author" content="Arvados authors">
+    {% if site.current_version != site.latest_version %}
+    <meta name="robots" content="noindex">
+    {% endif %}
     <link rel="icon" href="{{ site.baseurl }}/images/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="{{ site.baseurl }}/images/favicon.ico" type="image/x-icon">
     <link href="{{ site.baseurl }}/css/bootstrap.css" rel="stylesheet">
@@ -27,15 +30,9 @@ 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>
 
-    <!-- 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());
+    {% include 'matomo_analytics' %}
+    {% include 'google_analytics' %}
 
-      gtag('config', 'G-EFLSBXJ5SQ');
-    </script>
   </head>
   <body class="nopad">
     {% include 'navbar_top' %}

-----------------------------------------------------------------------


hooks/post-receive
--