From a8a9305a33308d76995be2ba76f170b955a68eae Mon Sep 17 00:00:00 2001 From: Pablo Marcos Date: Wed, 9 Feb 2022 17:48:46 +0100 Subject: [PATCH] Added 2 New, Privacy-Friendly Analytics Methods Counter.dev and GoatAnalytics. Google Analytics should keep working the same --- layouts/_default/baseof.html | 13 ++----------- layouts/index.html | 12 ++---------- layouts/partials/analytics.html | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 layouts/partials/analytics.html diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index af3faed..e3cb2a1 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -9,17 +9,8 @@ {{ block "header" . }} {{ end }} - - {{ if site.GoogleAnalytics }} - - {{ if hasPrefix site.GoogleAnalytics "UA-"}} - {{ template "_internal/google_analytics_async.html" . }} - {{ else }} - - {{ template "_internal/google_analytics.html" . }} - {{ end }} - {{ end }} - + + {{- partial "analytics.html" . -}}
diff --git a/layouts/index.html b/layouts/index.html index 634504f..538c868 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -29,16 +29,8 @@ - - {{ if site.GoogleAnalytics }} - - {{ if hasPrefix site.GoogleAnalytics "UA-"}} - {{ template "_internal/google_analytics_async.html" . }} - {{ else }} - - {{ template "_internal/google_analytics.html" . }} - {{ end }} - {{ end }} + + {{- partial "analytics.html" . -}} diff --git a/layouts/partials/analytics.html b/layouts/partials/analytics.html new file mode 100644 index 0000000..6f3c4c8 --- /dev/null +++ b/layouts/partials/analytics.html @@ -0,0 +1,33 @@ + +{{ if site.Params.Analytics }} + + + {{ if site.Params.Analytics.Google }} + + {{ if hasPrefix site.Params.Analytics.Google "UA-"}} + {{ template "_internal/google_analytics_async.html" . }} + + {{ else }} + {{ template "_internal/google_analytics.html" . }} + {{ end }} + {{ end }} + + + {{ if site.Params.Analytics.CounterDev }} + + {{ end }} + + + {{ if site.Params.Analytics.GoatCounter }} + + {{ end }} + + + +{{ else if site.GoogleAnalytics }} + {{ if hasPrefix site.GoogleAnalytics "UA-"}} + {{ template "_internal/google_analytics_async.html" . }} + {{ else }} + {{ template "_internal/google_analytics.html" . }} + {{ end }} +{{ end }}