From 469d6ee893b4354f333e00fcd85696a1bfb01035 Mon Sep 17 00:00:00 2001 From: Will Faught Date: Sun, 5 Feb 2023 19:51:09 -0800 Subject: [PATCH] Format templates --- layouts/_default/baseof.html | 5 +++++ layouts/_default/home.html | 4 ++++ layouts/_default/list.html | 1 + layouts/_default/taxonomy.html | 19 ++++++++++--------- layouts/partials/paige/footer.html | 3 +++ layouts/partials/paige/head.html | 4 ++++ layouts/partials/paige/header.html | 2 ++ layouts/partials/paige/link.html | 1 + layouts/partials/paige/links.html | 5 +++++ layouts/partials/paige/menu.html | 1 + layouts/partials/paige/metas.html | 7 +++++++ layouts/partials/paige/script.html | 1 + 12 files changed, 44 insertions(+), 9 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 1ae50bd4..c3eaf6d7 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -12,10 +12,12 @@ {{ if templates.Exists "partials/paige/body-first.html" }} {{ partial "paige/body-first.html" $page }} {{ end }} +
{{ partial "paige/header.html" $page }} +
{{ if templates.Exists "partials/paige/main-first.html" }} {{ partial "paige/main-first.html" $page }} @@ -25,11 +27,14 @@ {{ partial "paige/main-last.html" $page }} {{ end }}
+ {{ partial "paige/footer.html" $page }}
+ {{ partial "paige/scripts.html" $page }} + {{ if templates.Exists "partials/paige/body-last.html" }} {{ partial "paige/body-last.html" $page }} {{ end }} diff --git a/layouts/_default/home.html b/layouts/_default/home.html index 8b9b6802..6aa94ae6 100644 --- a/layouts/_default/home.html +++ b/layouts/_default/home.html @@ -5,6 +5,7 @@
{{ partial "paige/metadata.html" $page }} +
{{ if $page.Param "paige.home.image.url" }} {{ $class := cond ($stretch | not) "mw-100 rounded-4 shadow" "rounded-4 shadow w-100" }} @@ -21,9 +22,11 @@ ) }}

{{ end }} + {{ with $page.Param "paige.home.greeting" }}

{{ . | markdownify }}

{{ end }} + {{ with $page.Param "paige.home.blurb" }}
@@ -34,6 +37,7 @@
{{ end }}
+ {{ partial "paige/toc.html" $page }} {{ partial "paige/content.html" $page }} {{ partial "paige/social.html" $page }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index ebca1903..66bcc6cb 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -4,5 +4,6 @@ {{ if $page.Param "paige.list.content.show" | not }} {{ partial "paige/article.html" $page }} {{ end }} + {{ partial "paige/pages.html" $page }} {{ end }} diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 93e34c22..5e741a5c 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -2,15 +2,16 @@ {{ $page := . }} {{ partial "paige/article.html" $page }} + {{ if $page.Pages }} -
- -
+
+ +
{{ end }} {{ end }} diff --git a/layouts/partials/paige/footer.html b/layouts/partials/paige/footer.html index 6031bfeb..122c414e 100644 --- a/layouts/partials/paige/footer.html +++ b/layouts/partials/paige/footer.html @@ -10,12 +10,15 @@ {{ if $first }} {{ partial "paige/footer-first.html" . }} {{ end }} + {{ if $copyright }}

{{ $copyright | markdownify }}

{{ end }} + {{ if $credit }}

Paige Theme

{{ end }} + {{ if $last }} {{ partial "paige/footer-last.html" . }} {{ end }} diff --git a/layouts/partials/paige/head.html b/layouts/partials/paige/head.html index a85e9b21..8c94844a 100644 --- a/layouts/partials/paige/head.html +++ b/layouts/partials/paige/head.html @@ -4,10 +4,14 @@ {{ if templates.Exists "partials/paige/head-first.html" }} {{ partial "paige/head-first.html" $page }} {{ end }} + {{ partial "paige/metas.html" $page }} + {{ partial "paige/func-title.html" $page }} + {{ partial "paige/links.html" $page }} {{ partial "paige/style.html" $page }} + {{ if templates.Exists "partials/paige/head-last.html" }} {{ partial "paige/head-last.html" $page }} {{ end }} diff --git a/layouts/partials/paige/header.html b/layouts/partials/paige/header.html index 41ca0a31..fe32357e 100644 --- a/layouts/partials/paige/header.html +++ b/layouts/partials/paige/header.html @@ -9,9 +9,11 @@ {{ if $first }} {{ partial "paige/header-first.html" $page }} {{ end }} + {{ if $menu }} {{ partial "paige/menu.html" $page }} {{ end }} + {{ if $last }} {{ partial "paige/header-last.html" $page }} {{ end }} diff --git a/layouts/partials/paige/link.html b/layouts/partials/paige/link.html index fc3cd3b6..a544a62f 100644 --- a/layouts/partials/paige/link.html +++ b/layouts/partials/paige/link.html @@ -14,6 +14,7 @@ "page" $page "url" (relLangURL $href) )) | minify | fingerprint }} + {{ $href = $resource.RelPermalink }} {{ $integrity = $resource.Data.Integrity }} {{ end }} diff --git a/layouts/partials/paige/links.html b/layouts/partials/paige/links.html index 43011d7c..e7fbae32 100644 --- a/layouts/partials/paige/links.html +++ b/layouts/partials/paige/links.html @@ -3,13 +3,16 @@ + {{ if ne (relLangURL "favicon.ico") "/favicon.ico" }} {{ end }} + + {{ partial "paige/link.html" (dict "href" ($page.Param "paige.bootstrap.icons.link_href" | default "https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.3/font/bootstrap-icons.css") "integrity" ($page.Param "paige.bootstrap.icons.link_integrity") @@ -20,6 +23,7 @@ "integrity" ($page.Param "paige.bootstrap.style.link_integrity") "raw" ($page.Param "paige.bootstrap.style.raw") ) }} + {{ if or ($page.Param "paige.math") (and ($page.Param "paige.list.content.show") (where $page.Pages "Params.paige.math" "eq" true)) }} {{ partial "paige/link.html" (dict "href" ($page.Param "paige.katex.style.link_href" | default "https://cdn.jsdelivr.net/npm/katex@0.16.3/dist/katex.min.css") @@ -27,6 +31,7 @@ "raw" true ) }} {{ end }} + {{ if .AlternativeOutputFormats }} {{ $title := partial "paige/func-title.html" $page }} {{ range .AlternativeOutputFormats }} diff --git a/layouts/partials/paige/menu.html b/layouts/partials/paige/menu.html index 737aae78..0d5dae0f 100644 --- a/layouts/partials/paige/menu.html +++ b/layouts/partials/paige/menu.html @@ -31,6 +31,7 @@ {{ $pagepath := strings.TrimPrefix $basepath $.RelPermalink }} {{ $menupath := strings.TrimPrefix $basepath .URL }} {{ $active := or (and (eq $menupath "/") (eq $pagepath "/")) (and (ne $menupath "/") (hasPrefix $pagepath $menupath)) }} + {{ .Name }} {{ end }} diff --git a/layouts/partials/paige/metas.html b/layouts/partials/paige/metas.html index 2bd006a7..a529423e 100644 --- a/layouts/partials/paige/metas.html +++ b/layouts/partials/paige/metas.html @@ -1,20 +1,27 @@ {{ $page := . }} + {{ with partial "paige/func-authors.html" $page }} {{ end }} + {{ with $page.Description }} {{ end }} + {{ if or $page.Keywords $page.Params.tags $page.Params.categories }} {{ end }} + + {{ if ne (relLangURL "browserconfig.xml") "/browserconfig.xml" }} {{ end }} + + {{ template "_internal/opengraph.html" $page }} {{ template "_internal/twitter_cards.html" $page }} diff --git a/layouts/partials/paige/script.html b/layouts/partials/paige/script.html index 52f29351..600dc8c2 100644 --- a/layouts/partials/paige/script.html +++ b/layouts/partials/paige/script.html @@ -16,6 +16,7 @@ "page" $page "url" (relLangURL $src) )) | minify | fingerprint }} + {{ $integrity = $resource.Data.Integrity }} {{ $src = $resource.RelPermalink }} {{ end }}