[arvados] created: 2.7.0-5652-g0509497369
git repository hosting
git at public.arvados.org
Thu Dec 21 14:49:46 UTC 2023
at 05094973696294e4d9effe87b9e9e45b06d89835 (commit)
commit 05094973696294e4d9effe87b9e9e45b06d89835
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Dec 21 09:49:24 2023 -0500
21305: Refactor piwik and GA tracking a little bit
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/doc/_layouts/default.html.liquid b/doc/_layouts/default.html.liquid
index 15196481aa..311659de7e 100644
--- a/doc/_layouts/default.html.liquid
+++ b/doc/_layouts/default.html.liquid
@@ -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>
commit 1567b25b4245b2f0fa626413e9a42eaef7ca4be5
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Dec 21 09:20:09 2023 -0500
21305: Add piwik and google analytics tracking to layout
This used to be a hidden branch that was cherry-picked called
"public-site-piwik", so this just brings it into the main branch to be
able to maintain it.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/doc/_layouts/default.html.liquid b/doc/_layouts/default.html.liquid
index 7beb1cedbf..15196481aa 100644
--- a/doc/_layouts/default.html.liquid
+++ b/doc/_layouts/default.html.liquid
@@ -74,5 +74,34 @@ 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>
commit 2fb40dec667f6f2c750b08d07e7f575a3289bdee
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Dec 21 09:18:04 2023 -0500
21305: Add meta robots noindex when current doesn't match latest
The goal is to get Google to only display results for the current
version of the documentation pages.
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 96e46cda22..2422a2248c 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -11,6 +11,7 @@
baseurl:
current_version:
all_versions:
+latest_version:
arvados_api_host: localhost
arvados_cluster_uuid: local
arvados_workbench_host: http://localhost
diff --git a/doc/_layouts/default.html.liquid b/doc/_layouts/default.html.liquid
index f07f330544..7beb1cedbf 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">
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list