- {{ template "toc" . }} +

- {{ partial "docs/mobile-header" . }} - {{ template "main" . }} - {{ partial "docs/footer" . }} +

+ {{ template "header" . }} +

+ + {{ template "main" . }} + + {{ partial "docs/inject/footer" . }}

{{ partial "docs/inject/body" . }} + +{{ define "menu" }} + {{ partial "docs/menu" . }} +{{ end }} + +{{ define "header" }} + {{ partial "docs/header" . }} + + {{ if default true (default .Site.Params.BookToC .Params.BookToC) }} + + + {{ end }} +{{ end }} + +{{ define "footer" }} + {{ partial "docs/footer" . }} +{{ end }} + +{{ define "comments" }} + {{ if and .Content (default true (default .Site.Params.BookComments .Params.BookComments)) }} +

+ {{- partial "docs/comments" . -}} +

+ {{ end }} +{{ end }} + +{{ define "main" }} + {{ .Content }} +{{ end }} + +{{ define "toc" }} + {{ .TableOfContents }} +{{ end }} diff --git a/layouts/partials/docs/brand.html b/layouts/partials/docs/brand.html index 7d3ca3a..3fab74b 100644 --- a/layouts/partials/docs/brand.html +++ b/layouts/partials/docs/brand.html @@ -1,5 +1,5 @@

- + {{- with .Site.Params.BookLogo -}} {{- end -}} diff --git a/layouts/partials/docs/footer.html b/layouts/partials/docs/footer.html index 0665f86..f9ca80d 100644 --- a/layouts/partials/docs/footer.html +++ b/layouts/partials/docs/footer.html @@ -1,33 +1,24 @@ -
- {{ if .Site.IsMultiLingual }} +
+{{ if .Site.IsMultiLingual }} {{ partial "docs/languages" . }} - {{ end }} +{{ end }} - {{ if and .GitInfo .Site.Params.BookRepo }} - {{ with .GitInfo }} +{{ if and .GitInfo .Site.Params.BookRepo }}
- {{ $date := .AuthorDate.Local.Format (default "January 2, 2006" $.Site.Params.BookDateFormat) }} - + {{ $date := .GitInfo.AuthorDate.Local.Format (default "January 2, 2006" .Site.Params.BookDateFormat) }} + {{ $date }}
- {{ end }} - {{ end }} +{{ end }} - {{ if and .File .Site.Params.BookRepo .Site.Params.BookEditPath }} +{{ if and .File .Site.Params.BookRepo .Site.Params.BookEditPath }}
- + {{ i18n "Edit this page" }}
- {{ end }} - -
- -{{ if (default true (default .Site.Params.BookComments .Params.bookComments)) }} -
- {{ partial "docs/comments" . }} -
{{ end }} +
diff --git a/layouts/partials/docs/header.html b/layouts/partials/docs/header.html new file mode 100644 index 0000000..23834df --- /dev/null +++ b/layouts/partials/docs/header.html @@ -0,0 +1,11 @@ +
+ + + + + {{ partial "docs/title" . }} + + + + +
diff --git a/layouts/partials/docs/menu.html b/layouts/partials/docs/menu.html index 6e41096..0db676f 100644 --- a/layouts/partials/docs/menu.html +++ b/layouts/partials/docs/menu.html @@ -1,12 +1,12 @@ -
+
{{ partial "docs/brand" . }} {{ partial "docs/search" . }} {{ partial "docs/inject/menu-before" . }} {{ if .Site.Params.BookMenuBundle }} - {{ partial "docs/menu-bundle" . }} + {{ partial "docs/menu-bundle" . }} {{ else }} - {{ partial "docs/menu-filetree" . }} + {{ partial "docs/menu-filetree" . }} {{ end }} {{ partial "docs/inject/menu-after" . }} diff --git a/layouts/partials/docs/mobile-header.html b/layouts/partials/docs/mobile-header.html deleted file mode 100644 index 4212a8e..0000000 --- a/layouts/partials/docs/mobile-header.html +++ /dev/null @@ -1,8 +0,0 @@ -
- - - - - {{ partial "docs/title" . }} - -
diff --git a/layouts/partials/docs/post-meta.html b/layouts/partials/docs/post-meta.html index 41221c7..c68ea95 100644 --- a/layouts/partials/docs/post-meta.html +++ b/layouts/partials/docs/post-meta.html @@ -1,4 +1,4 @@ -{{ $dateFormat := default "January 2, 2006" .Site.Params.BookDateFormat }} +{{ $dateFormat := (default "January 2, 2006" .Site.Params.BookDateFormat) }} {{ if or .Date .Params.tags }}
{{ with .Date}} @@ -6,10 +6,10 @@ {{ end }} {{ range $term, $_ := .Site.Taxonomies }} - {{ with $list := index $.Params $term }} + {{ with $list := $.Param $term }}
{{ range $n, $single := $list }}{{ if $n }}, {{ end }} - {{ with $.Site.GetPage (printf "/%s/%s" $term $single | urlize) }} + {{- with $.Site.GetPage (printf "/%s/%s" $term $single | urlize) }} {{ .Title }} {{- end }} {{- end }} diff --git a/layouts/partials/docs/taxonomy.html b/layouts/partials/docs/taxonomy.html index db82e4c..2ebeb82 100644 --- a/layouts/partials/docs/taxonomy.html +++ b/layouts/partials/docs/taxonomy.html @@ -1,4 +1,3 @@ -

{{ range $term, $_ := .Site.Taxonomies }} @@ -17,4 +16,3 @@ {{ end }}

-
diff --git a/layouts/partials/docs/toc.html b/layouts/partials/docs/toc.html index 79bfc0a..64546ec 100644 --- a/layouts/partials/docs/toc.html +++ b/layouts/partials/docs/toc.html @@ -1,10 +1 @@ -{{ $tocLevels := default (default 6 .Site.Params.BookToC) .Params.BookToC }} -{{ if and $tocLevels .Page.TableOfContents }} -
- {{ with .Page.TableOfContents }} - - {{ . }} - - {{ end }} -
-{{ end }} +{{ .TableOfContents }} diff --git a/layouts/shortcodes/expand.html b/layouts/shortcodes/expand.html index 4519767..1c0cb6b 100644 --- a/layouts/shortcodes/expand.html +++ b/layouts/shortcodes/expand.html @@ -1,7 +1,7 @@

- {{ default "Expand" (.Get 0) }} + {{ default (i18n "Expand") (.Get 0) }} {{ default "↕" (.Get 1) }}
-- cgit v1.2.3