From 62d00ff27ab2e4b363cd1a3aecd8da2fa0ef9bd7 Mon Sep 17 00:00:00 2001 From: digitalcraftsman Date: Fri, 19 May 2017 21:19:06 +0200 Subject: Switch to block templates Fixes #88 --- layouts/404.html | 49 +++++++++++++++++-------------------------- layouts/_default/baseof.html | 21 +++++++++++++++++++ layouts/_default/list.html | 43 ++++++++++++++----------------------- layouts/_default/single.html | 24 +++------------------ layouts/_default/terms.html | 50 +++++++++++++++++--------------------------- layouts/index.html | 16 ++------------ 6 files changed, 80 insertions(+), 123 deletions(-) create mode 100644 layouts/_default/baseof.html diff --git a/layouts/404.html b/layouts/404.html index 049a660..6ba3af1 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,31 +1,20 @@ -{{ partial "head" . }} - -
- {{ partial "header" . }} -
- {{ partial "profile" . }} -
-
-
-
-

-

-

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

-

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

-
-

-
+{{ define "main" }} +
+
+
+
+

+

+

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

+

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

+
+

-
-
- {{ partial "sidebar" . }} -
-
- -{{ partial "footer" . }} - - +
+ + +{{ end }} \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html new file mode 100644 index 0000000..747bd46 --- /dev/null +++ b/layouts/_default/baseof.html @@ -0,0 +1,21 @@ +{{ partial "head" . }} + +
+ {{ partial "header" . }} + +
+ {{ if not .Params.disable_profile }} + {{ partial "profile" . }} + {{ end }} + + {{ block "main" . }}{{ end }} + + {{ if not .Params.disable_widgets }} + {{ partial "sidebar" . }} + {{ end }} +
+
+ +{{ partial "footer" . }} + + \ No newline at end of file diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 7752015..8821a5f 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,27 +1,16 @@ -{{ partial "head" . }} - -
- {{ partial "header" . }} -
- {{ partial "profile" . }} -
-
-
- {{ .Title }} -
-
- {{ $paginator := .Paginate .Data.Pages }} - {{ range $paginator.Pages }} - {{ .Render "summary" }} - {{ end }} -
-
- {{ partial "pagination" . }} -
- {{ partial "sidebar" . }} -
-
- -{{ partial "footer" . }} - - +{{ define "main" }} +
+
+
+ {{ .Title }} +
+
+ {{ $paginator := .Paginate .Data.Pages }} + {{ range $paginator.Pages }} + {{ .Render "summary" }} + {{ end }} +
+
+ {{ partial "pagination" . }} +
+{{ end }} \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 91ae34f..f41c4c8 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,21 +1,3 @@ -{{ partial "head" . }} - -
- {{ partial "header" . }} - -
- {{ if .IsPage | and (not .Params.disable_profile) }} - {{ partial "profile" . }} - {{ end }} - - {{ partial "single_article" . }} - - {{ if .IsPage | and (not .Params.disable_widgets) }} - {{ partial "sidebar" . }} - {{ end }} -
-
- -{{ partial "footer" . }} - - +{{ define "main" }} + {{ partial "single_article" . }} +{{ end }} \ No newline at end of file diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 6c65bb2..7f6ea23 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,31 +1,19 @@ -{{ partial "head" . }} - -
- {{ partial "header" . }} -
- {{ partial "profile" . }} -
-
-
- {{ .Title }} -
-
-
    - {{ $data := .Data }} {{ range $key, $value := .Data.Terms.ByCount }} -
  • - {{ $value.Name }} - {{ $value.Count }} -
    • - {{ end }} -
-
-
-
- {{ partial "sidebar" . }} -
-
- -{{ partial "footer" . }} - - - +{{ define "main" }} +
+
+
+ {{ .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/index.html b/layouts/index.html index 774d0b8..7fefcaf 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,15 +1,3 @@ -{{ partial "head" . }} - -
- {{ partial "header" . }} - -
- {{ partial "profile" . }} +{{ define "main" }} {{ partial "article_list" . }} - {{ partial "sidebar" . }} -
-
- -{{ partial "footer" . }} - - +{{ end }} \ No newline at end of file -- cgit v1.2.3