fix: update head.html to match new docsy version

Minimum-CD · May 20, 2024 · 529f850 · 529f850
1 parent da08682
commit 529f850
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 89 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module cd-manifesto
 go 1.22.1
 
 require (
-	github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536 // indirect
-	github.com/google/docsy v0.9.1 // indirect
+	github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7 // indirect
+	github.com/google/docsy v0.10.0 // indirect
 	github.com/twbs/bootstrap v5.3.3+incompatible // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,7 +1,6 @@
-github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536 h1:LFS9LpoSZYhxQ6clU0NIVbaGR08BlxAs4b+9W+7IGVQ=
-github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
-github.com/google/docsy v0.9.1 h1:+jqges1YCd+yHeuZ1BUvD8V8mEGVtPxULg5j/vaJ984=
-github.com/google/docsy v0.9.1/go.mod h1:saOqKEUOn07Bc0orM/JdIF3VkOanHta9LU5Y53bwN2U=
-github.com/twbs/bootstrap v5.2.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
+github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7 h1:2aWEKCRLqQ9nPyXaz4/IYtRrDr3PzEiX0DUSUr2/EDs=
+github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/google/docsy v0.10.0 h1:6tMDacPwAyRWNCfvsn/9qGOZDQ8b0aRzjRZvnZPY5dg=
+github.com/google/docsy v0.10.0/go.mod h1:c0nIAqmRTOuJ01F85U/wJPQtc3Zj9N58Kea9bOT2AJc=
 github.com/twbs/bootstrap v5.3.3+incompatible h1:goFoqinzdHfkeegpFP7pvhbd0g+A3O2hbU3XCjuNrEQ=
 github.com/twbs/bootstrap v5.3.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -23,7 +23,8 @@
   {{- if .IsHome -}}
     {{ .Site.Title -}}
   {{ else -}}
-    {{ with .Title }}{{ . }} |{{ end -}} {{ .Site.Title -}}
+    {{ with .Title }}{{ . }} |{{ end -}}
+    {{ .Site.Title -}}
   {{ end -}}
 </title>
 <meta
@@ -65,23 +66,12 @@
   GDPR, cookie consent scripts places in head-end must execute before Google
   Analytics is enabled */
 -}}
+
+{{/* To comply with GDPR, cookie consent scripts places in head-end must execute before Google Analytics is enabled */ -}}
 {{ if hugo.IsProduction -}}
-  {{ $enableGtagForUniversalAnalytics := not
-    .Site.Params.disableGtagForUniversalAnalytics
-  -}}
-  {{ if (or
-    $enableGtagForUniversalAnalytics (hasPrefix
-    .Site.Config.Services.GoogleAnalytics.ID "G-"))
-  -}}
-    {{ template
-      "_internal/google_analytics_gtag.html" .
-    -}}
-  {{ else -}}
-    {{ template
-      "_internal/google_analytics_async.html" .
-    -}}
-  {{ end -}}
+  {{ template "_internal/google_analytics.html" . -}}
 {{ end -}}
+
 {{ define
   "algolia/head"
 -}}