From db3820c0c5d84226e01d6f1dcef10929979935ba Mon Sep 17 00:00:00 2001 From: tdro Date: Mon, 14 Nov 2022 08:37:26 -0500 Subject: themes/default/layouts/partials/meta: Remove dead logic Feed data self and markdown may no longer be needed --- themes/default/layouts/partials/meta-context-menu.html | 9 ++------- themes/default/layouts/partials/meta-markdown.html | 13 ++++--------- themes/default/layouts/partials/meta-permalink.html | 4 +++- themes/default/layouts/partials/meta-view.html | 7 +------ 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/themes/default/layouts/partials/meta-context-menu.html b/themes/default/layouts/partials/meta-context-menu.html index 26c3842..79ffacc 100644 --- a/themes/default/layouts/partials/meta-context-menu.html +++ b/themes/default/layouts/partials/meta-context-menu.html @@ -1,12 +1,7 @@ {{- $id := delimit (shuffle (seq 1 7)) "" -}} {{- $author := partial "function-authors-data.html" . -}} -{{- $href := print .Site.BaseURL "/" $author.user "/messages/" (path.Base .Permalink) "/" -}} -{{- $plain := print .Site.BaseURL "/" $author.user "/messages/" (path.Base .Permalink) "/index.txt" -}} - -{{- with .Params.feed.self -}} - {{- $href = print $.Site.BaseURL "/" $.Params.feed.self -}} - {{- $plain = print $.Site.BaseURL "/" $.Params.feed.self "/index.txt" -}} -{{- end -}} +{{- $href := print .Permalink -}} +{{- $plain := print $href "index.txt" -}} diff --git a/themes/default/layouts/partials/meta-markdown.html b/themes/default/layouts/partials/meta-markdown.html index ca8ff37..c6e7bdf 100644 --- a/themes/default/layouts/partials/meta-markdown.html +++ b/themes/default/layouts/partials/meta-markdown.html @@ -1,13 +1,8 @@ {{- if not .ExpiryDate -}} - {{- $author := partial "function-authors-data.html" . -}} - {{- $source := print $author.user "/messages/" .File.LogicalName -}} - {{- $href := print .Site.BaseURL "/" (partial "function-paths.html" "markdown") "/" $source -}} - {{- $title := $href -}} - - {{- with .Params.feed -}} - {{- $href = print $.Site.BaseURL "/" $.Params.feed.markdown -}} - {{- $title = $href -}} - {{- end -}} + {{- $relURL := strings.TrimPrefix .Page.Site.BaseURL .Page.Permalink -}} + {{- $source := print (path.Dir $relURL) ".md" -}} + {{- $href := print .Site.BaseURL "/" (partial "function-paths.html" "markdown") $source -}} + {{- $title := .File.LogicalName -}} diff --git a/themes/default/layouts/partials/meta-permalink.html b/themes/default/layouts/partials/meta-permalink.html index e9950cf..6c3c05f 100644 --- a/themes/default/layouts/partials/meta-permalink.html +++ b/themes/default/layouts/partials/meta-permalink.html @@ -1,5 +1,7 @@ +{{- $href := print .Permalink "#" (partial "card-id.html" .) -}} + - + {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/link.svg")) -}} permalink {{- /* This comment removes trailing newlines and white spaces. */ -}} diff --git a/themes/default/layouts/partials/meta-view.html b/themes/default/layouts/partials/meta-view.html index 866cf82..6ec5d31 100644 --- a/themes/default/layouts/partials/meta-view.html +++ b/themes/default/layouts/partials/meta-view.html @@ -1,9 +1,4 @@ -{{- $author := partial "function-authors-data.html" . -}} -{{- $href := print .Site.BaseURL "/" $author.user "/messages/" (path.Base .Permalink) "/" -}} - -{{- with .Params.feed.self -}} - {{- $href = print $.Site.BaseURL "/" $.Params.feed.self -}} -{{- end -}} +{{- $href := print .Permalink -}} {{- /* This comment removes trailing newlines and white spaces. */ -}} -- cgit v1.2.3