From f74704bb8a92a3fb21ed402de86ebb0e8cff62cc Mon Sep 17 00:00:00 2001 From: Will Faught Date: Sun, 11 Dec 2022 00:09:41 -0800 Subject: [PATCH] Restructure all pages under article tag --- layouts/_default/baseof.html | 68 +++++++++++----------------- layouts/_default/home.html | 63 +++++++++++--------------- layouts/_default/list.html | 70 +---------------------------- layouts/_default/single.html | 39 +--------------- layouts/_default/taxonomy.html | 44 ++++-------------- layouts/_default/term.html | 34 +------------- layouts/partials/paige_content.html | 18 ++++++++ layouts/partials/paige_menus.html | 15 +++++++ layouts/partials/paige_pages.html | 22 +++++++++ 9 files changed, 122 insertions(+), 251 deletions(-) create mode 100644 layouts/partials/paige_content.html create mode 100644 layouts/partials/paige_menus.html create mode 100644 layouts/partials/paige_pages.html diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index ea431262..aa4a859b 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -30,6 +30,10 @@ {{ end }} {{ if templates.Exists "partials/head.html" }} - {{ partial "head" . }} + {{ partial "head.html" . }} {{ end }}
- {{ if .Site.Menus.main }} -
-
-
- -
+
+
+ {{ if .Site.Menus.main }} +
+ {{ partial "paige_menus.html" . }} +
+ {{ end }} +
+
+ {{ block "main" . }}{{ end }} +
+
+ {{ if .Site.Copyright }} +
+

{{ .Site.Copyright | markdownify }}

+
+ {{ end }}
-
- {{ end }} -
- {{ block "main" . }}{{ end }} -
- {{ if .Site.Copyright }} -
-
-
-

{{ .Site.Copyright | markdownify }}

-
-
-
- {{ end }} +
- - {{ if or .Params.math .Site.Params.math }} + + {{ if or .Site.Params.math .Params.math }} {{ end }} @@ -95,7 +79,7 @@ {{ template "_internal/google_analytics.html" . }} {{ end }} {{ if templates.Exists "partials/body.html" }} - {{ partial "body" . }} + {{ partial "body.html" . }} {{ end }} diff --git a/layouts/_default/home.html b/layouts/_default/home.html index eb59188d..77c4a99e 100644 --- a/layouts/_default/home.html +++ b/layouts/_default/home.html @@ -1,56 +1,47 @@ {{ define "main" }} -{{ if or .Title .Description }} -
-
- {{ if .Title }} -

{{ .Title | markdownify }}

- {{ end }} - {{ if .Description }} -

{{ .Description | markdownify }}

- {{ end }} -
-
+{{ if .Title }} +

+ {{ if .Params.link }} + {{ .Title | markdownify }} + {{ else }} + {{ .Title | markdownify }} + {{ end }} +

+{{ end }} +{{ if .Description }} +

{{ .Description | markdownify }}

+{{ end }} +{{ if .PublishDate }} +

{{ end }} {{ if .Params.stretch }} -
-
-
-
-
+
{{ end }} {{ if .Params.center }} -
-
- -
-
+

+ +

{{ end }} {{ if .Params.greeting }} -
-
-

{{ .Params.greeting | markdownify }}

-
-
+

{{ .Params.greeting | markdownify }}

{{ end }} {{ if .Params.blurb }} -
-
-

{{ .Params.blurb | markdownify }}

+
+
+

{{ .Params.blurb | markdownify }}

-
+ {{ end }} {{ if .Content }} -
-
{{ .Content }}
-
+{{ .Content }} {{ end }} {{ if .Site.Social }} -
-
+
+
{{ range $k, $v := .Site.Social }} {{ end }}
-
+ {{ end }} {{ end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index c8956d4b..e843e294 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,70 +1,4 @@ {{ define "main" }} -
- {{ if or .Title .Description }} -
-
-
- {{ if .Title }} -

- {{ if .Params.link }} - {{ .Title | markdownify }} - {{ else }} - {{ .Title | markdownify }} - {{ end }} -

- {{ end }} - {{ if .Description }} -

{{ .Description | markdownify }}

- {{ end }} -
-
-
- {{ end }} - {{ if .Content }} -
-
-
- {{ .Content }} -
-
-
- {{ end }} - {{ if .Pages }} - {{ $p := .Paginate (.Pages.ByDate.Reverse.GroupByDate "January 2006") }} -
-
-
-
- {{ range $p.PageGroups }} -
{{ .Key }}
- {{ range .Pages }} -

- {{ .Title | markdownify }} - {{- if .Description -}} -
- {{- .Description | markdownify -}} - {{- end -}} -

- {{ end }} - {{ end }} -
-
-
-
- {{ if or $p.HasPrev $p.HasNext }} -
-
-
-
- {{ partial "pagination" . }} -
-
-
-
- {{ end }} - {{ end }} - {{ if not (or .Content .Pages) }} -

Nothing here

- {{ end }} -
+{{ partial "paige_content.html" . }} +{{ partial "paige_pages.html" . }} {{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 91aa1d39..9c052dc2 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,40 +1,3 @@ {{ define "main" }} -{{ if not (or .Title .Description .PublishDate .Content) }} -
-

Nothing Here

-
-{{ else }} -
- {{ if or .Title .Description .PublishDate }} -
-
-
- {{ if .Title }} -

- {{ if .Params.link }} - {{ .Title | markdownify }} - {{ else }} - {{ .Title | markdownify }} - {{ end }} -

- {{ end }} - {{ if .Description }} -

{{ .Description | markdownify }}

- {{ end }} - {{ if .PublishDate }} -

- {{ end }} -
-
-
- {{ end }} - {{ if .Content }} -
-
- {{ .Content }} -
-
- {{ end }} -
-{{ end }} +{{ partial "paige_content.html" . }} {{ end }} diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index e33b084a..d01b5d87 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -1,40 +1,14 @@ {{ define "main" }} -{{ if not (or .Title .Pages) }} +{{ partial "paige_content.html" . }} +{{ if .Pages }}
-

Nothing Here

-
-{{ else }} -
- {{ if .Title }} -
-
-
-

- {{ if .Params.link }} - {{ .Title | markdownify }} - {{ else }} - {{ .Title | markdownify }} - {{ end }} -

-
-
-
- {{ end }} - {{ if .Pages }} -
-
-
- -
-
-
- {{ end }} +
{{ end }} {{ end }} diff --git a/layouts/_default/term.html b/layouts/_default/term.html index 4aeae730..e843e294 100644 --- a/layouts/_default/term.html +++ b/layouts/_default/term.html @@ -1,34 +1,4 @@ {{ define "main" }} -
-
-
-
-

- {{ .Title }} -

-
-
-
- {{ $p := .Paginate (.Pages.ByDate.Reverse.GroupByDate "January 2006") }} -
-
-
-
- {{ range $p.PageGroups }} -
{{ .Key }}
- {{ range .Pages }} -

- {{ .Title | markdownify }} - {{- if .Description -}} -
- {{- .Description | markdownify -}} - {{- end -}} -

- {{ end }} - {{ end }} -
-
-
-
-
+{{ partial "paige_content.html" . }} +{{ partial "paige_pages.html" . }} {{ end }} diff --git a/layouts/partials/paige_content.html b/layouts/partials/paige_content.html new file mode 100644 index 00000000..a72ea00b --- /dev/null +++ b/layouts/partials/paige_content.html @@ -0,0 +1,18 @@ +{{ if .Title }} +

+ {{ if .Params.link }} + {{ .Title | markdownify }} + {{ else }} + {{ .Title | markdownify }} + {{ end }} +

+{{ end }} +{{ if .Description }} +

{{ .Description | markdownify }}

+{{ end }} +{{ if .PublishDate }} +

+{{ end }} +{{ if .Content }} +{{ .Content }} +{{ end }} diff --git a/layouts/partials/paige_menus.html b/layouts/partials/paige_menus.html new file mode 100644 index 00000000..30f6d776 --- /dev/null +++ b/layouts/partials/paige_menus.html @@ -0,0 +1,15 @@ + diff --git a/layouts/partials/paige_pages.html b/layouts/partials/paige_pages.html new file mode 100644 index 00000000..07896cc9 --- /dev/null +++ b/layouts/partials/paige_pages.html @@ -0,0 +1,22 @@ +{{ if .Pages }} +
+ {{ $p := .Paginate (.Pages.ByDate.Reverse.GroupByDate "January 2006") }} + {{ range $p.PageGroups }} +
{{ .Key }}
+ {{ range .Pages }} +

+ {{ .Title | markdownify }} + {{ if .Description }} +
+ {{ .Description | markdownify }} + {{ end }} +

+ {{ end }} + {{ end }} + {{ if or $p.HasPrev $p.HasNext }} +
+ {{ partial "pagination.html" . }} +
+ {{ end }} +
+{{ end }}