mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
Add no-cookie variants of the Google Analytics templates
The current full set of options for GA is now: ```toml [privacy] [privacy.googleAnalytics] disable = false respectDoNotTrack = true anonymizeIP = true useSessionStorage = true ``` Fixes #4775
This commit is contained in:
parent
7b9dbef41a
commit
a51945ea4b
5 changed files with 57 additions and 0 deletions
|
@ -45,6 +45,9 @@ type Disqus struct {
|
||||||
type GoogleAnalytics struct {
|
type GoogleAnalytics struct {
|
||||||
Service `mapstructure:",squash"`
|
Service `mapstructure:",squash"`
|
||||||
|
|
||||||
|
// Enabling this will disable the use of Cookies and use Session Storage to Store the GA Client ID.
|
||||||
|
UseSessionStorage bool
|
||||||
|
|
||||||
// Enabling this will make the GA templates respect the
|
// Enabling this will make the GA templates respect the
|
||||||
// "Do Not Track" HTTP header. See https://www.paulfurley.com/google-analytics-dnt/.
|
// "Do Not Track" HTTP header. See https://www.paulfurley.com/google-analytics-dnt/.
|
||||||
RespectDoNotTrack bool
|
RespectDoNotTrack bool
|
||||||
|
|
|
@ -35,6 +35,7 @@ disable = true
|
||||||
disable = true
|
disable = true
|
||||||
respectDoNotTrack = true
|
respectDoNotTrack = true
|
||||||
anonymizeIP = true
|
anonymizeIP = true
|
||||||
|
useSessionStorage = true
|
||||||
[privacy.instagram]
|
[privacy.instagram]
|
||||||
disable = true
|
disable = true
|
||||||
simple = true
|
simple = true
|
||||||
|
@ -61,6 +62,7 @@ simple = true
|
||||||
assert.True(pc.GoogleAnalytics.Disable)
|
assert.True(pc.GoogleAnalytics.Disable)
|
||||||
assert.True(pc.GoogleAnalytics.RespectDoNotTrack)
|
assert.True(pc.GoogleAnalytics.RespectDoNotTrack)
|
||||||
assert.True(pc.GoogleAnalytics.AnonymizeIP)
|
assert.True(pc.GoogleAnalytics.AnonymizeIP)
|
||||||
|
assert.True(pc.GoogleAnalytics.UseSessionStorage)
|
||||||
assert.True(pc.Instagram.Disable)
|
assert.True(pc.Instagram.Disable)
|
||||||
assert.True(pc.Instagram.Simple)
|
assert.True(pc.Instagram.Simple)
|
||||||
assert.True(pc.SpeakerDeck.Disable)
|
assert.True(pc.SpeakerDeck.Disable)
|
||||||
|
|
|
@ -109,7 +109,20 @@ if (!doNotTrack) {
|
||||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
(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)
|
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
||||||
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
|
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
|
||||||
|
{{- if $pc.UseSessionStorage }}
|
||||||
|
if (window.sessionStorage) {
|
||||||
|
var GA_SESSION_STORAGE_KEY = 'ga:clientId';
|
||||||
|
ga('create', '{{ . }}', {
|
||||||
|
'storage': 'none',
|
||||||
|
'clientId': sessionStorage.getItem(GA_SESSION_STORAGE_KEY)
|
||||||
|
});
|
||||||
|
ga(function(tracker) {
|
||||||
|
sessionStorage.setItem(GA_SESSION_STORAGE_KEY, tracker.get('clientId'));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
{{ else }}
|
||||||
ga('create', '{{ . }}', 'auto');
|
ga('create', '{{ . }}', 'auto');
|
||||||
|
{{ end -}}
|
||||||
ga('send', 'pageview');
|
ga('send', 'pageview');
|
||||||
{{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
|
{{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
|
||||||
}
|
}
|
||||||
|
@ -132,7 +145,20 @@ var doNotTrack = (dnt == "1" || dnt == "yes");
|
||||||
{{ template "__ga_js_set_doNotTrack" $ }}
|
{{ template "__ga_js_set_doNotTrack" $ }}
|
||||||
if (!doNotTrack) {
|
if (!doNotTrack) {
|
||||||
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
|
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
|
||||||
|
{{- if $pc.UseSessionStorage }}
|
||||||
|
if (window.sessionStorage) {
|
||||||
|
var GA_SESSION_STORAGE_KEY = 'ga:clientId';
|
||||||
|
ga('create', '{{ . }}', {
|
||||||
|
'storage': 'none',
|
||||||
|
'clientId': sessionStorage.getItem(GA_SESSION_STORAGE_KEY)
|
||||||
|
});
|
||||||
|
ga(function(tracker) {
|
||||||
|
sessionStorage.setItem(GA_SESSION_STORAGE_KEY, tracker.get('clientId'));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
{{ else }}
|
||||||
ga('create', '{{ . }}', 'auto');
|
ga('create', '{{ . }}', 'auto');
|
||||||
|
{{ end -}}
|
||||||
ga('send', 'pageview');
|
ga('send', 'pageview');
|
||||||
{{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
|
{{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,20 @@ if (!doNotTrack) {
|
||||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
(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)
|
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
||||||
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
|
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
|
||||||
|
{{- if $pc.UseSessionStorage }}
|
||||||
|
if (window.sessionStorage) {
|
||||||
|
var GA_SESSION_STORAGE_KEY = 'ga:clientId';
|
||||||
|
ga('create', '{{ . }}', {
|
||||||
|
'storage': 'none',
|
||||||
|
'clientId': sessionStorage.getItem(GA_SESSION_STORAGE_KEY)
|
||||||
|
});
|
||||||
|
ga(function(tracker) {
|
||||||
|
sessionStorage.setItem(GA_SESSION_STORAGE_KEY, tracker.get('clientId'));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
{{ else }}
|
||||||
ga('create', '{{ . }}', 'auto');
|
ga('create', '{{ . }}', 'auto');
|
||||||
|
{{ end -}}
|
||||||
ga('send', 'pageview');
|
ga('send', 'pageview');
|
||||||
{{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
|
{{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,20 @@
|
||||||
{{ template "__ga_js_set_doNotTrack" $ }}
|
{{ template "__ga_js_set_doNotTrack" $ }}
|
||||||
if (!doNotTrack) {
|
if (!doNotTrack) {
|
||||||
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
|
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
|
||||||
|
{{- if $pc.UseSessionStorage }}
|
||||||
|
if (window.sessionStorage) {
|
||||||
|
var GA_SESSION_STORAGE_KEY = 'ga:clientId';
|
||||||
|
ga('create', '{{ . }}', {
|
||||||
|
'storage': 'none',
|
||||||
|
'clientId': sessionStorage.getItem(GA_SESSION_STORAGE_KEY)
|
||||||
|
});
|
||||||
|
ga(function(tracker) {
|
||||||
|
sessionStorage.setItem(GA_SESSION_STORAGE_KEY, tracker.get('clientId'));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
{{ else }}
|
||||||
ga('create', '{{ . }}', 'auto');
|
ga('create', '{{ . }}', 'auto');
|
||||||
|
{{ end -}}
|
||||||
ga('send', 'pageview');
|
ga('send', 'pageview');
|
||||||
{{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
|
{{ if $pc.AnonymizeIP }}ga('set', 'anonymizeIp', true);{{ end -}}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue