From c8bf719e3d4a4c6ed1e70c5091f72e542ffc7a3d Mon Sep 17 00:00:00 2001 From: vimux Date: Tue, 30 Jul 2019 17:32:26 -0400 Subject: Define the Base Template and fix Hugo warnings * Define the Base Template (baseof.html) * Use relative URL link to style.css file * Move summary.html from partials to _default layouts * Fix Hugo warnings (needs Hugo 0.20 or newer) * Fix Paginator rule on main page. Fix #8 * Latest posts: show pages from mainSections only * Bump Hugo 0.19 -> 0.20 * Formatting --- layouts/_default/baseof.html | 20 ++++++++++++++++++++ layouts/_default/list.html | 16 +++++++++++----- layouts/_default/single.html | 6 +++--- layouts/_default/summary.html | 13 +++++++++++++ 4 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 layouts/_default/baseof.html create mode 100644 layouts/_default/summary.html (limited to 'layouts/_default') diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html new file mode 100644 index 0000000..33e5cda --- /dev/null +++ b/layouts/_default/baseof.html @@ -0,0 +1,20 @@ + + + + + + + {{ .Title }} + {{ with .Site.Params.description }}{{ end }} + {{ with .Site.Params.author }}{{ end }} + + {{ with .OutputFormats.Get "RSS" -}} + {{ printf `` .Rel .MediaType.Type .RelPermalink $.Site.Title | safeHTML }} + {{- end }} + + + {{ partial "header" . }} + {{ block "main" . }}{{ end }} + {{ partial "footer" . }} + + diff --git a/layouts/_default/list.html b/layouts/_default/list.html index bc7f4e6..68fb00c 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,10 +1,16 @@ -{{ partial "header.html" . }} +{{ define "main" }}
- {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }} - {{ range $paginator.Pages }} - {{ partial "summary.html" . }} + {{ if or .Title .Content }} +
+ {{ with .Title }}

{{ . }}

{{ end }} + {{ with .Content }}
{{ . }}
{{ end }} +
+ {{ end }} + + {{ range .Paginator.Pages }} + {{ .Render "summary" }} {{ end }} {{ partial "pagination.html" . }}
{{ partial "sidebar.html" . }} -{{ partial "footer.html" . }} +{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 4593944..af8398c 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,4 +1,4 @@ -{{ partial "header.html" . }} +{{ define "main" }}

{{ .Title }}

@@ -9,7 +9,7 @@
@@ -19,4 +19,4 @@
{{ partial "sidebar.html" . }} -{{ partial "footer.html" . }} +{{ end }} diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html new file mode 100644 index 0000000..9acf434 --- /dev/null +++ b/layouts/_default/summary.html @@ -0,0 +1,13 @@ +
+

{{ .Title }}

+ + {{ range .Params.tags }} + {{ . }} + {{ end }} +
+ {{ .Summary }} + {{ if .Truncated }} + Read more... + {{ end }} +
+
-- cgit v1.2.3