Merge branch 'fix-baseurl-with-subdir'

This commit is contained in:
John Hollowell 2022-12-28 00:56:55 +00:00
commit 88b809852b
5 changed files with 7 additions and 7 deletions

View File

@ -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 }}"> <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"> <div class="navbar__brand">
{{ if $.Param "logo" | default true }} {{ 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 }}"> <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"> <img src="{{ "logo.png" | relURL }}" alt="Home" class="navbar__logo">
</a> </a>
{{ else }} {{ else }}
&nbsp;&nbsp; &nbsp;&nbsp;
{{ end }} {{ end }}
{{ if ne .Site.Params.logoType "long" }} {{ 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> <h6 class="navbar__title">{{ .Site.Params.logoText }}</h6>
</a> </a>
{{ end }} {{ end }}

View File

@ -10,7 +10,7 @@
var enableSearchHighlight = JSON.parse({{ $enableSearchHighlight | jsonify }}); var enableSearchHighlight = JSON.parse({{ $enableSearchHighlight | jsonify }});
{{ $isFirstSection := eq .Permalink .FirstSection.Permalink }} {{ $isFirstSection := eq .Permalink .FirstSection.Permalink }}
var isFirstSection = JSON.parse({{ $isFirstSection | jsonify }}); var isFirstSection = JSON.parse({{ $isFirstSection | jsonify }});
{{ $tagsBaseURL := ("/tags/" | relLangURL) }} {{ $tagsBaseURL := ("tags/" | relLangURL) }}
var tagsBaseURL = JSON.parse({{ $tagsBaseURL | jsonify }}); var tagsBaseURL = JSON.parse({{ $tagsBaseURL | jsonify }});
document.addEventListener('DOMContentLoaded', function () { document.addEventListener('DOMContentLoaded', function () {

View File

@ -2,7 +2,7 @@
<div class="taxo"> <div class="taxo">
<section> <section>
<span class="title p2"> <span class="title p2">
<a href="{{ "/categories/" | relLangURL }}" class="taxo__title"> <a href="{{ "categories/" | relLangURL }}" class="taxo__title">
{{ i18n "categories" }} {{ i18n "categories" }}
</a> </a>
</span> </span>

View File

@ -2,7 +2,7 @@
<div class="taxo"> <div class="taxo">
<section> <section>
<span class="title p2"> <span class="title p2">
<a href="{{ "/series/" | relLangURL }}" class="taxo__title"> <a href="{{ "series/" | relLangURL }}" class="taxo__title">
{{ i18n "series" }} {{ i18n "series" }}
</a> </a>
</span> </span>

View File

@ -2,7 +2,7 @@
<div class="taxo"> <div class="taxo">
<section> <section>
<span class="title p2"> <span class="title p2">
<a href="{{ "/tags/" | relLangURL }}" class="taxo__title"> <a href="{{ "tags/" | relLangURL }}" class="taxo__title">
{{ i18n "tags"}} {{ i18n "tags"}}
</a> </a>
</span> </span>