From 2503023fa4e9b3c88312f4ff3623d24f2347232a Mon Sep 17 00:00:00 2001 From: Will Faught Date: Sat, 8 Feb 2025 17:23:04 -0800 Subject: [PATCH] Sync config names --- assets/browserconfig.xml | 2 +- assets/site.webmanifest | 4 ++-- layouts/partials/paige/func-target.html | 2 +- layouts/partials/paige/html.html | 2 +- layouts/partials/paige/links.html | 6 +++--- layouts/partials/paige/list-item.html | 4 ++-- layouts/partials/paige/list.html | 6 +++--- layouts/partials/paige/metas.html | 4 ++-- layouts/partials/paige/page-header.html | 4 ++-- layouts/partials/paige/schemas.html | 2 +- layouts/partials/paige/site-footer.html | 4 ++-- layouts/partials/paige/site-header.html | 4 ++-- layouts/partials/paige/style.html | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/assets/browserconfig.xml b/assets/browserconfig.xml index bd1fa7e9..916f85a5 100644 --- a/assets/browserconfig.xml +++ b/assets/browserconfig.xml @@ -4,7 +4,7 @@ - {{ $page.Param "paige.color" | default "#0d6efd" }} + {{ $page.Param "paige.site.color" | default "#0d6efd" }} diff --git a/assets/site.webmanifest b/assets/site.webmanifest index f8f08ff6..7b7fd4ad 100644 --- a/assets/site.webmanifest +++ b/assets/site.webmanifest @@ -15,7 +15,7 @@ "type": "image/png" } ], - "theme_color": "{{ $page.Param `paige.color` | default `#0d6efd` }}", - "background_color": "{{ $page.Param `paige.color` | default `#0d6efd` }}", + "theme_color": "{{ $page.Param `paige.site.color` | default `#0d6efd` }}", + "background_color": "{{ $page.Param `paige.site.color` | default `#0d6efd` }}", "display": "standalone" } diff --git a/layouts/partials/paige/func-target.html b/layouts/partials/paige/func-target.html index eb10ed8d..b0a96770 100644 --- a/layouts/partials/paige/func-target.html +++ b/layouts/partials/paige/func-target.html @@ -5,4 +5,4 @@ {{ $external := cond (urls.Parse $url).IsAbs (not (strings.HasSuffix $url site.BaseURL)) false }} -{{ return cond (and $external ($page.Param "paige.external_link_new_tab" | not | not)) "_blank" "" }} +{{ return cond (and $external ($page.Param "paige.site.external_link_new_tab" | not | not)) "_blank" "" }} diff --git a/layouts/partials/paige/html.html b/layouts/partials/paige/html.html index 952e70b0..370adac1 100644 --- a/layouts/partials/paige/html.html +++ b/layouts/partials/paige/html.html @@ -1,6 +1,6 @@ {{ $page := . }} -{{ $dark := eq ($page.Param "paige.color_scheme") "dark" }} +{{ $dark := eq ($page.Param "paige.site.color_scheme") "dark" }} {{ $lang := site.Language.LanguageCode | default site.LanguageCode }} {{ $rtl := eq $page.Language.LanguageDirection "rtl" }} diff --git a/layouts/partials/paige/links.html b/layouts/partials/paige/links.html index 2fd1ea53..18666f34 100644 --- a/layouts/partials/paige/links.html +++ b/layouts/partials/paige/links.html @@ -25,15 +25,15 @@ {{ end }} {{ if fileExists "static/safari-pinned-tab.svg" }} - + {{ end }} {{ if fileExists "assets/site.webmanifest" }} {{ end }} -{{ $color := $page.Param "paige.color" | default "#0d6efd" }} -{{ $colorScheme := $page.Param "paige.color_scheme" | default "auto" }} +{{ $color := $page.Param "paige.site.color" | default "#0d6efd" }} +{{ $colorScheme := $page.Param "paige.site.color_scheme" | default "auto" }} {{ $context := dict "color" $color "color_scheme" $colorScheme }} diff --git a/layouts/partials/paige/list-item.html b/layouts/partials/paige/list-item.html index 9d7323f3..f7998561 100644 --- a/layouts/partials/paige/list-item.html +++ b/layouts/partials/paige/list-item.html @@ -7,11 +7,11 @@ {{ $draft := $page.Draft }} {{ $expired := and $page.ExpiryDate (lt $page.ExpiryDate now) }} {{ $flags := slice }} -{{ $format := $page.Parent.Param "paige.date_format" | default ":date_long" }} +{{ $format := $page.Parent.Param "paige.site.date_format" | default ":date_long" }} {{ $future := and $page.PublishDate (gt $page.PublishDate now) }} {{ $link := $page.RelPermalink }} {{ $modified := and $page.PublishDate $page.Lastmod (lt $page.PublishDate $page.Lastmod) }} -{{ $normal := eq ($page.Parent.Param "paige.keyword_style" | default "text") "text" }} +{{ $normal := eq ($page.Parent.Param "paige.site.keyword_style" | default "text") "text" }} {{ $series := $page.GetTerms "series" | and ($page.Parent.Param "paige.subpages.disable_series" | not) }} {{ $summary := $page.Summary | markdownify | plainify | htmlUnescape | and ($page.Parent.Param "paige.subpages.disable_summary" | not) }} {{ $tags := $page.GetTerms "tags" }} diff --git a/layouts/partials/paige/list.html b/layouts/partials/paige/list.html index 902ef342..1935734f 100644 --- a/layouts/partials/paige/list.html +++ b/layouts/partials/paige/list.html @@ -40,8 +40,8 @@ {{ end }} {{ $collections := slice }} -{{ $pages := $page.RegularPages | and ($page.Param "paige.subpages.disable_pages" | not) }} -{{ $sections := $page.Sections | and ($page.Param "paige.subpages.disable_sections" | not) }} +{{ $pages := $page.RegularPages | and ($page.Param "paige.pages.disable_pages" | not) }} +{{ $sections := $page.Sections | and ($page.Param "paige.pages.disable_sections" | not) }} {{ if $page.IsHome }} {{ range $name, $taxonomy := site.Taxonomies }} @@ -51,7 +51,7 @@ {{ end }} {{ end }} -{{ $collections = $collections | and ($page.Param "paige.subpages.disable_collections" | not) }} +{{ $collections = $collections | and ($page.Param "paige.pages.disable_collections" | not) }} {{ if and (not $pages) (in (slice "taxonomy" "term") $page.Kind) }} {{ $pages = $page.Pages }} diff --git a/layouts/partials/paige/metas.html b/layouts/partials/paige/metas.html index 77852740..1fccb443 100644 --- a/layouts/partials/paige/metas.html +++ b/layouts/partials/paige/metas.html @@ -20,14 +20,14 @@ {{ end }} - + {{ if fileExists "assets/browserconfig.xml" }} {{ end }} - + {{ template "_internal/opengraph.html" $page }} diff --git a/layouts/partials/paige/page-header.html b/layouts/partials/paige/page-header.html index 32c0e673..7633f71d 100644 --- a/layouts/partials/paige/page-header.html +++ b/layouts/partials/paige/page-header.html @@ -6,11 +6,11 @@ {{ $date := and $page.IsPage $page.PublishDate | and ($page.Param "paige.pages.disable_date" | not) }} {{ $description := $page.Description | markdownify | and ($page.Param "paige.pages.disable_description" | not) }} {{ $first := templates.Exists "partials/paige/page-header-first.html" }} -{{ $format := $page.Param "paige.date_format" | default ":date_long" }} +{{ $format := $page.Param "paige.site.date_format" | default ":date_long" }} {{ $last := templates.Exists "partials/paige/page-header-last.html" }} {{ $link := $page.Params.link }} {{ $microdata := $page.Params.paige.pages.microdata }} -{{ $normal := eq ($page.Param "paige.keyword_style" | default "text") "text" }} +{{ $normal := eq ($page.Param "paige.site.keyword_style" | default "text") "text" }} {{ $series := $page.GetTerms "series" | and ($page.Param "paige.pages.disable_series" | not) }} {{ $tags := $page.GetTerms "tags" }} {{ $time := $page.ReadingTime | and ($page.Param "paige.pages.disable_reading_time" | not) }} diff --git a/layouts/partials/paige/schemas.html b/layouts/partials/paige/schemas.html index 6151cecf..16999db3 100644 --- a/layouts/partials/paige/schemas.html +++ b/layouts/partials/paige/schemas.html @@ -17,7 +17,7 @@ {{ $authors := partial "paige/func-authors.html" $page }} {{ $images := $page.Params.images | default slice }} {{ $keywords := sort (union (union $page.Keywords $page.Params.tags) $page.Params.categories) }} - {{ $license := $page.Param "paige.license" | markdownify | plainify }} + {{ $license := $page.Param "paige.site.license" | markdownify | plainify }} {{ $schema := newScratch }} {{ $videos := $page.Params.videos | default slice }} diff --git a/layouts/partials/paige/site-footer.html b/layouts/partials/paige/site-footer.html index 55605366..9bb218c7 100644 --- a/layouts/partials/paige/site-footer.html +++ b/layouts/partials/paige/site-footer.html @@ -1,10 +1,10 @@ {{ $page := . }} {{ $copyright := site.Copyright | markdownify | and ($page.Param "paige.site.disable_copyright" | not) }} -{{ $credit := $page.Param "paige.credit" }} +{{ $credit := $page.Param "paige.site.credit" }} {{ $first := templates.Exists "partials/paige/footer-first.html" }} {{ $last := templates.Exists "partials/paige/footer-last.html" }} -{{ $license := $page.Param "paige.license" | markdownify | and ($page.Param "paige.site.disable_license" | not) }} +{{ $license := $page.Param "paige.site.license" | markdownify | and ($page.Param "paige.site.disable_license" | not) }} {{ $microdata := $page.Params.paige.pages.microdata }} {{ if $credit }} diff --git a/layouts/partials/paige/site-header.html b/layouts/partials/paige/site-header.html index ec5ba85e..d352f618 100644 --- a/layouts/partials/paige/site-header.html +++ b/layouts/partials/paige/site-header.html @@ -2,7 +2,7 @@ {{ $basePath := path.Clean (urls.Parse (relLangURL "")).Path }} {{ $breadcrumbs := $page.Ancestors | and ($page.Param "paige.site.disable_breadcrumbs" | not) }} -{{ $description := $page.Param "paige.description" | markdownify | and ($page.Param "paige.site.disable_description" | not) }} +{{ $description := $page.Param "paige.site.description" | markdownify | and ($page.Param "paige.site.disable_description" | not) }} {{ $first := templates.Exists "partials/paige/site-header-first.html" }} {{ $last := templates.Exists "partials/paige/site-header-last.html" }} {{ $links := false }} @@ -18,7 +18,7 @@ {{ $pagePath := strings.TrimPrefix $basePath $page.RelPermalink }} -{{ with $page.Param "paige.menu_style" }} +{{ with $page.Param "paige.site.menu_style" }} {{ if eq . "pills" }} {{ $pills = true }} {{ else if eq . "tabs" }} diff --git a/layouts/partials/paige/style.html b/layouts/partials/paige/style.html index b2fa2127..088439dd 100644 --- a/layouts/partials/paige/style.html +++ b/layouts/partials/paige/style.html @@ -87,7 +87,7 @@ table { opacity: 1; } -{{ $colorscheme := $page.Param "paige.color_scheme" }} +{{ $colorscheme := $page.Param "paige.site.color_scheme" }} {{ if eq $colorscheme "dark" }} {{ partial "paige/dark.css" $page | safeCSS }}