From bf599d25db2284be434b91e224d1c445175320bf Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Thu, 9 Jan 2025 19:37:57 +0100 Subject: [PATCH] fix: retrieve menu data for sections (list pages) --- layouts/partials/utilities/GetMenu.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/layouts/partials/utilities/GetMenu.html b/layouts/partials/utilities/GetMenu.html index 9e59c48..62a44c0 100644 --- a/layouts/partials/utilities/GetMenu.html +++ b/layouts/partials/utilities/GetMenu.html @@ -1,28 +1,28 @@ {{- $page := .page -}} {{- $version := .version -}} -{{- $sidebarFilename := "" -}} +{{- $path := "" -}} {{- $menu := "" -}} -{{- if $page.IsPage -}} +{{- if or $page.IsPage $page.IsSection -}} {{/* Try filename with language extension */}} - {{- $sidebarFilename = printf "%s-%s.%s" $page.Section $version $page.Lang -}} - {{- $menu = index site.Data $sidebarFilename -}} + {{- $path = printf "%s-%s.%s" $page.Section $version $page.Lang -}} + {{- $menu = index site.Data $path -}} {{ if not $menu }} - {{- $sidebarFilename = printf "%s.%s" $page.Section $page.Lang -}} - {{ $menu = index site.Data $sidebarFilename }} + {{- $path = printf "%s.%s" $page.Section $page.Lang -}} + {{ $menu = index site.Data $path }} {{ end }} {{/* Try filename without language extension */}} {{ if not $menu }} - {{- $sidebarFilename = printf "%s-%s" $page.Section $version -}} - {{- $menu = index site.Data $sidebarFilename -}} + {{- $path = printf "%s-%s" $page.Section $version -}} + {{- $menu = index site.Data $path -}} {{ end }} {{ if not $menu }} - {{- $sidebarFilename = $page.Section -}} - {{ $menu = index site.Data $sidebarFilename }} + {{- $path = $page.Section -}} + {{ $menu = index site.Data $path }} {{ end }} {{- end -}} -{{ if $menu }}{{ with $sidebarFilename }}{{ $page.Scratch.Set "sidebarFilename" (path.Join "data" .) }}{{ end }}{{ end -}} +{{ if $menu }}{{ with $path }}{{ $page.Scratch.Set "sidebarFilename" (path.Join "data" .) }}{{ end }}{{ end -}} {{- return $menu -}} \ No newline at end of file