From 80d198952f445688a79ee7eb7d5a69545c2afaeb Mon Sep 17 00:00:00 2001
From: Tim Bannister <tim@scalefactory.com>
Date: Sun, 27 Oct 2024 16:38:31 +0000
Subject: [PATCH 1/2] Ready announcements for Docsy

Serve the JavaScript code using Hugo Pipes, and avoid customizing the
'head.html' partial. Part of some work to allow using vanilla Docsy
(if we wanted to).
---
 {static => assets}/js/dismiss_banner.js | 0
 layouts/partials/head.html              | 7 +++----
 layouts/partials/hooks/head-end.html    | 9 +++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)
 rename {static => assets}/js/dismiss_banner.js (100%)

diff --git a/static/js/dismiss_banner.js b/assets/js/dismiss_banner.js
similarity index 100%
rename from static/js/dismiss_banner.js
rename to assets/js/dismiss_banner.js
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 97637d10b8..080d04a31a 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -33,7 +33,6 @@
 <script src="https://unpkg.com/lunr@2.1.6/lunr.js"></script>
 <script src="/js/offline-search.js"></script>
 {{end}}
-{{ partial "hooks/head-end.html" . }}
 
 <!-- Docsy head.html ends here -->
 
@@ -78,11 +77,11 @@
 <!--script src="https://unpkg.com/split.js/dist/split.min.js"></script-->
 <script src="/js/split-1.6.0.js" intregrity="sha384-0blL3GqHy6+9fw0cyY2Aoiwg4onHAtslAs4OkqZY7UQBrR65/K4gI+hxLdWDrjpz"></script>
 
-<!--Script for dismissing banners/notices-->
-<script defer src="{{ "js/dismiss_banner.js" | relURL }}"></script>
-
 {{- if eq (lower .Params.cid) "community" -}}
 <script defer src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
 {{- end -}}
 {{ with .Params.js }}{{ range (split . ",") }}<script src="{{ (trim . " ") | relURL }}"></script><!-- custom js added -->
 {{ end }}{{ else }}<!-- no custom js detected -->{{ end }}
+
+{{/* make sure that head-end hook comes last */}}
+{{ partial "hooks/head-end.html" . }}
diff --git a/layouts/partials/hooks/head-end.html b/layouts/partials/hooks/head-end.html
index f80c71826a..b62b8f2a8b 100644
--- a/layouts/partials/hooks/head-end.html
+++ b/layouts/partials/hooks/head-end.html
@@ -52,3 +52,12 @@
 <script defer src="{{ $releaseBinariesJs.RelPermalink }}"></script>
   {{- end -}}
 {{- end -}}
+
+{{/* JavaScript for announcements */}}
+{{- if hugo.IsProduction -}}
+  {{- $bannerDismissJs :=  resources.Get "js/dismiss_banner.js" | minify | fingerprint -}}
+<script defer src="{{ $bannerDismissJs.RelPermalink }}" integrity="{{ $bannerDismissJs.Data.Integrity }}" crossorigin="anonymous"></script>
+{{- else -}}
+  {{- $bannerDismissJs := resources.Get "js/dismiss_banner.js" -}}
+<script defer src="{{ $bannerDismissJs.RelPermalink }}"></script>
+{{- end -}}

From d38b7b4675d548869f6e8a1280d39663200a4a1e Mon Sep 17 00:00:00 2001
From: Tim Bannister <tim@scalefactory.com>
Date: Sun, 27 Oct 2024 17:01:32 +0000
Subject: [PATCH 2/2] Change name for banner script

Align with informal naming convention.
---
 assets/js/{dismiss_banner.js => banner-dismiss.js} | 0
 layouts/partials/hooks/head-end.html               | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename assets/js/{dismiss_banner.js => banner-dismiss.js} (100%)

diff --git a/assets/js/dismiss_banner.js b/assets/js/banner-dismiss.js
similarity index 100%
rename from assets/js/dismiss_banner.js
rename to assets/js/banner-dismiss.js
diff --git a/layouts/partials/hooks/head-end.html b/layouts/partials/hooks/head-end.html
index b62b8f2a8b..3e27bc1b26 100644
--- a/layouts/partials/hooks/head-end.html
+++ b/layouts/partials/hooks/head-end.html
@@ -55,9 +55,9 @@
 
 {{/* JavaScript for announcements */}}
 {{- if hugo.IsProduction -}}
-  {{- $bannerDismissJs :=  resources.Get "js/dismiss_banner.js" | minify | fingerprint -}}
+  {{- $bannerDismissJs :=  resources.Get "js/banner-dismiss.js" | minify | fingerprint -}}
 <script defer src="{{ $bannerDismissJs.RelPermalink }}" integrity="{{ $bannerDismissJs.Data.Integrity }}" crossorigin="anonymous"></script>
 {{- else -}}
-  {{- $bannerDismissJs := resources.Get "js/dismiss_banner.js" -}}
+  {{- $bannerDismissJs := resources.Get "js/banner-dismiss.js" -}}
 <script defer src="{{ $bannerDismissJs.RelPermalink }}"></script>
 {{- end -}}