From 7049775470ea56472f18be64031a771efaba4683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nuno=20Cora=C3=A7=C3=A3o?= <nunocoracao@gmail.com>
Date: Sun, 1 Jan 2023 22:23:42 +0000
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20fixed=20likes=20and=20view?=
 =?UTF-8?q?=20counters=20for=20taxonomies=20and=20terms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/_default/taxonomy.html   | 4 ++--
 layouts/_default/term.html       | 4 ++--
 layouts/partials/meta/likes.html | 6 ++++++
 layouts/partials/meta/views.html | 6 ++++++
 package.json                     | 2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 4d7d030c..aa8e4b10 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -30,8 +30,8 @@
     </section>
   {{ end }}
   <script>
-    var oid = "views_{{ .File.Path }}"
-    var oid_likes = "likes_{{ .File.Path }}"
+    var oid = "views_taxonomy_{{ .Data.Plural }}"
+    var oid_likes = "likes_taxonomy_{{ .Data.Plural }}"
   </script>
   {{ $jsPage := resources.Get "js/page.js" }}
   {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }}
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
index 8a0d1e5e..dcaed108 100644
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@@ -28,8 +28,8 @@
     </div>
     {{ end }}
     <script>
-      var oid = "views_{{ .File.Path }}"
-      var oid_likes = "likes_{{ .File.Path }}"
+      var oid = "views_term_{{ .Data.Term }}"
+      var oid_likes = "likes_term_{{ .Data.Term }}"
     </script>
     {{ $jsPage := resources.Get "js/page.js" }}
     {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }}
diff --git a/layouts/partials/meta/likes.html b/layouts/partials/meta/likes.html
index 3f213195..ac07fb6b 100644
--- a/layouts/partials/meta/likes.html
+++ b/layouts/partials/meta/likes.html
@@ -1,5 +1,11 @@
 <span>
+    {{ if eq .Kind "taxonomy"}}
+    <span id="likes_taxonomy_{{ .Page.Data.Plural }}" title="likes">0</span> 
+    {{ else if eq .Kind "term"}}
+    <span id="likes_term_{{ .Page.Data.Term }}" title="likes">0</span> 
+    {{ else }}
     <span id="likes_{{ .File.Path }}" title="likes">0</span> 
+    {{ end }}
     <span class="inline-block align-text-bottom">{{ partial "icon.html" "heart" }}</span>
 </span>
 {{- /* Trim EOF */ -}}
\ No newline at end of file
diff --git a/layouts/partials/meta/views.html b/layouts/partials/meta/views.html
index 51b32aa5..420a2d6c 100644
--- a/layouts/partials/meta/views.html
+++ b/layouts/partials/meta/views.html
@@ -1,5 +1,11 @@
 <span>
+    {{ if eq .Kind "taxonomy"}}
+    <span id="views_taxonomy_{{ .Page.Data.Plural }}" title="views">0</span> 
+    {{ else if eq .Kind "term"}}
+    <span id="views_term_{{ .Page.Data.Term }}" title="views">0</span> 
+    {{ else }}
     <span id="views_{{ .File.Path }}" title="views">0</span> 
+    {{ end }}
     <span class="inline-block align-text-bottom">{{ partial "icon.html" "eye" }}</span>
 </span>
 {{- /* Trim EOF */ -}}
diff --git a/package.json b/package.json
index df078707..5795374b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.22.1",
+  "version": "2.22.2",
   "description": "Blowfish theme for Hugo",
   "scripts": {
     "fullinstall": "npm run preinstall && npm install && npm run postinstall",

From 9c3326f395a791b5b21cba26b6ab29c53f97e3c7 Mon Sep 17 00:00:00 2001
From: Miles Pernicious <miles@milespernicious.com>
Date: Sun, 1 Jan 2023 23:55:00 -1000
Subject: [PATCH 2/2] Fix missing title attribute from search button

This was caused by an extra space before an enquoted identifier,
causing the i18n lookup to fail.
---
 layouts/partials/header/basic.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/layouts/partials/header/basic.html b/layouts/partials/header/basic.html
index cb3b0d0c..0da1855d 100644
--- a/layouts/partials/header/basic.html
+++ b/layouts/partials/header/basic.html
@@ -38,7 +38,7 @@
 
             {{ if .Site.Params.enableSearch | default false }}
             <button id="search-button" class="text-base hover:text-primary-600 dark:hover:text-primary-400"
-                title="{{ i18n " search.open_button_title" }}">
+                title="{{ i18n "search.open_button_title" }}">
                 {{ partial "icon.html" "search" }}
             </button>
             {{ end }}
@@ -68,7 +68,7 @@
 
             {{ if .Site.Params.enableSearch | default false }}
             <button id="search-button-mobile" class="text-base hover:text-primary-600 dark:hover:text-primary-400"
-                title="{{ i18n " search.open_button_title" }}">
+                title="{{ i18n "search.open_button_title" }}">
                 {{ partial "icon.html" "search" }}
             </button>
             {{ end }}
@@ -121,4 +121,4 @@
             </div>
         </label>
     </div>
-</div>
\ No newline at end of file
+</div>