diff options
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/partials/data.html | 7 | ||||
| -rw-r--r-- | layouts/partials/head.html | 3 | ||||
| -rw-r--r-- | layouts/partials/scripts.html | 11 | ||||
| -rw-r--r-- | layouts/partials/seo/ga.html | 18 |
4 files changed, 19 insertions, 20 deletions
diff --git a/layouts/partials/data.html b/layouts/partials/data.html deleted file mode 100644 index afacc83..0000000 --- a/layouts/partials/data.html +++ /dev/null @@ -1,7 +0,0 @@ -<script type="application/json" id="ed-data"> - { - "analytics_code": {{ site.GoogleAnalytics | default "" }}, - "page_title": {{- partial "title.html" . -}}, - "language": {{ site.LanguageCode | default site.Language.Lang }} - } -</script> diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 587becb..7f5bd77 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -28,8 +28,7 @@ <meta name="theme-color" content="#ffffff"> {{ block "custom-head" . }}{{ partial "custom-head.html" . }}{{ end }} - {{ partial "data.html" . }} - {{ partial "scripts.html" . }} + {{ partial "partials/seo/ga.html" . }} {{ block "custom-scripts" . }}{{ partial "custom-scripts.html" . }}{{ end }} {{- /* Misc */}} diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html deleted file mode 100644 index 1f5983a..0000000 --- a/layouts/partials/scripts.html +++ /dev/null @@ -1,11 +0,0 @@ -{{- if or (eq (getenv "HUGO_ENV") "production") (eq site.Params.env "production") }} - {{- with site.GoogleAnalytics -}} - {{- $ga := resources.Get "js/ga.js" | minify -}} - {{- if not site.Params.assets.disable_fingerprinting -}} - {{- $ga = $ga | fingerprint -}} - <script src="{{ $ga.RelPermalink }}" integrity="{{ $ga.Data.Integrity }}"></script> - {{- else -}} - <script src="{{ $ga.RelPermalink }}"></script> - {{- end -}} - {{- end -}} -{{- end -}} diff --git a/layouts/partials/seo/ga.html b/layouts/partials/seo/ga.html new file mode 100644 index 0000000..1a3566e --- /dev/null +++ b/layouts/partials/seo/ga.html @@ -0,0 +1,18 @@ +{{- if (or (eq (getenv "HUGO_ENV") "production") (eq site.Params.env "production")) -}} + {{- with site.GoogleAnalytics -}} + {{- $gaParams := dict "analyticsCode" (site.GoogleAnalytics | default "") "anonymizeIp" (site.Params.anonymizeIp | default true) -}} + + {{- $gaScript := slice -}} + {{- $gaScript = $gaScript | append (resources.Get "js/ga.js") -}} + {{- $gaScript = $gaScript | resources.Concat "js/analytics-bundle.js" -}} + + {{- $gaScript = $gaScript | js.Build (dict "format" "iife" "params" $gaParams) -}} + + {{- if site.Params.assets.disable_fingerprinting }} + <script src="{{ $gaScript.RelPermalink }}"></script> + {{- else -}} + {{- $gaScript = $gaScript | fingerprint }} + <script src="{{ $gaScript.RelPermalink }}" integrity="{{ $gaScript.Data.Integrity }}"></script> + {{- end -}} + {{- end -}} +{{- end -}} |