Merge pull request #570 from gethinode/develop

Support content view templates for single pages
Merge branch 'main' into develop
2025-10-17 23:13:11 +00:00 · 2023-10-18 15:20:09 +02:00 · 2023-10-18 15:09:50 +02:00 · 2023-10-18 15:09:14 +02:00 · 2023-10-18 13:35:29 +02:00 · 2023-10-18 13:18:13 +02:00
19 changed files with 191 additions and 187 deletions
--- a/exampleSite/content/en/blog/bootstrap-elements.md
+++ b/exampleSite/content/en/blog/bootstrap-elements.md
@@ -294,9 +294,9 @@ As an example, the following shortcodes render links in different formats.
 - {{</* link url="projects/another-project" /*/>}}
 - {{</* link url="/projects/another-project" /*/>}}
 - {{</* link url="../projects/another-project" case=false /*/>}}
- {{</* link "/about/" /*/>}}
- {{</* link "/fr/about/" /*/>}}
- {{</* link "/fr/about" >}}About (French){{< /link */>}}
+- {{</* link "about" /*/>}}
+- {{</* link "/fr/a-propos/" /*/>}}
+- {{</* link "/fr/a-propos" >}}About (French){{< /link */>}}
 - {{</* link "#image" /*/>}}
 - {{</* link "components/#map" /*/>}}

--- a/exampleSite/content/fr/blog/bootstrap-elements.md
+++ b/exampleSite/content/fr/blog/bootstrap-elements.md
@@ -295,7 +295,7 @@ Utilisez le shortcode `file` pour afficher et mettre en évidence le contenu com
 - {{</* link url="projects/another-project" /*/>}}
 - {{</* link url="/projects/another-project" /*/>}}
 - {{</* link url="../projects/another-project" case=false /*/>}}
- {{</* link "/about/" /*/>}}
+- {{</* link "about" /*/>}}
 - {{</* link "/en/about/" /*/>}}
 - {{</* link "/en/about" >}}About (Anglais){{< /link */>}}
 - {{</* link "#image" /*/>}}
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -42,6 +42,18 @@
    {{- range $index, $section := $sections -}}
        {{- $sectionPage := site.GetPage "section" $section -}}
        {{- $sectionURL := $sectionPage.RelPermalink -}}
+        {{ with $sectionPage.Params.redirect}}
+            {{ $target := partial "utilities/GetPage.html" (dict "url" . "page" $page) }}
+            {{- if not $target -}}
+                {{ if eq (printf "%T" $page.File) "*hugolib.fileInfo"}}
+                    {{- errorf "Cannot find redirect target on page '%s': %s" $page.File . -}}
+                {{ else }}
+                    {{- errorf "Cannot find redirect target: %s" . -}}
+                {{ end }}
+            {{ else }}
+                {{- $sectionURL = $target.RelPermalink -}}
+            {{ end }}
+        {{ end }}
        {{- $title := or $sectionPage.Title $sectionPage.Type -}}

        {{- with (index site.Params.sections $section) -}}
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,118 +1,15 @@
-{{- define "partials/header.html" -}}
-    {{ if site.Params.navigation.breadcrumb }}{{ partial "assets/breadcrumb.html" . }}{{ end -}}
-    {{ if in (slice "docs" "minimal") .Layout }}
-        {{ with .Title }}<p class="display-4 mt-5">{{ . }}</p>{{ end }}
-        {{ partial "assets/sharing.html" . }}
-        <p class="lead mb-5">{{ .Description }}</p>
-    {{ else }}
-        {{ $lastmodstr := (partial "utilities/date.html" (dict "date" .Lastmod "format" "long")) -}}
-        {{ $datestr := (partial "utilities/date.html" (dict "date" .Date "format" "long")) -}}
-        {{ with .Title }}<p class="display-4 mt-5">{{ . }}</p>{{ end }}
-        <small class="text-body-secondary text-uppercase">
-            {{ $datestr | i18n "postedOnDate" -}}
-            {{ if ne $datestr $lastmodstr -}}&nbsp;({{ $lastmodstr | i18n "lastModified" }}){{ end }} &bull;
-            {{ .ReadingTime | lang.FormatNumber 0 }}&nbsp;{{ i18n "minutesShort" }} {{ i18n "read" }} &bull;
-            {{ .WordCount | lang.FormatNumber 0 }}&nbsp;{{ i18n "words" }}
-        </small>
+{{- define "partials/single-main.html" -}}
+    {{ if .Site.Params.navigation.breadcrumb }}{{ partial "assets/breadcrumb.html" . }}{{ end -}}

-        {{- if gt (len (.GetTerms "tags")) 0 -}}
-            <div class="mt-3">
-                <div class="d-none-dark">
-                    <div class="hstack gap-1">
-                        {{ range (.GetTerms "tags") -}}
-                            {{- $url := (path.Join .Page.RelPermalink) | relLangURL -}}
-                            {{ partial "assets/button.html" (dict "href" $url "title" .LinkTitle "color" "light" "size" "sm") }}
-                        {{ end -}}
-                    </div>
-                </div>
-                
-                <div class="d-none-light">
-                    <div class="hstack gap-1">
-                        {{ range (.GetTerms "tags") -}}
-                            {{- $url := (path.Join .Page.RelPermalink) | relLangURL -}}
-                            {{ partial "assets/button.html" (dict "href" $url "title" .LinkTitle "color" "primary" "size" "sm" "outline" "true") }}
-                        {{ end -}}
-                    </div>
-                </div>
-            </div>
-        {{- end -}}
-        {{ partial "assets/sharing.html" . }}
-        <p class="lead mb-5 mt-3">{{ .Description }}</p>
-    {{ end }}
-{{ end -}}
+    {{ .Render "single/header" }}

-{{ define "partials/body.html" -}}
    {{- if and .Site.Params.navigation.toc .Params.includeToc | default true -}}
        <div class="d-md-none pb-5">{{ partial "assets/toc-dropdown.html" . }}</div>
    {{- end -}}
-
-    {{ if not (in (slice "docs" "minimal") .Layout) }}
-        {{- $thumbnail := "" -}}
-        {{- $credits := "" -}}
-        
-        {{- if reflect.IsMap .Params.Thumbnail -}}
-            {{- $thumbnail = .Params.Thumbnail.url -}}
-            {{- $author := "" -}}
-            {{- if and .Params.Thumbnail.authorURL "text" .Params.Thumbnail.author }}
-                {{- $author = partial "utilities/link" (dict "destination" .Params.Thumbnail.authorURL "text" .Params.Thumbnail.author) -}}
-            {{- else if .Params.Thumbnail.author }}
-                {{- $author = .Params.Thumbnail.author -}}
-            {{- end -}}
-
-            {{- $origin := "" -}}
-            {{- if and .Params.Thumbnail.originURL "text" .Params.Thumbnail.origin }}
-                {{- $origin = partial "utilities/link" (dict "destination" .Params.Thumbnail.originURL "text" .Params.Thumbnail.origin) -}}
-            {{- else if .Params.Thumbnail.origin }}
-                {{- $origin = .Params.Thumbnail.origin -}}
-            {{- end }}
-
-            {{- if and $author $origin }}
-                {{ $credits = printf (T "photoFull") $author $origin }}
-            {{ else if $author }}
-                {{ $credits = T "photoShort" $author }}
-            {{ end }}
-        {{ else }}
-            {{- $thumbnail = .Params.Thumbnail -}}
-            {{ if or .Params.photoCredits .Params.photoSource }}
-                {{ warnf "DEPRECATED: frontmatter variables `photoCredits` and `photoSource` have been deprecated in release v0.18: %s" .RelPermalink }}
-            {{ end }}
-            {{- if and .Params.photoCredits .Params.PhotoSource }}{{ $credits = printf (T "photoFull") .Params.photoCredits .Params.PhotoSource }}{{ end -}}
-        {{- end -}}
-
-        {{ if $thumbnail -}}
-            {{- partial "assets/image.html" (dict "url" $thumbnail "ratio" "21x9" "outerClass" "img-wrap" "innerClass" "rounded" "title" .Params.title "caption" $credits) -}}
-        {{ end -}}
-    {{ end }}
-
+    {{ .Render "single/body" }}
    {{ partial "utilities/ProcessContent" (dict "page" .Page "raw" .RawContent) }}
-{{ end -}}

-{{ define "partials/footer.html" -}}
-    {{ if eq .Layout "docs" }}
-        <div class="mt-5 small">
-            {{ partial "utilities/git.html" . }}
-        </div>
-    {{ else if ne .Layout "minimal" }}
-        <div class="row row-cols-2 mt-5 mb-3">
-            <div class="col">
-                {{ with .NextInSection -}}
-                    {{ $next := . -}}
-                    {{ with .OutputFormats.Get "html" -}}
-                        <a class="next" href="{{ $next.RelPermalink }}">
-                            {{- partial "assets/icon.html" (dict "icon" "fas arrow-left") }}&nbsp;{{ $next.LinkTitle }}</a>
-                    {{- end -}}
-                {{ end -}}
-            </div>
-            <div class="col text-end">
-                {{ with .PrevInSection -}}
-                    {{ $prev := . -}}
-                    {{ with .OutputFormats.Get "html" -}}
-                        <a class="previous" href="{{ $prev.RelPermalink }}">{{ $prev.LinkTitle }}&nbsp;{{- partial "assets/icon.html" (dict "icon" "fas arrow-right") }}</a>
-                    {{- end -}}
-                {{ end -}}
-            </div>
-        </div>
-    {{ end }}
+    {{ .Render "single/footer" }}
    {{- if and .Site.Params.comments.enabled .Params.showComments | default true -}}
        <hr>
        {{ partial "assets/comments.html" . }}
@@ -127,65 +24,59 @@
    
    {{- $menu := .Scratch.Get "sidebar" -}}
    {{- $version := .Scratch.Get "version" -}}
-    {{- $sidebar := .Site.Params.navigation.sidebar | default true -}}
-    {{ if and $menu $sidebar -}}
+
+    {{ $sidebar := "" }}
+    {{- $hasSidebar := .Site.Params.navigation.sidebar | default true -}}
+    {{ if and $menu $hasSidebar  }}{{ $sidebar = partial "assets/sidebar.html" (dict "page" . "menu" $menu "version" $version) }}{{ end }}
+
+    {{ $toc := "" }}
+    {{- $hasTOC := and .Site.Params.navigation.toc .Params.includeToc | default true -}}
+    {{ if $hasTOC }}{{ $toc = partial "assets/toc.html" (dict "page" . "download" $download) }}{{ end -}}
+
+    {{ with $sidebar -}}
        <div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvass-sidebar" aria-inledby="offcanvas-label">
            <div class="offcanvas-header">
-                <h5 class="offcanvas-title" id="offcanvas-label">{{ strings.FirstUpper .Section }}</h5>
+                <h5 class="offcanvas-title" id="offcanvas-label">{{ strings.FirstUpper $.Section }}</h5>
                <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
            </div>
            <div class="offcanvas-body">
-                {{ partial "assets/sidebar" (dict "page" . "menu" $menu "version" $version) }}
+                {{ . | safeHTML }}
            </div>
        </div>
-    
-        <div class="container-xxl p-4 px-xxl-0">
+    {{ end }}
+
+    <div class="container-xxl p-4 px-xxl-0">
+        {{ if and $menu $hasSidebar -}}
            <div class="row row-cols-md-2 row-cols-lg-3">
                <div class="col col-md-3 col-lg-2 d-none pt-5 d-md-block sidebar-overflow sticky-top">
-                    {{ partial "assets/sidebar" (dict "page" . "menu" $menu "version" $version) }}
+                    {{ $sidebar | safeHTML }}
                </div>
                <div class="col col-md-9 col-lg-8 mb-5 p-4">
-                    {{ partial "partials/header.html" . }}
-                    {{ partial "partials/body.html" . }}
-                    {{ partial "partials/footer.html" . }}
+                    {{ partial "partials/single-main.html" . }}
                </div>
                <div class="col col-lg-2 d-none d-lg-block pt-5">
-                    {{- if and .Site.Params.navigation.toc .Params.includeToc | default true -}}
-                        {{ partial "assets/toc.html" (dict "page" . "download" $download) -}}
-                    {{ end -}}
+                    {{ $toc | safeHTML }}
                </div>
            </div>
-        </div>
-    {{ else if $sidebar }}
-        <div class="container-xxl px-3 px-xxl-0">
+        {{ else if $hasSidebar }}
            <div class="row row-cols-1 row-cols-sm-3">
                <div class="col col-md-2 d-none d-md-block"></div>
                <div class="col col-sm-12 col-md-8">
-                    {{ partial "partials/header.html" . }}
-                    {{ partial "partials/body.html" . }}
-                    {{ partial "partials/footer.html" . }}
+                    {{ partial "partials/single-main.html" . }}
                </div>
                <div class="col col-md-2 d-none d-md-block">
-                    {{- if and .Site.Params.navigation.toc .Params.includeToc | default true -}}
-                        {{ partial "assets/toc.html" (dict "page" . "download" $download) -}}
-                    {{ end -}}
+                    {{ $toc | safeHTML }}
                </div>
            </div>    
-        </div>
-    {{ else }}
-        <div class="container-xxl px-3 px-xxl-0">
+        {{ else }}
            <div class="row row-cols-1 row-cols-sm-2">
                <div class="col col-sm-12 col-md-9">
-                    {{ partial "partials/header.html" . }}
-                    {{ partial "partials/body.html" . }}
-                    {{ partial "partials/footer.html" . }}
+                    {{ partial "partials/single-main.html" . }}
                </div>
                <div class="col col-md-3 d-none d-md-block">
-                    {{- if and .Site.Params.navigation.toc .Params.includeToc | default true -}}
-                        {{ partial "assets/toc.html" (dict "page" . "download" $download) -}}
-                    {{ end -}}
+                    {{ $toc | safeHTML }}
                </div>
            </div>    
-        </div>
-    {{ end -}}
+        {{ end -}}
+    </div>
 {{ end -}}
--- a/layouts/_default/single/body.html
+++ b/layouts/_default/single/body.html
@@ -0,0 +1 @@
+{{- partial "single/thumbnail.html" . -}}
--- a/layouts/_default/single/footer.html
+++ b/layouts/_default/single/footer.html
@@ -0,0 +1,20 @@
+<div class="row row-cols-2 mt-5 mb-3">
+    <div class="col">
+        {{ with .NextInSection -}}
+            {{ if .OutputFormats.Get "html" -}}
+                <a class="next" href="{{ .RelPermalink }}">
+                    {{- partial "assets/icon.html" (dict "icon" "fas arrow-left" "spacing" false) }}&nbsp;{{ .LinkTitle }}
+                </a>
+            {{- end -}}
+        {{ end -}}
+    </div>
+    <div class="col text-end">
+        {{ with .PrevInSection -}}
+            {{ if .OutputFormats.Get "html" -}}
+                <a class="previous" href="{{ .RelPermalink }}">
+                    {{ .LinkTitle }}&nbsp;{{- partial "assets/icon.html" (dict "icon" "fas arrow-right" "spacing" false) }}
+                </a>
+            {{- end -}}
+        {{ end -}}
+    </div>
+</div>
--- a/layouts/_default/single/header.html
+++ b/layouts/_default/single/header.html
@@ -0,0 +1,33 @@
+{{ $lastmodstr := (partial "utilities/date.html" (dict "date" .Lastmod "format" "long")) -}}
+{{ $datestr := (partial "utilities/date.html" (dict "date" .Date "format" "long")) -}}
+{{ with .Title }}<p class="display-4 mt-5">{{ . }}</p>{{ end }}
+<small class="text-body-secondary text-uppercase">
+    {{ $datestr | i18n "postedOnDate" -}}
+    {{ if ne $datestr $lastmodstr -}}&nbsp;({{ $lastmodstr | i18n "lastModified" }}){{ end }} &bull;
+    {{ .ReadingTime | lang.FormatNumber 0 }}&nbsp;{{ i18n "minutesShort" }} {{ i18n "read" }} &bull;
+    {{ .WordCount | lang.FormatNumber 0 }}&nbsp;{{ i18n "words" }}
+</small>
+
+{{- if gt (len (.GetTerms "tags")) 0 -}}
+    <div class="mt-3">
+        <div class="d-none-dark">
+            <div class="hstack gap-1">
+                {{ range (.GetTerms "tags") -}}
+                    {{- $url := (path.Join .Page.RelPermalink) | relLangURL -}}
+                    {{ partial "assets/button.html" (dict "href" $url "title" .LinkTitle "color" "light" "size" "sm") }}
+                {{ end -}}
+            </div>
+        </div>
+        
+        <div class="d-none-light">
+            <div class="hstack gap-1">
+                {{ range (.GetTerms "tags") -}}
+                    {{- $url := (path.Join .Page.RelPermalink) | relLangURL -}}
+                    {{ partial "assets/button.html" (dict "href" $url "title" .LinkTitle "color" "primary" "size" "sm" "outline" "true") }}
+                {{ end -}}
+            </div>
+        </div>
+    </div>
+{{- end -}}
+{{ partial "assets/sharing.html" . }}
+<p class="lead mb-5 mt-3">{{ .Description }}</p>
--- a/layouts/docs/single/body.html
+++ b/layouts/docs/single/body.html
@@ -0,0 +1 @@
+{{/* Intentionally left blank to suppress thumbnail */}}
--- a/layouts/docs/single/footer.html
+++ b/layouts/docs/single/footer.html
@@ -0,0 +1,3 @@
+<div class="mt-5 small">
+    {{ partial "utilities/git.html" . }}
+</div>
--- a/layouts/docs/single/header.html
+++ b/layouts/docs/single/header.html
@@ -0,0 +1,3 @@
+{{ with .Title }}<p class="display-4 mt-5">{{ . }}</p>{{ end }}
+{{ partial "assets/sharing.html" . }}
+<p class="lead mb-5">{{ .Description }}</p>
--- a/layouts/minimal/single/body.html
+++ b/layouts/minimal/single/body.html
@@ -0,0 +1 @@
+{{/* Intentionally left blank to suppress thumbnail */}}
--- a/layouts/minimal/single/footer.html
+++ b/layouts/minimal/single/footer.html
@@ -0,0 +1 @@
+{{/* Intentionally left blank to suppress page navigation */}}
--- a/layouts/minimal/single/header.html
+++ b/layouts/minimal/single/header.html
@@ -0,0 +1,3 @@
+{{ with .Title }}<p class="display-4 mt-5">{{ . }}</p>{{ end }}
+{{ partial "assets/sharing.html" . }}
+<p class="lead mb-5">{{ .Description }}</p>
--- a/layouts/partials/single/thumbnail.html
+++ b/layouts/partials/single/thumbnail.html
@@ -0,0 +1,35 @@
+{{- $thumbnail := "" -}}
+{{- $credits := "" -}}
+
+{{- if reflect.IsMap .Params.Thumbnail -}}
+    {{- $thumbnail = .Params.Thumbnail.url -}}
+    {{- $author := "" -}}
+    {{- if and .Params.Thumbnail.authorURL "text" .Params.Thumbnail.author }}
+        {{- $author = partial "utilities/link" (dict "destination" .Params.Thumbnail.authorURL "text" .Params.Thumbnail.author) -}}
+    {{- else if .Params.Thumbnail.author }}
+        {{- $author = .Params.Thumbnail.author -}}
+    {{- end -}}
+
+    {{- $origin := "" -}}
+    {{- if and .Params.Thumbnail.originURL "text" .Params.Thumbnail.origin }}
+        {{- $origin = partial "utilities/link" (dict "destination" .Params.Thumbnail.originURL "text" .Params.Thumbnail.origin) -}}
+    {{- else if .Params.Thumbnail.origin }}
+        {{- $origin = .Params.Thumbnail.origin -}}
+    {{- end }}
+
+    {{- if and $author $origin }}
+        {{ $credits = printf (T "photoFull") $author $origin }}
+    {{ else if $author }}
+        {{ $credits = T "photoShort" $author }}
+    {{ end }}
+{{ else }}
+    {{- $thumbnail = .Params.Thumbnail -}}
+    {{ if or .Params.photoCredits .Params.photoSource }}
+        {{ warnf "DEPRECATED: frontmatter variables `photoCredits` and `photoSource` have been deprecated in release v0.18: %s" .RelPermalink }}
+    {{ end }}
+    {{- if and .Params.photoCredits .Params.PhotoSource }}{{ $credits = printf (T "photoFull") .Params.photoCredits .Params.PhotoSource }}{{ end -}}
+{{- end -}}
+
+{{ if $thumbnail -}}
+    {{- partial "assets/image.html" (dict "url" $thumbnail "ratio" "21x9" "outerClass" "img-wrap" "innerClass" "rounded" "title" .Params.title "caption" $credits) -}}
+{{ end -}}
--- a/layouts/partials/utilities/GetPage.html
+++ b/layouts/partials/utilities/GetPage.html
@@ -0,0 +1,33 @@
+{{- $ref := "" -}}
+{{- $anchor := "" -}}
+
+{{ $url := .url }}
+{{ if not $url }}
+    {{- errorf "partial [utilities/GetPage.html] - Expected param 'url'" -}}
+{{ end }}
+
+{{ $page := .page }}
+{{ if not $page }}
+    {{- errorf "partial [utilities/GetPage.html] - Expected param 'page'" -}}
+{{ end }}
+
+{{- $isExternal := ne (urls.Parse (absURL $url)).Host (urls.Parse site.BaseURL).Host -}}
+{{- if not $isExternal -}}
+    {{- $ref = $page.GetPage $url -}}
+    {{ if not $ref }}
+        {{ $ref = (index (where $page.Site.AllPages "RelPermalink" (printf "%s/" (strings.TrimSuffix "/" $url))) 0)}} 
+    {{ end }}
+
+    {{- if not $ref }}
+        {{- $segments := split $url "/" -}}
+        {{- if and (hasPrefix $url "/")  (gt (len $segments) 1) -}}
+            {{- $prefix := index $segments 1 -}}
+            {{ with index (where site.Sites "Language.Lang" $prefix) 0 }}
+                {{- $path := printf "/%s" (strings.TrimPrefix (printf "/%s/" $prefix) $url) }}
+                {{- $ref = .GetPage $path -}}
+            {{ end }}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{ return $ref }}
--- a/layouts/partials/utilities/link.html
+++ b/layouts/partials/utilities/link.html
@@ -35,25 +35,12 @@
        {{- if ne (len $segments) 2 }}
            {{- errorf "partial [utilities/link.html] - Malformed path, expected one anchor '#' only: %s" $destination -}}
        {{ else }}
-            {{- $destination = index $segments 0 -}}            
-            {{- $anchor = index $segments 1 -}}            
+            {{- $destination = index $segments 0 -}}
+            {{- $anchor = index $segments 1 -}}
        {{ end }}
    {{ end }}
-    {{- $destination = strings.TrimSuffix "/" $destination -}}
-    {{- $ref := $page.GetPage $destination -}}
-
-    {{- if not $ref }}
-        {{- $segments := split $destination "/" -}}
-        {{- if and (hasPrefix $destination "/")  (gt (len $segments) 1) -}}
-            {{- $prefix := index $segments 1 -}}
-            {{- $page := .Page -}}
-            {{ with index (where site.Sites "Language.Lang" $prefix) 0 }}
-                {{- $path := printf "/%s" (strings.TrimPrefix (printf "/%s/" $prefix) $destination) }}
-                {{- $ref = .GetPage $path -}}
-            {{ end }}
-        {{- end -}}
-    {{- end -}}

+    {{ $ref := partial "utilities/GetPage.html" (dict "url" $destination "page" $page) }}
    {{- if not $ref -}}
        {{- errorf "partial [utilities/link.html] - Cannot find page: %s" $destination -}}
        {{- $error = true -}}
--- a/layouts/shortcodes/link.html
+++ b/layouts/shortcodes/link.html
@@ -73,27 +73,9 @@

 {{- $isExternal := ne (urls.Parse (absURL $url)).Host (urls.Parse site.BaseURL).Host -}}
 {{- if not $isExternal -}}
-    {{- $url = strings.TrimSuffix "/" $url -}}
-
-    {{- $ref := "" -}}
+    {{ $ref := partial "utilities/GetPage.html" (dict "url" $url "page" .Page) }}
    {{- if not $ref -}}
-        {{- $ref = .Page.GetPage $url -}}
-    {{- end -}}
-
-    {{- if not $ref }}
-        {{- $segments := split $url "/" -}}
-        {{- if and (hasPrefix $url "/")  (gt (len $segments) 1) -}}
-            {{- $prefix := index $segments 1 -}}
-            {{- $page := .Page -}}
-            {{ with index (where site.Sites "Language.Lang" $prefix) 0 }}
-                {{- $path := printf "/%s" (strings.TrimPrefix (printf "/%s/" $prefix) $url) }}
-                {{- $ref = .GetPage $path -}}
-            {{ end }}
-        {{- end -}}
-    {{- end -}}
-
-    {{- if not $ref -}}
-        {{- errorf "Cannot find page: '%s' at %s" $href .Position -}}
+        {{- errorf "Cannot find page: '%s' at %s" $url .Position -}}
        {{- $error = true -}}
    {{- end -}}
 {{- end -}}
@@ -101,9 +83,7 @@
 {{ with $anchor }}
    {{ $url = printf "%s#%s" $url .}}
 {{ end }}
+
 {{- if not $error -}}
    {{ partial "utilities/link.html" (dict "destination" $url "text" $text "cue" $cue "tab" $tab "case" $case "class" $class "page" .Page) }}
 {{- end -}}
-
-
-
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.21.0-alpha5",
+  "version": "0.21.0-beta",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.21.0-alpha5",
+      "version": "0.21.0-beta",
      "license": "MIT",
      "devDependencies": {
        "@fullhuman/postcss-purgecss": "^5.0.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.21.0-alpha5",
+  "version": "0.21.0-beta",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
Author	SHA1	Message	Date
Mark Dumay	b9699ab8bc	Merge pull request #570 from gethinode/develop Support content view templates for single pages	2023-10-18 15:20:09 +02:00
Mark Dumay	02ca7271fc	Merge branch 'main' into develop	2023-10-18 15:09:50 +02:00
mark	9dbe4bc8a1	Support content view templates for single pages	2023-10-18 15:09:14 +02:00
Mark Dumay	2ca20096a0	Merge pull request #569 from gethinode/develop Use redirect for more button when applicable	2023-10-18 13:35:29 +02:00
Mark Dumay	1d7e8e3adb	Merge branch 'main' into develop	2023-10-18 13:18:13 +02:00
mark	88c897e09c	Use redirect for more button when applicable	2023-10-18 13:17:28 +02:00
Mark Dumay	f1a1ec128f	Merge pull request #568 from gethinode/develop Refactor link partial and shortcode	2023-10-18 13:15:05 +02:00
Mark Dumay	b0bc03f251	Merge branch 'main' into develop	2023-10-18 13:08:35 +02:00
mark	0f57e9ad1d	Bump package release	2023-10-18 13:07:39 +02:00
mark	8b27c8986b	Refactor link partial and shortcode	2023-10-18 13:06:57 +02:00
mark	1210117922	Standardize padding	2023-10-18 13:00:49 +02:00
				`@@ -0,0 +1 @@`
				`{{/* Intentionally left blank to suppress thumbnail */}}`