From c8f20adbf6451aece61b1b2abbc47b025e4de77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=B8?= Date: Wed, 11 Aug 2021 21:26:30 +0200 Subject: [PATCH 01/12] matomo-tracking --- .../theme/assets/javascripts/matomo-tracking.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 content/theme/assets/javascripts/matomo-tracking.js diff --git a/content/theme/assets/javascripts/matomo-tracking.js b/content/theme/assets/javascripts/matomo-tracking.js new file mode 100644 index 0000000000..98e030a68e --- /dev/null +++ b/content/theme/assets/javascripts/matomo-tracking.js @@ -0,0 +1,15 @@ + + + From eb740b3ac43c497a583b1f752608c6d7bfb310c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=B8?= Date: Wed, 11 Aug 2021 21:27:37 +0200 Subject: [PATCH 02/12] extra_javascript --- mkdocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mkdocs.yml b/mkdocs.yml index b84b162b7e..22a4ee9f0d 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -199,6 +199,7 @@ extra_javascript: - path: https://platform.twitter.com/widgets.js async: true defer: true + - "theme/assets/javascripts/matomo-tracking.js" # Extensions to enhance markdown - see: https://squidfunk.github.io/mkdocs-material/getting-started/#extensions markdown_extensions: From c6ebbd9401e5170b6a958785c55f29321ed9016a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=B8?= Date: Wed, 11 Aug 2021 21:43:20 +0200 Subject: [PATCH 03/12] Update matomo-tracking.js --- content/theme/assets/javascripts/matomo-tracking.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/content/theme/assets/javascripts/matomo-tracking.js b/content/theme/assets/javascripts/matomo-tracking.js index 98e030a68e..9cfec8adb9 100644 --- a/content/theme/assets/javascripts/matomo-tracking.js +++ b/content/theme/assets/javascripts/matomo-tracking.js @@ -2,6 +2,9 @@ + From 2fc5d7852a477f59305b64286412b4fb6f732798 Mon Sep 17 00:00:00 2001 From: Julien Moura Date: Fri, 17 Sep 2021 17:59:17 +0200 Subject: [PATCH 04/12] Embed matomo into head instead of body --- content/theme/assets/javascripts/matomo-tracking.js | 3 --- mkdocs.yml | 1 - 2 files changed, 4 deletions(-) diff --git a/content/theme/assets/javascripts/matomo-tracking.js b/content/theme/assets/javascripts/matomo-tracking.js index 9cfec8adb9..533930c6a6 100644 --- a/content/theme/assets/javascripts/matomo-tracking.js +++ b/content/theme/assets/javascripts/matomo-tracking.js @@ -1,7 +1,5 @@ - - diff --git a/mkdocs.yml b/mkdocs.yml index 22a4ee9f0d..b84b162b7e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -199,7 +199,6 @@ extra_javascript: - path: https://platform.twitter.com/widgets.js async: true defer: true - - "theme/assets/javascripts/matomo-tracking.js" # Extensions to enhance markdown - see: https://squidfunk.github.io/mkdocs-material/getting-started/#extensions markdown_extensions: From 3f8f37f3e7fe099242eafff698d385ee78e5f433 Mon Sep 17 00:00:00 2001 From: Julien Moura Date: Tue, 21 Sep 2021 14:25:34 +0200 Subject: [PATCH 05/12] Use partials --- .../integrations/analytics/matomo.html | 18 ++++++++++++++++++ mkdocs.yml | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 content/theme/partials/integrations/analytics/matomo.html diff --git a/content/theme/partials/integrations/analytics/matomo.html b/content/theme/partials/integrations/analytics/matomo.html new file mode 100644 index 0000000000..54a8c3c195 --- /dev/null +++ b/content/theme/partials/integrations/analytics/matomo.html @@ -0,0 +1,18 @@ + + diff --git a/mkdocs.yml b/mkdocs.yml index b84b162b7e..46c5c0a461 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -171,6 +171,8 @@ theme: # Customization extra: + provider: matomo + property: !ENV MKDOCS_MATOMO_URL_BASE comments_url: https://comments.geotribu.fr # isso url url_contribuer: https://contribuer.geotribu.fr/ consent: From 4e4ccf10f58a71ed25c4259646bbcd6ea156f198 Mon Sep 17 00:00:00 2001 From: Julien Moura Date: Tue, 19 Apr 2022 13:16:31 +0200 Subject: [PATCH 06/12] Remove js --- .../theme/assets/javascripts/matomo-tracking.js | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 content/theme/assets/javascripts/matomo-tracking.js diff --git a/content/theme/assets/javascripts/matomo-tracking.js b/content/theme/assets/javascripts/matomo-tracking.js deleted file mode 100644 index 533930c6a6..0000000000 --- a/content/theme/assets/javascripts/matomo-tracking.js +++ /dev/null @@ -1,16 +0,0 @@ - - From 4d3f4744b59f5882d125f0141cfde3a04bb2ef86 Mon Sep 17 00:00:00 2001 From: Julien Moura Date: Tue, 19 Apr 2022 13:16:54 +0200 Subject: [PATCH 07/12] Upgrade tracking code --- .../theme/partials/integrations/analytics/matomo.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/content/theme/partials/integrations/analytics/matomo.html b/content/theme/partials/integrations/analytics/matomo.html index 54a8c3c195..43936e3b82 100644 --- a/content/theme/partials/integrations/analytics/matomo.html +++ b/content/theme/partials/integrations/analytics/matomo.html @@ -1,18 +1,19 @@ From fc361c907c72d36ca00337e49862cbe87aebdca2 Mon Sep 17 00:00:00 2001 From: Julien Moura Date: Tue, 19 Apr 2022 13:25:39 +0200 Subject: [PATCH 08/12] Fix key name --- content/theme/partials/integrations/analytics/matomo.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/theme/partials/integrations/analytics/matomo.html b/content/theme/partials/integrations/analytics/matomo.html index 43936e3b82..b91129df87 100644 --- a/content/theme/partials/integrations/analytics/matomo.html +++ b/content/theme/partials/integrations/analytics/matomo.html @@ -7,7 +7,7 @@ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function () { - var u = "{{ config.extra.anlytics.matomo_url }}/"; + var u = "{{ config.extra.analytics.matomo_url }}/"; _paq.push(['setTrackerUrl', u + 'matomo.php']); _paq.push(['setSiteId', '3']); var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0]; From e77617b5d2b11c281364be69bbfd90e5bbc03051 Mon Sep 17 00:00:00 2001 From: Julien Moura Date: Tue, 19 Apr 2022 13:25:50 +0200 Subject: [PATCH 09/12] Add URL as config var --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 46c5c0a461..7dd2467a08 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -172,7 +172,7 @@ theme: # Customization extra: provider: matomo - property: !ENV MKDOCS_MATOMO_URL_BASE + matomo_url: !ENV [MKDOCS_MATOMO_URL_BASE, "https://matomo.data-wax.com"] comments_url: https://comments.geotribu.fr # isso url url_contribuer: https://contribuer.geotribu.fr/ consent: From 3c9103cc8722c51cc8b0f6ea6762c1a1da2cc0d9 Mon Sep 17 00:00:00 2001 From: Julien Moura Date: Tue, 19 Apr 2022 13:39:24 +0200 Subject: [PATCH 10/12] Custom name for cookies --- mkdocs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mkdocs.yml b/mkdocs.yml index 7dd2467a08..1c491ded27 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -176,6 +176,8 @@ extra: comments_url: https://comments.geotribu.fr # isso url url_contribuer: https://contribuer.geotribu.fr/ consent: + cookies: + analytics: Matomo title: Consentement 🍪 actions: - accept From 86909d5c018ab7f9d486bd196194f5ae17955e64 Mon Sep 17 00:00:00 2001 From: Julien Moura Date: Tue, 19 Apr 2022 13:48:19 +0200 Subject: [PATCH 11/12] Change cookie domain --- content/theme/partials/integrations/analytics/matomo.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/theme/partials/integrations/analytics/matomo.html b/content/theme/partials/integrations/analytics/matomo.html index b91129df87..2b45e36994 100644 --- a/content/theme/partials/integrations/analytics/matomo.html +++ b/content/theme/partials/integrations/analytics/matomo.html @@ -1,7 +1,7 @@ -