From bffd867c196ba5295ef68354bec6fd623cde3dcb Mon Sep 17 00:00:00 2001 From: digitalcraftsman Date: Sat, 20 May 2017 13:01:54 +0200 Subject: Improve block template --- layouts/404.html | 32 +++++++++++----------- layouts/_default/baseof.html | 4 ++- layouts/_default/terms.html | 30 ++++++++++----------- layouts/partials/article_list.html | 52 +++++++++++++++++------------------- layouts/partials/single_article.html | 42 +++++++++++++---------------- 5 files changed, 74 insertions(+), 86 deletions(-) diff --git a/layouts/404.html b/layouts/404.html index 6ba3af1..5a6b937 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,20 +1,18 @@ {{ define "main" }} -
-
-
-
-

-

-

- {{with .Site.Data.l10n.page_not_found.title}}{{.}}{{end}} -

-

- {{with .Site.Data.l10n.page_not_found.subtitle}}{{.}}{{end}} -

-
-

-
+
+
+
+

+

+

+ {{with .Site.Data.l10n.page_not_found.title}}{{.}}{{end}} +

+

+ {{with .Site.Data.l10n.page_not_found.subtitle}}{{.}}{{end}} +

+
+

-
-
+ + {{ end }} \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 7f70065..3644b33 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -8,7 +8,9 @@ {{ partialCached "profile" . }} {{ end }} - {{ block "main" . }}{{ end }} +
+ {{ block "main" . }}{{ end }} +
{{ if not .Params.disable_widgets }} {{ partial "sidebar" . }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 7f6ea23..170d9ef 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,19 +1,17 @@ {{ define "main" }} -
-
-
- {{ .Title }} -
-
-
    - {{ $data := .Data }} {{ range $key, $value := .Data.Terms.ByCount }} -
  • - {{ $value.Name }} - {{ $value.Count }} -
    • - {{ end }} -
-
-
+
+
+ {{ .Title }} +
+
+
    + {{ $data := .Data }} {{ range $key, $value := .Data.Terms.ByCount }} +
  • + {{ $value.Name }} + {{ $value.Count }} +
    • + {{ end }} +
+
{{ end }} \ No newline at end of file diff --git a/layouts/partials/article_list.html b/layouts/partials/article_list.html index df8488d..37d4581 100644 --- a/layouts/partials/article_list.html +++ b/layouts/partials/article_list.html @@ -1,31 +1,27 @@ -
- {{ $paginator := .Paginate (where .Data.Pages "Section" "in" .Site.Params.mainSections) }} - {{ range $paginator.Pages }} -
-
- {{ if and (isset .Params "banner") (not (eq .Params.banner "")) }} - +{{ $paginator := .Paginate (where .Data.Pages "Section" "in" .Site.Params.mainSections) }} +{{ range $paginator.Pages }} + - {{ end }} + {{ partial "article_footer" . }} +
+
+{{ end }} - {{ partial "pagination" . }} -
- +{{ partial "pagination" . }} \ No newline at end of file diff --git a/layouts/partials/single_article.html b/layouts/partials/single_article.html index bdb7128..a0a1725 100644 --- a/layouts/partials/single_article.html +++ b/layouts/partials/single_article.html @@ -1,29 +1,23 @@ -{{ if .Params.disable_profile | and .Params.disable_widgets }} -
-{{ else }} -
-{{ end }} -
-
- {{ if and (isset .Params "banner") (not (eq .Params.banner "")) }} - - {{ end }} +
+
+ {{ if and (isset .Params "banner") (not (eq .Params.banner "")) }} + + {{ end }} - {{ partial "article_header" . }} -
- {{ .Content }} -
- {{ partial "article_footer" . }} + {{ partial "article_header" . }} +
+ {{ .Content }}
+ {{ partial "article_footer" . }} +
- {{ partial "prev_next_post" . }} -
+ {{ partial "prev_next_post" . }} +
- {{ if and (not (eq .Site.DisqusShortname "")) (not .Params.disable_comments) }} -
-
- {{ template "_internal/disqus.html" . }} -
-
- {{ end }} +{{ if and (not (eq .Site.DisqusShortname "")) (not .Params.disable_comments) }} +
+
+ {{ template "_internal/disqus.html" . }} +
+{{ end }} \ No newline at end of file -- cgit v1.2.3