Fix issue where all pages appear on root level if children keyword is used on home page.

This commit is contained in:
Christopher Greaves 2019-03-12 19:30:32 +00:00 committed by Matthew Taylor
parent 55b1b8ee83
commit 8cd64b1bc9

View file

@ -4,12 +4,19 @@
{{ $withDescription := .Get "description" | default false }}
{{ $sortTerm := .Get "sort" | default "Weight" }}
<ul class="children children-{{$style}}">
{{ .Scratch.Set "pages" .Page.Pages }}
{{if .Page.IsHome}}
<!-- Add pages that are in root dir -->
{{ $rootPage := where .Page.Pages "Dir" "" }}
{{ .Scratch.Set "pages" (.Page.Sections | union $rootPage)}}
{{else}}
{{ if .Page.Sections}}
{{ .Scratch.Set "pages" (.Page.Pages | union .Page.Sections) }}
{{end}}
{{end}}
{{ $pages := (.Scratch.Get "pages") }}
{{if eq $sortTerm "Weight"}}
@ -33,8 +40,7 @@
{{ range .menu }}
{{ if and .Params.hidden (not $.showhidden) }}
{{else}}
{{if not .IsHome}}
{{if hasPrefix $.style "h"}}
{{$num := sub ( int (trim $.style "h") ) 1 }}
{{$numn := add $num $.count }}
@ -49,10 +55,6 @@
{{(printf "</%s>" $.style)|safeHTML}}
{{end}}
{{if $.description}}
{{if .Description}}
<p>{{.Description}}</p>
@ -60,17 +62,19 @@
<p>{{.Summary}}</p>
{{end}}
{{end}}
{{end}}
{{ if lt $.count $.depth}}
{{if eq $.style "li"}}
<ul>
{{end}}
{{ .Scratch.Set "pages" .Pages }}
{{ if .Sections}}
{{ .Scratch.Set "pages" (.Pages | union .Sections) }}
{{else}}
{{ .Scratch.Set "pages" .Pages }}
{{end}}
{{ $pages := (.Scratch.Get "pages") }}
{{if eq $.sortTerm "Weight"}}
@ -86,11 +90,11 @@
{{else}}
{{template "childs" dict "menu" $pages "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm}}
{{end}}
{{if eq $.style "li"}}
</ul>
{{end}}
{{end}}
{{end}}
{{end}}
{{end}}