fix: update permalink handling in subpath setting

layouts/partials/js-selector.html

@@ -1,7 +1,7 @@
 {{ $origin := cond (eq .Site.Params.assets.self_host true) "basic" "cors" }}
 {{ $data := index .Site.Data.origin $origin }}
 {{ $is_home := false }}
-{{ if or (eq .RelPermalink "/") (eq .RelPermalink (relLangURL "/")) }}
+{{ if or (eq .RelPermalink "/") (eq .RelPermalink (relLangURL "/")) (eq .RelPermalink (.Site.Home.RelPermalink)) }}
   {{ $is_home = true }}
 {{ end }}
 {{ $is_categories := and (eq .Kind "taxonomy") (eq .Type "categories") }}

layouts/partials/language-selector.html

@@ -1,8 +1,9 @@
 <div class="lang-dropdown">
   <select class="lang-select" onchange="location = this.value;">
     {{ $currentLang := .Site.Language.Lang }}
+    {{ $siteBase := strings.TrimSuffix "/" .Site.BaseURL }}
     {{ range .Site.Languages }}
-      <option value="/{{ .Lang }}/" {{ if eq .Lang $currentLang }}selected{{ end }}>
+    <option value="{{ $siteBase }}/{{ .Lang }}/" {{ if eq .Lang $currentLang }}selected{{ end }}>
       {{ .LanguageName }}
     </option>
     {{ end }}

layouts/partials/sidebar.html

@@ -23,11 +23,11 @@
     <ul class="nav">
       {{ range .Site.Menus.main }}
         {{ $active := false }}
-          {{ if eq (.URL | relLangURL) $.RelPermalink }}
+        {{ if eq (.URL) $.RelPermalink }}
           {{ $active = true }}
         {{ end }}
         <li class="nav-item{{ if $active }} active{{ end }}">
-            <a href="{{ .URL | relLangURL }}" class="nav-link">
+          <a href="{{ .URL }}" class="nav-link">
             <i class="fa-fw fas {{ .Pre }}"></i>
             <span>{{ .Name | upper }}</span>
           </a>
@@ -65,7 +65,7 @@
       {{ else if eq .type "email" }}
         {{ $url = printf "mailto:%s" .id }}
       {{ else if eq .type "rss" }}
-          {{ $url = "index.xml" | relLangURL }}
+        {{ $url = "index.xml" | absLangURL }}
       {{ else }}
         {{ $url = .url }}
       {{ end }}

layouts/partials/topbar.html

@@ -5,27 +5,27 @@
       {{ $page := . }}
       {{ $url := .RelPermalink }}
       {{ $paths := split (trim $url "/") "/" }}
-      {{ $is_home := or (eq $url "/") (eq $url (relLangURL "/")) }}
+      {{ $is_home := or (eq $url "/") (eq $url (relLangURL "/")) (eq .RelPermalink (.Site.Home.RelPermalink)) }}
 
       {{ if $is_home }}
         <!-- index page -->
         <span>{{ T "tabs.home" | title }}</span>
       {{else}}
         <span>
-          <a href="{{ "/" | relLangURL }}">
+          <a href="{{ .Site.Home.RelPermalink }}">
             {{- T "tabs.home" | title -}}
           </a>
         </span>
         {{ if eq $page.Type "tags" }}
           {{ if .Data.Term}}
-            <span><a href="{{ "/tags/" | relLangURL }}">{{i18n "tabs.tags"}}</a></span>
+            <span><a href="{{ "tags/" | absLangURL }}">{{i18n "tabs.tags"}}</a></span>
             <span>{{ .Data.Term }}</span>
           {{ else }}
             <span>{{i18n "tabs.tags"}}</span>
           {{ end }}
         {{ else if eq $page.Type "categories" }}
           {{ if .Data.Term}}
-            <span><a href="{{ "/categories/" | relLangURL }}">{{i18n "tabs.categories"}}</a></span>
+            <span><a href="{{ "categories/" | absLangURL }}">{{i18n "tabs.categories"}}</a></span>
             <span>{{ .Data.Term }}</span>
           {{ else }}
             <span>{{i18n "tabs.categories"}}</span>

layouts/taxonomy/category.terms.html

@@ -38,7 +38,7 @@
         <div id="h_{{ $index }}" class="card-header d-flex justify-content-between hide-border-bottom">
           <span class="ms-2">
             <i class="far fa-folder{{ if gt (len $subcategories) 0 }}-open{{ end }} fa-fw"></i>
-            <a href="{{ "/categories/" | relLangURL }}{{ $parentName | urlize }}" class="mx-2">{{ $parentName }}</a>
+            <a href="{{ "categories/" | absLangURL }}{{ $parentName | urlize }}" class="mx-2">{{ $parentName }}</a>
             <span class="text-muted small font-weight-light">
               {{ if gt (len $subcategories) 0 }}
                 {{ len $subcategories }}
@@ -86,7 +86,7 @@
                 
                 <li class="list-group-item">
                   <i class="far fa-folder fa-fw"></i>
-                  <a href="{{ "/categories/" | relLangURL }}{{ $subCategoryName | urlize }}" class="mx-2">{{ $subCategoryName }}</a>
+                  <a href="{{ "categories/" | absLangURL }}{{ $subCategoryName | urlize }}" class="mx-2">{{ $subCategoryName }}</a>
                   <span class="text-muted small font-weight-light">
                     {{ len $subPages }}
                     {{ if gt (len $subPages) 1 }}

layouts/taxonomy/tag.terms.html

@@ -14,7 +14,7 @@
   
       {{ range $sorted_tags }}
         <div>
-          <a class="tag" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}/">
+          <a class="tag" href="{{ "tags/" | absLangURL }}{{ . | urlize }}/">
             {{ . -}}
             <span class="text-muted">{{ len (index $.Site.Taxonomies.tags .) }}</span>
           </a>