diff options
| author | vimux <vimux@protonmail.com> | 2019-07-31 00:32:26 +0300 |
|---|---|---|
| committer | vimux <vimux@protonmail.com> | 2019-07-31 15:49:20 +0300 |
| commit | c8bf719e3d4a4c6ed1e70c5091f72e542ffc7a3d (patch) | |
| tree | d81f0d69cedfc20638d42e88b19b08f23d8632da /layouts/_default | |
| parent | c71d33abd2c051c19c6298f150277c9dbdbe2bcd (diff) | |
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
Diffstat (limited to 'layouts/_default')
| -rw-r--r-- | layouts/_default/baseof.html | 20 | ||||
| -rw-r--r-- | layouts/_default/list.html | 16 | ||||
| -rw-r--r-- | layouts/_default/single.html | 6 | ||||
| -rw-r--r-- | layouts/_default/summary.html | 13 |
4 files changed, 47 insertions, 8 deletions
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 @@ +<!DOCTYPE html> +<html lang="{{ .Site.LanguageCode | default "en-us" }}"> +<head> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <title>{{ .Title }}</title> + {{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }} + {{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }} + <link rel="stylesheet" href="{{ "css/style.css" | relURL }}"> + {{ with .OutputFormats.Get "RSS" -}} + {{ printf `<link rel="%s" type="%s" href="%s" title="%s">` .Rel .MediaType.Type .RelPermalink $.Site.Title | safeHTML }} + {{- end }} +</head> +<body> + {{ partial "header" . }} + {{ block "main" . }}{{ end }} + {{ partial "footer" . }} +</body> +</html> 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" }} <main> - {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }} - {{ range $paginator.Pages }} - {{ partial "summary.html" . }} + {{ if or .Title .Content }} + <div> + {{ with .Title }}<h1>{{ . }}</h1>{{ end }} + {{ with .Content }}<div>{{ . }}</div>{{ end }} + </div> + {{ end }} + + {{ range .Paginator.Pages }} + {{ .Render "summary" }} {{ end }} {{ partial "pagination.html" . }} </main> {{ 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" }} <main> <article> <h1>{{ .Title }}</h1> @@ -9,7 +9,7 @@ <div> <ul id="tags"> {{ range .Params.tags }} - <li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a> </li> + <li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></li> {{ end }} </ul> </div> @@ -19,4 +19,4 @@ </article> </main> {{ 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 @@ +<article> + <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> + <time>{{ .Date.Format "02.01.2006 15:04" }}</time> + {{ range .Params.tags }} + <a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a> + {{ end }} + <div> + {{ .Summary }} + {{ if .Truncated }} + <a href="{{ .Permalink }}">Read more...</a> + {{ end }} + </div> +</article> |