From 0a01c70f39620d1f12ffa766a719133274793a62 Mon Sep 17 00:00:00 2001 From: Will Faught Date: Sun, 29 Jan 2023 15:10:01 -0800 Subject: [PATCH] Replace site.Params with $page.Param --- layouts/partials/paige/comments.html | 34 ++++++++++++------------- layouts/partials/paige/footer.html | 2 +- layouts/partials/paige/links.html | 14 +++++----- layouts/partials/paige/menu.html | 6 +++-- layouts/partials/paige/metas.html | 4 +-- layouts/partials/paige/scripts.html | 38 ++++++++++++++-------------- layouts/partials/paige/style.html | 8 +++--- 7 files changed, 55 insertions(+), 51 deletions(-) diff --git a/layouts/partials/paige/comments.html b/layouts/partials/paige/comments.html index 084e2b12..8b09cb2a 100644 --- a/layouts/partials/paige/comments.html +++ b/layouts/partials/paige/comments.html @@ -1,7 +1,7 @@ {{ $page := . }} {{ template "_internal/disqus.html" . }} -{{ if site.Params.paige.comments.cactus }} +{{ if $page.Param "paige.comments.cactus" }}
@@ -11,26 +11,26 @@ node: document.getElementById("comment-section"), defaultHomeserverUrl: "https://matrix.cactus.chat:8448", serverName: "cactus.chat", - siteName: "{{ site.Params.paige.comments.cactus.account_id | safeJS }}", + siteName: "{{ $page.Param "paige.comments.cactus.account_id" | safeJS }}", commentSectionId: "{{ $page.RelPermalink | safeJS }}" })
{{ end }} -{{ with site.Params.paige.comments.commento }} +{{ with $page.Param "paige.comments.commento" }}
{{ end }} -{{ if site.Params.paige.comments.graphcomment }} +{{ if $page.Param "paige.comments.graphcomment" }}
@@ -73,7 +73,7 @@
{{ end }} -{{ with site.Params.paige.comments.isso }} +{{ with $page.Param "paige.comments.isso" }}
@@ -81,32 +81,32 @@
{{ end }} -{{ with site.Params.paige.comments.muut }} +{{ with $page.Param "paige.comments.muut" }}
Comments
{{ end }} -{{ if site.Params.paige.comments.remark42 }} +{{ if $page.Param "paige.comments.remark42" }}
{{ end }} -{{ if site.Params.paige.comments.replybox }} +{{ if $page.Param "paige.comments.replybox" }}
@@ -114,7 +114,7 @@
{{ end }} -{{ with site.Params.paige.comments.utterances }} +{{ with $page.Param "paige.comments.utterances" }}
diff --git a/layouts/partials/paige/footer.html b/layouts/partials/paige/footer.html index bb70ca38..2e35eac5 100644 --- a/layouts/partials/paige/footer.html +++ b/layouts/partials/paige/footer.html @@ -1,7 +1,7 @@ {{ $page := . }} {{ $copyright := site.Copyright }} -{{ $credit := not site.Params.paige.hide_credit_link }} +{{ $credit := not ($page.Param "paige.hide_credit_link") }} {{ $first := templates.Exists "partials/paige/footer-first.html" }} {{ $last := templates.Exists "partials/paige/footer-last.html" }} diff --git a/layouts/partials/paige/links.html b/layouts/partials/paige/links.html index b24a3e44..85172a33 100644 --- a/layouts/partials/paige/links.html +++ b/layouts/partials/paige/links.html @@ -11,19 +11,19 @@ {{ partial "paige/link.html" (dict - "href" (site.Params.paige.bootstrap.icons.link_href | default "https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.3/font/bootstrap-icons.css") - "integrity" site.Params.paige.bootstrap.icons.link_integrity + "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") "raw" true ) }} {{ partial "paige/link.html" (dict - "href" (site.Params.paige.bootstrap.style.link_href | default "https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css") - "integrity" site.Params.paige.bootstrap.style.link_integrity - "raw" site.Params.paige.bootstrap.style.raw + "href" ($page.Param "paige.bootstrap.style.link_href" | default "https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css") + "integrity" ($page.Param "paige.bootstrap.style.link_integrity") + "raw" ($page.Param "paige.bootstrap.style.raw") ) }} {{ if or $page.Params.paige.math (and $page.Params.paige.show_full_pages (where $page.Pages "Params.paige.math" "eq" true)) }} {{ partial "paige/link.html" (dict - "href" (site.Params.paige.math.style.link_href | default "https://cdn.jsdelivr.net/npm/katex@0.16.3/dist/katex.min.css") - "integrity" (site.Params.paige.math.style.link_integrity | default "sha256-NJNVfEC6jfEt62wQMafLNT2eI6BaWONXbpkSEVAs3+8=") + "href" ($page.Param "paige.math.style.link_href" | default "https://cdn.jsdelivr.net/npm/katex@0.16.3/dist/katex.min.css") + "integrity" ($page.Param "paige.math.style.link_integrity" | default "sha256-NJNVfEC6jfEt62wQMafLNT2eI6BaWONXbpkSEVAs3+8=") "raw" true ) }} {{ end }} diff --git a/layouts/partials/paige/menu.html b/layouts/partials/paige/menu.html index 0aea4795..06bf6e5d 100644 --- a/layouts/partials/paige/menu.html +++ b/layouts/partials/paige/menu.html @@ -1,5 +1,7 @@ +{{ $page := . }} + {{ $basepath := path.Clean (urls.Parse site.BaseURL).Path }} -{{ $breakpoint := site.Params.paige.menu_breakpoint | default "sm" }} +{{ $breakpoint := $page.Param "paige.menu_breakpoint" | default "sm" }} {{ $links := false }} {{ $pills := false }} @@ -7,7 +9,7 @@ {{ $basepath = "" }} {{ end }} -{{ with site.Params.paige.menu_style }} +{{ with $page.Param "paige.menu_style" }} {{ if eq . "links" }} {{ $links = true }} {{ else if eq . "pills" }} diff --git a/layouts/partials/paige/metas.html b/layouts/partials/paige/metas.html index 8ca5f927..60bb4cc5 100644 --- a/layouts/partials/paige/metas.html +++ b/layouts/partials/paige/metas.html @@ -10,11 +10,11 @@ {{ 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/scripts.html b/layouts/partials/paige/scripts.html index 3bf86acb..9f109600 100644 --- a/layouts/partials/paige/scripts.html +++ b/layouts/partials/paige/scripts.html @@ -49,27 +49,27 @@ paigeQuery.addEventListener("change", function (e) { {{ end }} {{ partial "paige/script.html" (dict - "integrity" site.Params.paige.bootstrap.script.script_integrity - "raw" site.Params.paige.bootstrap.script.raw - "src" (site.Params.paige.bootstrap.script.script_src | default "https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js") + "integrity" ($page.Param "paige.bootstrap.script.script_integrity") + "raw" ($page.Param "paige.bootstrap.script.raw") + "src" ($page.Param "paige.bootstrap.script.script_src" | default "https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js") ) }} {{ if or .Params.paige.math (and .Params.paige.show_full_pages (where .Pages "Params.paige.math" "eq" true)) }} {{ partial "paige/script.html" (dict - "integrity" site.Params.paige.math.script.script_integrity - "raw" site.Params.paige.math.script.raw - "src" (site.Params.paige.math.script.script_src | default "https://cdn.jsdelivr.net/npm/katex@0.16.3/dist/katex.min.js") + "integrity" ($page.Param "paige.math.script.script_integrity") + "raw" ($page.Param "paige.math.script.raw") + "src" ($page.Param "paige.math.script.script_src" | default "https://cdn.jsdelivr.net/npm/katex@0.16.3/dist/katex.min.js") ) }} {{ partial "paige/script.html" (dict - "integrity" site.Params.paige.math.autorender.script_integrity + "integrity" ($page.Param "paige.math.autorender.script_integrity") "onload" "renderMathInElement(document.body);" - "raw" site.Params.paige.math.autorender.raw - "src" (site.Params.paige.math.autorender.script_src | default "https://cdn.jsdelivr.net/npm/katex@0.16.3/dist/contrib/auto-render.min.js") + "raw" ($page.Param "paige.math.autorender.raw") + "src" ($page.Param "paige.math.autorender.script_src" | default "https://cdn.jsdelivr.net/npm/katex@0.16.3/dist/contrib/auto-render.min.js") ) }} {{ end }} {{ if site.GoogleAnalytics }} {{ template "_internal/google_analytics.html" . }} {{ end }} -{{ with site.Params.paige.analytics.chartbeat }} +{{ with $page.Param "paige.analytics.chartbeat" }} {{ end }} -{{ with site.Params.paige.analytics.clicky }} +{{ with $page.Param "paige.analytics.clicky" }} {{ end }} -{{ with site.Params.paige.analytics.fathom }} +{{ with $page.Param "paige.analytics.fathom" }} {{ end }} -{{ with site.Params.paige.analytics.finteza }} +{{ with $page.Param "paige.analytics.finteza" }} {{ end }} -{{ with site.Params.paige.analytics.hotjar }} +{{ with $page.Param "paige.analytics.hotjar" }} {{ end }} -{{ with site.Params.paige.analytics.matomo }} +{{ with $page.Param "paige.analytics.matomo" }} {{ end }} -{{ with site.Params.paige.analytics.mixpanel }} +{{ with $page.Param "paige.analytics.mixpanel" }} {{ end }} -{{ with site.Params.paige.analytics.plausible }} +{{ with $page.Param "paige.analytics.plausible" }} {{ end }} -{{ with site.Params.paige.analytics.woopra }} +{{ with $page.Param "paige.analytics.woopra" }} {{ end }} -{{ with site.Params.paige.analytics.yandex }} +{{ with $page.Param "paige.analytics.yandex" }}