From 5a0af3384d006433e5487dc9098c09ac3ec11a17 Mon Sep 17 00:00:00 2001 From: panr Date: Thu, 18 Jun 2020 00:40:31 +0200 Subject: [PATCH] Fix accessibility issues and re-format templates --- layouts/_default/index.html | 126 ++++++++++++++++++----------------- layouts/_default/list.html | 106 ++++++++++++++--------------- layouts/_default/single.html | 4 +- layouts/partials/head.html | 2 +- 4 files changed, 121 insertions(+), 117 deletions(-) diff --git a/layouts/_default/index.html b/layouts/_default/index.html index a287757..8cbb12e 100644 --- a/layouts/_default/index.html +++ b/layouts/_default/index.html @@ -1,65 +1,67 @@ {{ define "main" }} -{{ if .Content }} -
- {{ .Content }} + {{ if .Content }} +
+ {{ .Content }} +
+ {{ end }} +
+ {{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }} + {{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }} + + {{ $PageContext := . }} + {{ if .IsHome }} + {{ $PageContext = .Site }} + {{ end }} + {{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }} + + {{ range $paginator.Pages }} +
+

+ {{ .Title | markdownify }} +

+
+ + {{ .Date.Format "2006-01-02" }} + + {{ with .Params.Author }} + ::{{ . }} + {{ end }} +
+ + {{ if .Params.tags }} + + {{ range .Params.tags }} + # + {{- . -}} +   + {{ end }} + + {{ end }} + + {{ if .Params.Cover }} + {{ .Title | plainify | default + {{ end }} + +
+ {{ if .Params.showFullContent }} + {{ .Content | markdownify }} + {{ else if .Description }} + {{ .Description | markdownify }} + {{ else }} + {{ if .Truncated }} + {{ .Summary | markdownify }} + {{ end }} + {{ end }} +
+ + {{ if not .Params.showFullContent }} +
+ {{ $.Site.Params.ReadMore }} → +
+ {{ end }} +
+ {{ end }} + {{ partial "pagination.html" . }}
{{ end }} -
- {{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }} - {{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }} - - {{ $PageContext := . }} - {{ if .IsHome }} - {{ $PageContext = .Site }} - {{ end }} - {{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }} - - {{ range $paginator.Pages }} -
-

- {{ .Title | markdownify }}

-
- - {{ .Date.Format "2006-01-02" }} - - {{ with .Params.Author }}:: - {{ . }}{{ end }} -
- - {{ if .Params.tags }} - - {{ range .Params.tags }} - # - {{- . -}} -   - {{ end }} - - {{ end }} - - {{ with .Params.Cover }} - - {{ end }} - -
- {{ if .Params.showFullContent }} - {{ .Content | markdownify }} - {{ else if .Description }} - {{ .Description | markdownify }} - {{ else }} - {{ if .Truncated }} - {{ .Summary | markdownify }} - {{ end }} - {{ end }} -
- - {{ if not .Params.showFullContent }} -
- {{ $.Site.Params.ReadMore }} → -
- {{ end }} -
- {{ end }} - {{ partial "pagination.html" . }} -
-{{ end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index fdbac69..2668374 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,56 +1,58 @@ {{ define "main" }} -{{ with .Content }} -
- {{ . }} -
-{{ end }} -
- {{ range .Pages }} -
-

- {{ .Title | markdownify }}

-
- - {{ .Date.Format "2006-01-02" }} - - {{ with .Params.Author }}:: - {{ . }}{{ end }} + {{ with .Content }} +
+ {{ . }}
- - {{ if .Params.tags }} - - {{ range .Params.tags }} - # - {{- . -}} -   - {{ end }} - - {{ end }} - - {{ with .Params.Cover }} - - {{ end }} - -
- {{ if .Params.showFullContent }} - {{ .Content | markdownify }} - {{ else if .Description }} - {{ .Description | markdownify }} - {{ else }} - {{ if .Truncated }} - {{ .Summary | markdownify }} - {{ end }} - {{ end }} -
- - {{ if not .Params.showFullContent }} - - {{ end }} -
{{ end }} - {{ partial "pagination.html" . }} -
+
+ {{ range .Pages }} +
+

+ {{ .Title | markdownify }} +

+
+ + {{ .Date.Format "2006-01-02" }} + + {{ with .Params.Author }} + ::{{ . }} + {{ end }} +
+ + {{ if .Params.tags }} + + {{ range .Params.tags }} + # + {{- . -}} +   + {{ end }} + + {{ end }} + + {{ if .Params.Cover }} + {{ .Title | plainify | default + {{ end }} + +
+ {{ if .Params.showFullContent }} + {{ .Content | markdownify }} + {{ else if .Description }} + {{ .Description | markdownify }} + {{ else }} + {{ if .Truncated }} + {{ .Summary | markdownify }} + {{ end }} + {{ end }} +
+ + {{ if not .Params.showFullContent }} + + {{ end }} +
+ {{ end }} + {{ partial "pagination.html" . }} +
{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 75d4c06..bda0919 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -23,8 +23,8 @@ {{ end }} - {{ with .Params.Cover }} - + {{ if .Params.Cover }} + {{ .Title | plainify | default {{ end }} {{ if .Params.Toc }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 3b6e399..a1b75a4 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,5 +1,5 @@ - +