From 0b30289d9f3520144bb37caa009d8953cde0e3d6 Mon Sep 17 00:00:00 2001 From: Alex Shpak Date: Mon, 22 Apr 2019 19:17:39 +0200 Subject: #43, Update tree menu rendering to support multiple sections --- layouts/home.html | 4 +- layouts/partials/docs/git-footer.html | 2 +- layouts/partials/docs/menu-bundle.html | 5 +-- layouts/partials/docs/menu-filetree.html | 76 ++++++++++++++++++-------------- layouts/partials/docs/menu.html | 6 ++- layouts/partials/docs/shared.html | 25 +++++------ layouts/posts/list.html | 6 +-- layouts/posts/single.html | 4 +- 8 files changed, 70 insertions(+), 58 deletions(-) (limited to 'layouts') diff --git a/layouts/home.html b/layouts/home.html index d2db819..bf76fc7 100644 --- a/layouts/home.html +++ b/layouts/home.html @@ -6,7 +6,7 @@ {{ partial "docs/html-head" . }} {{ partial "docs/inject/head" . }} -{{- $content := ` +{{ $content := ` # Hugo Book Theme This is a placeholder for home page. @@ -14,7 +14,7 @@ You can override this page in: - `/content/_index.md` - `/layouts/home.html` -` -}} +` }}
diff --git a/layouts/partials/docs/git-footer.html b/layouts/partials/docs/git-footer.html index 4b2f44d..001c9ff 100644 --- a/layouts/partials/docs/git-footer.html +++ b/layouts/partials/docs/git-footer.html @@ -2,7 +2,7 @@
{{ with .GitInfo }}
- {{- $date := .AuthorDate.Local.Format (default "January 2, 2006" $.Site.Params.BookDateFormat) -}} + {{ $date := .AuthorDate.Local.Format (default "January 2, 2006" $.Site.Params.BookDateFormat) }} {{ $date }} diff --git a/layouts/partials/docs/menu-bundle.html b/layouts/partials/docs/menu-bundle.html index 5d90bbf..bfc1650 100644 --- a/layouts/partials/docs/menu-bundle.html +++ b/layouts/partials/docs/menu-bundle.html @@ -1,7 +1,4 @@ -{{- template "hrefhack" . -}} +{{ template "hrefhack" . }} {{ with .Site.GetPage .Site.Params.BookMenuBundle }} {{- .Content -}} {{ end }} -{{ if .Site.Params.BookEnableJS }} - {{- template "jsmenu" . -}} -{{ end }} \ No newline at end of file diff --git a/layouts/partials/docs/menu-filetree.html b/layouts/partials/docs/menu-filetree.html index 8530656..b0f28c0 100644 --- a/layouts/partials/docs/menu-filetree.html +++ b/layouts/partials/docs/menu-filetree.html @@ -1,47 +1,59 @@ - -{{ template "book-get-root-section" . }} +{{ $bookSection := default "docs" .Site.Params.BookSection }} +{{ if eq $bookSection "*" }} + {{ .Scratch.Set "BookSections" .Site.Sections }} +{{ else }} + {{ $bookSections := where .Site.Sections "Section" $bookSection }} + {{ .Scratch.Set "BookSections" $bookSections }} +{{ end }} -{{- range .Scratch.Get "BookSections" -}} - {{ template "book-section" (dict "Section" . "CurrentPage" $.Permalink) }} -{{- end -}} -{{ define "book-section" }} +{{ $sections := .Scratch.Get "BookSections" }} +{{/* If there is only one section to render then render its children, else render all sections */}} +{{ if eq (len $sections) 1 }} + {{ with index $sections 0 }} + {{ template "book-section-children" (dict "Section" . "CurrentPage" $.Permalink) }} + {{ end }} +{{ else }}
    - {{ range .Section.Sections }} -
  • - {{- if .Content -}} - {{ template "book-page-link" (dict "Page" . "CurrentPage" $.CurrentPage) }} - {{- else -}} - {{- template "title" . -}} - {{- end -}} + {{ range $sections }} + {{ template "book-section" (dict "Section" . "CurrentPage" $.Permalink) }} + {{ end }} +
+{{ end }} - {{ template "book-section" (dict "Section" . "CurrentPage" $.CurrentPage) }} - +{{ define "book-section" }} +{{ with .Section }} +
  • + {{ if .Content }} + {{ template "book-page-link" (dict "Page" . "CurrentPage" $.CurrentPage) }} + {{ else }} + {{ template "title" . }} {{ end }} - {{ range .Section.Pages }} + {{ template "book-section-children" (dict "Section" . "CurrentPage" $.CurrentPage) }} +
    • +{{ end }} +{{ end }} + +{{ define "book-section-children" }} +{{ with .Section }} +
      + {{ range .Sections }} + {{ template "book-section" (dict "Section" . "CurrentPage" $.CurrentPage) }} + {{ end }} + {{ range .Pages }}
    • {{ template "book-page-link" (dict "Page" . "CurrentPage" $.CurrentPage) }}
      • {{ end }}
    {{ end }} +{{ end }} {{ define "book-page-link" }} -{{- with .Page -}} - - {{- template "title" . -}} - -{{- end -}} +{{ with .Page }} + + {{ template "title" . }} + +{{ end }} {{ end }} - -{{ define "book-get-root-section" }} - - {{ $bookSection := default "docs" .Site.Params.BookSection }} - {{ if eq $bookSection "*" }} - {{ .Scratch.Set "BookSections" .Site.Sections }} - {{ else }} - {{ $bookSections := where .Site.Sections "Section" $bookSection }} - {{ .Scratch.Set "BookSections" $bookSections }} - {{ end }} -{{ end }} \ No newline at end of file diff --git a/layouts/partials/docs/menu.html b/layouts/partials/docs/menu.html index 0ded211..238f976 100644 --- a/layouts/partials/docs/menu.html +++ b/layouts/partials/docs/menu.html @@ -9,4 +9,8 @@ {{ end }} {{ partial "docs/inject/menu-after" . }} - \ No newline at end of file + + +{{ if .Site.Params.BookEnableJS }} + {{ template "jsmenu" . }} +{{ end }} diff --git a/layouts/partials/docs/shared.html b/layouts/partials/docs/shared.html index 3fbf628..2678840 100644 --- a/layouts/partials/docs/shared.html +++ b/layouts/partials/docs/shared.html @@ -1,16 +1,16 @@ {{/*These templates contains some more complex logic and shared between partials*/}} -{{- define "title" -}} - {{- if and .File .Pages -}} +{{ define "title" }} + {{ if and .File .Pages }} {{ $sections := split (trim .File.Dir "/") "/" }} {{ $title := index ($sections | last 1) 0 | humanize | title }} - {{- default $title .Title -}} - {{- else if .File -}} - {{ $title := .File | humanize | title }} - {{- default $title .Title -}} - {{- end -}} -{{- end -}} + {{ default $title .Title }} + {{ else if .File }} + {{ $title := .File.BaseFileName | humanize | title }} + {{ default $title .Title }} + {{ end }} +{{ end }} -{{- define "hrefhack" -}} +{{ define "hrefhack" }} {{ $attrEq := "$=" }} {{ $attrVal := .RelPermalink }} {{ if eq .RelPermalink "/" }} @@ -23,17 +23,16 @@ color: {{ default "#004ed0" .Site.Params.BookMenuBundleActiveLinkColor }}; } -{{- end -}} +{{ end }} -{{- define "jsmenu" -}} +{{ define "jsmenu" }} -{{- end -}} \ No newline at end of file +{{ end }} \ No newline at end of file diff --git a/layouts/posts/list.html b/layouts/posts/list.html index 18871f2..13e1ea1 100644 --- a/layouts/posts/list.html +++ b/layouts/posts/list.html @@ -1,15 +1,15 @@ {{ define "main" }} - {{- $dateFormat := default "January 2, 2006" .Site.Params.BookDateFormat -}} + {{ $dateFormat := default "January 2, 2006" .Site.Params.BookDateFormat }} {{ $paginator := .Paginate (where .Pages "Params.hidden" "ne" true) }} {{ range sort .Paginator.Pages }} -
    +

    {{ .Title }}

    {{ .Date.Format $dateFormat }}
    -

    +

    {{- .Summary -}} {{ if .Truncated }} ... diff --git a/layouts/posts/single.html b/layouts/posts/single.html index a7f94ed..9222a59 100644 --- a/layouts/posts/single.html +++ b/layouts/posts/single.html @@ -1,6 +1,6 @@ {{ define "main" }} -{{- $dateFormat := default "January 2, 2006" .Site.Params.BookDateFormat -}} -

    +{{ $dateFormat := default "January 2, 2006" .Site.Params.BookDateFormat }} +

    {{ .Title }}

    {{ .Date.Format $dateFormat }} -- cgit v1.2.3