diff --git a/CHANGELOG.md b/CHANGELOG.md index b7cff3b..2483825 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - ⚠️ Required Hugo version is now 0.146.0 or later - Layouts directory restructured to align with [new Hugo templating data structure](https://github.com/gohugoio/hugo/pull/13541#issue-2959000250) +- Absolute URLs are now preferred over relative URLs - Upgrade to Mermaid v11.7.0 ([#1035](https://github.com/jpanther/congo/pull/1035), [#1040](https://github.com/jpanther/congo/pull/1040)) - Upgrade to KaTeX v0.16.22 ([#1048](https://github.com/jpanther/congo/pull/1048)) - Upgrade to ChartJS v4.5.0 ([#1052](https://github.com/jpanther/congo/pull/1052), [#1067](https://github.com/jpanther/congo/pull/1067)) diff --git a/exampleSite/layouts/_partials/home/custom.html b/exampleSite/layouts/_partials/home/custom.html index 07b7db7..2c72550 100644 --- a/exampleSite/layouts/_partials/home/custom.html +++ b/exampleSite/layouts/_partials/home/custom.html @@ -8,6 +8,6 @@ diff --git a/layouts/_markup/render-link.html b/layouts/_markup/render-link.html index 6e73759..f4779fb 100644 --- a/layouts/_markup/render-link.html +++ b/layouts/_markup/render-link.html @@ -6,7 +6,7 @@ {{- $fragment := "" }} {{- with $url.Fragment }}{{ $fragment = printf "#%s" . }}{{ end -}} {{- with .Page.GetPage $url.Path }} - {{ $link = printf "%s%s" .RelPermalink $fragment }} + {{ $link = printf "%s%s" .Permalink $fragment }} {{ else }} {{- if hasSuffix $url.Path ".md" }} {{ warnf "[CONGO] Can't resolve: %s" .Destination }} diff --git a/layouts/_partials/article-link.html b/layouts/_partials/article-link.html index 8e78e1c..764038b 100644 --- a/layouts/_partials/article-link.html +++ b/layouts/_partials/article-link.html @@ -8,7 +8,7 @@ href="{{ with $.Params.externalUrl }} {{ . }} {{ else }} - {{ $.RelPermalink }} + {{ $.Permalink }} {{ end }}" aria-label="{{ $.Title | emojify }}" > @@ -16,12 +16,12 @@ alt="{{ $.Params.featureAlt | default $.Params.thumbnailAlt | default "" }}" {{ if eq .MediaType.SubType "svg" }} class="w-24 max-w-[6rem] max-h-[4.5rem] rounded-md sm:max-h-[7.5rem] sm:w-40 - sm:max-w-[10rem]" src="{{ .RelPermalink }}" + sm:max-w-[10rem]" src="{{ .Permalink }}" {{ else }} class="w-24 rounded-md sm:w-40" srcset=" - {{- (.Fill "160x120 smart").RelPermalink }} - 160w, {{- (.Fill "320x240 smart").RelPermalink }} 2x" - src="{{ (.Fill "160x120 smart").RelPermalink }}" width="160" height="120" + {{- (.Fill "160x120 smart").Permalink }} + 160w, {{- (.Fill "320x240 smart").Permalink }} 2x" + src="{{ (.Fill "160x120 smart").Permalink }}" width="160" height="120" {{ end }} {{ if $.Site.Params.enableImageLazyLoading | default true }} loading="lazy" @@ -52,7 +52,7 @@ {{ else }} {{ .Title | emojify }} {{ end }} diff --git a/layouts/_partials/article-meta.html b/layouts/_partials/article-meta.html index dc7b771..fa1932b 100644 --- a/layouts/_partials/article-meta.html +++ b/layouts/_partials/article-meta.html @@ -55,7 +55,7 @@ {{ if (gt (len ($context.GetTerms $taxonomy)) 0) }} {{ range $context.GetTerms $taxonomy }} {{ .LinkTitle }} diff --git a/layouts/_partials/article-pagination.html b/layouts/_partials/article-pagination.html index 3700500..8d938e5 100644 --- a/layouts/_partials/article-pagination.html +++ b/layouts/_partials/article-pagination.html @@ -11,7 +11,7 @@
{{ if $prev }} - + {{ if $next }} - + {{ if .p1.Title }} {{- .p1.Title -}} {{ else }} diff --git a/layouts/_partials/head.html b/layouts/_partials/head.html index b8f8385..c480523 100644 --- a/layouts/_partials/head.html +++ b/layouts/_partials/head.html @@ -17,7 +17,7 @@ {{ $jsAppearance = $jsAppearance | resources.Minify | resources.Fingerprint $algorithm }} {{ $cssScheme := resources.Get (printf "css/schemes/%s.css" (lower .Site.Params.colorScheme | default "congo")) }} @@ -35,7 +35,7 @@ {{ if .Site.Params.enableSearch | default false }} @@ -66,7 +66,7 @@ defer type="text/javascript" id="script-bundle" - src="{{ $bundleJS.RelPermalink }}" + src="{{ $bundleJS.Permalink }}" integrity="{{ $bundleJS.Data.Integrity }}" data-copy="{{ i18n "code.copy" }}" data-copied="{{ i18n "code.copied" }}" @@ -100,7 +100,7 @@ {{ end }} {{ range .AlternativeOutputFormats -}} - {{ printf `` .Rel .MediaType.Type .RelPermalink ($.Site.Title | emojify) | safeHTML }} + {{ printf `` .Rel .MediaType.Type .Permalink ($.Site.Title | emojify) | safeHTML }} {{ end -}} {{/* Icons */}} {{ if templates.Exists "partials/favicons.html" }} diff --git a/layouts/_partials/logo.html b/layouts/_partials/logo.html index 03a38a7..2efe00e 100644 --- a/layouts/_partials/logo.html +++ b/layouts/_partials/logo.html @@ -5,7 +5,7 @@ {{ if eq $pageLang .Lang }} {{ .LanguageName }} {{ else }} {{ .LanguageName }} diff --git a/layouts/_partials/vendor.html b/layouts/_partials/vendor.html index 3ee1094..08ca6e4 100644 --- a/layouts/_partials/vendor.html +++ b/layouts/_partials/vendor.html @@ -8,7 +8,7 @@ {{ end }} @@ -21,7 +21,7 @@ {{ end }} @@ -32,21 +32,17 @@ {{ $katexJS := resources.Get "lib/katex/katex.min.js" }} {{ $katexJS := $katexJS | resources.Fingerprint $algorithm }} - + {{ $katexRenderJS := resources.Get "lib/katex/auto-render.min.js" }} {{ $katexRenderJS := $katexRenderJS | resources.Fingerprint $algorithm }} diff --git a/layouts/index.json b/layouts/index.json index d4e5dc6..f815191 100644 --- a/layouts/index.json +++ b/layouts/index.json @@ -8,7 +8,7 @@ "section" ($section.Title | emojify | safeJS) "summary" (.Summary | emojify | safeJS) "content" (.Plain | emojify | safeJS) - "permalink" .RelPermalink + "permalink" .Permalink ) -}} {{- end -}} diff --git a/layouts/taxonomy.html b/layouts/taxonomy.html index a2a56f5..88bfb29 100644 --- a/layouts/taxonomy.html +++ b/layouts/taxonomy.html @@ -18,7 +18,7 @@

{{ .Page.Title }} {{ if $.Site.Params.taxonomy.showTermCount | default true }}