diff options
| author | tdro <tdro@noreply.example.com> | 2023-06-01 19:41:10 -0400 |
|---|---|---|
| committer | tdro <tdro@noreply.example.com> | 2023-06-01 19:41:10 -0400 |
| commit | e7231a13d8d3b9e38915baad31d910f914377aae (patch) | |
| tree | bafe740abb54673c693cd6ac68e9be0df7b16bc1 | |
| parent | 8b432c5207f2dede1f9923b86271aafedcd6c624 (diff) | |
| download | canory-e7231a13d8d3b9e38915baad31d910f914377aae.tar.gz canory-e7231a13d8d3b9e38915baad31d910f914377aae.tar.bz2 canory-e7231a13d8d3b9e38915baad31d910f914377aae.zip | |
themes/default/layouts/partials/function-page-modified: Add disable switch
Capture other renders outside of base
| -rw-r--r-- | themes/default/layouts/_default/baseof.html | 7 | ||||
| -rw-r--r-- | themes/default/layouts/_default/baseof.json | 7 | ||||
| -rw-r--r-- | themes/default/layouts/_default/baseof.txt | 7 | ||||
| -rw-r--r-- | themes/default/layouts/_default/baseof.xml | 7 | ||||
| -rw-r--r-- | themes/default/layouts/_default/single.embed.html | 28 | ||||
| -rw-r--r-- | themes/default/layouts/partials/function-page-modified.html | 19 | ||||
| -rw-r--r-- | themes/default/layouts/partials/render-embed.html | 22 |
7 files changed, 75 insertions, 22 deletions
diff --git a/themes/default/layouts/_default/baseof.html b/themes/default/layouts/_default/baseof.html index 9342569..d479454 100644 --- a/themes/default/layouts/_default/baseof.html +++ b/themes/default/layouts/_default/baseof.html @@ -1,4 +1,9 @@ -{{- $modified := partial "function-page-modified.html" . -}} +{{- $modified := partial "function-page-modified.html" + (dict + "Context" . + "Disable" true + ) +-}} {{- if $modified -}} <!DOCTYPE html> diff --git a/themes/default/layouts/_default/baseof.json b/themes/default/layouts/_default/baseof.json index 8a60b00..e1203cc 100644 --- a/themes/default/layouts/_default/baseof.json +++ b/themes/default/layouts/_default/baseof.json @@ -1,4 +1,9 @@ -{{- $modified := partial "function-page-modified.html" . -}} +{{- $modified := partial "function-page-modified.html" + (dict + "Context" . + "Disable" true + ) +-}} {{- if $modified -}} {{- block "main" . -}} diff --git a/themes/default/layouts/_default/baseof.txt b/themes/default/layouts/_default/baseof.txt index f122113..c354667 100644 --- a/themes/default/layouts/_default/baseof.txt +++ b/themes/default/layouts/_default/baseof.txt @@ -1,4 +1,9 @@ -{{- $modified := partial "function-page-modified.html" . -}} +{{- $modified := partial "function-page-modified.html" + (dict + "Context" . + "Disable" true + ) +-}} {{- if $modified -}} {{- block "main" . -}} diff --git a/themes/default/layouts/_default/baseof.xml b/themes/default/layouts/_default/baseof.xml index f9f85d8..73f129f 100644 --- a/themes/default/layouts/_default/baseof.xml +++ b/themes/default/layouts/_default/baseof.xml @@ -1,4 +1,9 @@ -{{- $modified := partial "function-page-modified.html" . -}} +{{- $modified := partial "function-page-modified.html" + (dict + "Context" . + "Disable" true + ) +-}} {{- if $modified -}} {{- block "main" . -}} diff --git a/themes/default/layouts/_default/single.embed.html b/themes/default/layouts/_default/single.embed.html index 66ea9c8..6169772 100644 --- a/themes/default/layouts/_default/single.embed.html +++ b/themes/default/layouts/_default/single.embed.html @@ -1,2 +1,26 @@ -{{- partial "base-embed.html" . -}} -{{- .Render "summary" -}} +{{- $pageContext := . -}} +{{- $format := "embed.html" -}} + +{{- $page := print "public/" (strings.TrimPrefix + $pageContext.Page.Site.BaseURL + $pageContext.Page.Permalink + ) $format +-}} + +{{- $modified := partial "function-page-modified.html" + (dict + "Context" $pageContext + "Format" $format + ) +-}} + +{{- with $embed := resources.Get $page -}} + {{- if (in $embed.Content "/data/media/404.png") -}} + {{- $modified = true -}} + {{- end -}} +{{- end -}} + +{{- if $modified -}} + {{- partial "base-embed.html" . -}} + {{- .Render "summary" -}} +{{- end -}} diff --git a/themes/default/layouts/partials/function-page-modified.html b/themes/default/layouts/partials/function-page-modified.html index 4e8bf46..43bea9f 100644 --- a/themes/default/layouts/partials/function-page-modified.html +++ b/themes/default/layouts/partials/function-page-modified.html @@ -1,17 +1,18 @@ -{{- $input := . -}} +{{- $input := .Context -}} +{{- $disable := or .Disable false -}} {{- $pageContext := $input -}} - -{{- $markdownContent := print "content/" $pageContext.File -}} -{{- $markdownPublic := print "public/data/generates/content/" $pageContext.File -}} +{{- $format := or .Format "index.html" -}} {{- $page := print "public/" (strings.TrimPrefix $pageContext.Page.Site.BaseURL $pageContext.Page.Permalink - ) "index.html" + ) $format -}} -{{- $markdownModTime := "" -}} {{- $pageModTime := "" -}} +{{- $markdownModTime := "" -}} +{{- $markdownContent := print "content/" $pageContext.File -}} +{{- $markdownPublic := print "public/data/generates/content/" $pageContext.File -}} {{- if fileExists $markdownContent -}} {{- $markdownModTime = (os.Stat $markdownContent).ModTime -}} @@ -25,9 +26,9 @@ {{- $pageModTime = (os.Stat $page).ModTime -}} {{- end -}} -{{- $modified := gt $markdownModTime $pageModTime -}} +{{- $page = gt $markdownModTime $pageModTime -}} -{{- $output := or $modified (in (slice +{{- $modified := or $page (in (slice "home" "section" "taxonomy" @@ -35,4 +36,4 @@ ) $pageContext.Page.Kind) -}} -{{- return true -}} +{{- return (or $disable $modified) -}} diff --git a/themes/default/layouts/partials/render-embed.html b/themes/default/layouts/partials/render-embed.html index 68bb370..730c551 100644 --- a/themes/default/layouts/partials/render-embed.html +++ b/themes/default/layouts/partials/render-embed.html @@ -1,22 +1,30 @@ {{- $pageContext := . -}} +{{- $format := "embed.html" -}} {{- $page := print "public/" (strings.TrimPrefix $pageContext.Page.Site.BaseURL $pageContext.Page.Permalink - ) "embed.html" + ) $format -}} -{{- $modified := partial "function-page-modified.html" $pageContext -}} +{{- $modified := partial "function-page-modified.html" + (dict + "Context" $pageContext + "Format" $format + ) +-}} + +{{- with $embed := resources.Get $page -}} + {{- if (in $embed.Content "/data/media/404.png") -}} + {{- $modified = true -}} + {{- end -}} +{{- end -}} {{- if $modified -}} {{- $pageContext.Render "summary" -}} {{- else -}} {{- with $embed := resources.Get $page -}} {{- $embedContent := strings.TrimPrefix (partial "base-embed.html" $pageContext) $embed.Content -}} - {{- if (in $embedContent "/data/media/404.png") -}} - {{- $pageContext.Render "summary" -}} - {{- else -}} - {{- $embedContent | safeHTML -}} - {{- end -}} + {{- $embedContent | safeHTML -}} {{- end -}} {{- end -}} |