From 8c0c8477d77a6590b5bc4584c442e6402dbe0d19 Mon Sep 17 00:00:00 2001
From: John Hollowell <johnahollowell@gmail.com>
Date: Wed, 28 Dec 2022 00:40:21 +0000
Subject: [PATCH] Fix issue when using a baseURL containing a subdir

`| relURL` behaves differently when the string passed to it begins with a slash.
https://gohugo.io/functions/relurl/#input-begins-with-a-slash
---
 layouts/partials/navbar/site-nav.html              | 6 +++---
 layouts/partials/script/pub-list-script.html       | 2 +-
 layouts/partials/taxonomy/taxonomy-categories.html | 2 +-
 layouts/partials/taxonomy/taxonomy-series.html     | 2 +-
 layouts/partials/taxonomy/taxonomy-tags.html       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/layouts/partials/navbar/site-nav.html b/layouts/partials/navbar/site-nav.html
index a33d134..7facfa6 100644
--- a/layouts/partials/navbar/site-nav.html
+++ b/layouts/partials/navbar/site-nav.html
@@ -1,14 +1,14 @@
 <nav class="navbar scrolling" role="navigation" aria-label="main navigation" data-dir="{{ if $.Param "navbardir" }}{{ $.Param "navbardir" }}{{ else }}{{ $.Param "languagedir" | default "ltr" }}{{ end }}">
   <div class="navbar__brand">
     {{ if $.Param "logo" | default true }}
-    <a href="{{ "/" | relLangURL }}" title="{{ i18n "tooltip-home" }}" rel="home" class="{{ if eq ($.Param "logoType") "long" }}navbar__long-link{{ else }}navbar__logo-link{{ end }}">
-      <img src="{{ "/logo.png" | relURL }}" alt="Home" class="navbar__logo">
+    <a href="{{ "" | relLangURL }}" title="{{ i18n "tooltip-home" }}" rel="home" class="{{ if eq ($.Param "logoType") "long" }}navbar__long-link{{ else }}navbar__logo-link{{ end }}">
+      <img src="{{ "logo.png" | relURL }}" alt="Home" class="navbar__logo">
     </a>
     {{ else }}
     &nbsp;&nbsp;
     {{ end }}
     {{ if ne .Site.Params.logoType "long" }}
-      <a href="{{ "/" | relLangURL }}" title="{{ i18n "tooltip-home" }}" rel="home" class="navbar__title-link">
+      <a href="{{ "" | relLangURL }}" title="{{ i18n "tooltip-home" }}" rel="home" class="navbar__title-link">
         <h6 class="navbar__title">{{ .Site.Params.logoText }}</h6>
       </a>
     {{ end }}
diff --git a/layouts/partials/script/pub-list-script.html b/layouts/partials/script/pub-list-script.html
index 1f5e9d3..19a04b9 100644
--- a/layouts/partials/script/pub-list-script.html
+++ b/layouts/partials/script/pub-list-script.html
@@ -10,7 +10,7 @@
   var enableSearchHighlight = JSON.parse({{ $enableSearchHighlight | jsonify }});
   {{ $isFirstSection := eq .Permalink .FirstSection.Permalink }}
   var isFirstSection = JSON.parse({{ $isFirstSection | jsonify }});
-  {{ $tagsBaseURL := ("/tags/" | relLangURL) }}
+  {{ $tagsBaseURL := ("tags/" | relLangURL) }}
   var tagsBaseURL = JSON.parse({{ $tagsBaseURL | jsonify }});
   
   document.addEventListener('DOMContentLoaded', function () {
diff --git a/layouts/partials/taxonomy/taxonomy-categories.html b/layouts/partials/taxonomy/taxonomy-categories.html
index 1d9d8ad..96ccf9b 100644
--- a/layouts/partials/taxonomy/taxonomy-categories.html
+++ b/layouts/partials/taxonomy/taxonomy-categories.html
@@ -2,7 +2,7 @@
 <div class="taxo">
     <section>
         <span class="title p2">
-            <a href="{{ "/categories/" | relLangURL }}" class="taxo__title">
+            <a href="{{ "categories/" | relLangURL }}" class="taxo__title">
                 {{ i18n "categories" }}
             </a>
         </span>
diff --git a/layouts/partials/taxonomy/taxonomy-series.html b/layouts/partials/taxonomy/taxonomy-series.html
index 757a80f..ff8d8dd 100644
--- a/layouts/partials/taxonomy/taxonomy-series.html
+++ b/layouts/partials/taxonomy/taxonomy-series.html
@@ -2,7 +2,7 @@
 <div class="taxo">
     <section>
         <span class="title p2">
-            <a href="{{ "/series/" | relLangURL }}" class="taxo__title">
+            <a href="{{ "series/" | relLangURL }}" class="taxo__title">
                 {{ i18n "series" }}
             </a>
         </span>
diff --git a/layouts/partials/taxonomy/taxonomy-tags.html b/layouts/partials/taxonomy/taxonomy-tags.html
index 2e00518..267decc 100644
--- a/layouts/partials/taxonomy/taxonomy-tags.html
+++ b/layouts/partials/taxonomy/taxonomy-tags.html
@@ -2,7 +2,7 @@
 <div class="taxo">
     <section>
         <span class="title p2">
-            <a href="{{ "/tags/" | relLangURL }}" class="taxo__title">
+            <a href="{{ "tags/" | relLangURL }}" class="taxo__title">
                 {{ i18n "tags"}}
             </a>
         </span>