diff options
author | tdro <tdro@noreply.example.com> | 2022-10-06 00:58:36 -0400 |
---|---|---|
committer | tdro <tdro@noreply.example.com> | 2022-10-06 00:59:10 -0400 |
commit | 2b1c3e9572315ba19daab57fdd1295322288a293 (patch) | |
tree | 1dae541044d52eaf80e41067b9103fa3ca3cd44b | |
parent | c5d2526b6a3b44ef3a3b2dbef35095ea0fbf4324 (diff) | |
download | canory-2b1c3e9572315ba19daab57fdd1295322288a293.tar.gz canory-2b1c3e9572315ba19daab57fdd1295322288a293.tar.bz2 canory-2b1c3e9572315ba19daab57fdd1295322288a293.zip |
themes/default/layouts/partials/function-authors-data: Pass context
Allow passing the page context and reuse in base head template.
-rw-r--r-- | themes/default/layouts/partials/base-head.html | 20 | ||||
-rw-r--r-- | themes/default/layouts/partials/function-authors-data.html | 7 |
2 files changed, 17 insertions, 10 deletions
diff --git a/themes/default/layouts/partials/base-head.html b/themes/default/layouts/partials/base-head.html index f24e7d4..7672f22 100644 --- a/themes/default/layouts/partials/base-head.html +++ b/themes/default/layouts/partials/base-head.html @@ -1,13 +1,17 @@ {{- partial "generate-authors" . -}} -{{- $data := - (dict - "Author" (index .Site.Data ((or .Params.author .Site.Author.default.home) | default "default")) + +{{- + $authorData := (dict + "Context" . + "AuthorDefaultUser" .Site.Author.default.home ) -}} +{{- $author := partial "function-authors-data.html" (dict "Data" $authorData) -}} + <!-- HTML Meta Tags --> <meta charset="utf-8"> -<meta name="author" content="{{ partial "author-name.html" (dict "Data" $data) -}}"> +<meta name="author" content="{{ $author.name -}}"> {{ if or .Params.Unlisted .Params.ExpiryDate -}} <meta name="robots" content="noindex,nofollow"> {{- else -}} @@ -23,13 +27,13 @@ <!-- Search Engine Tags --> <meta itemprop="name" content="{{ partial "base-title.html" . -}}"> <meta itemprop="description" content="{{ if .Params.summary }}{{ .Params.summary }}{{ else }}{{ .Summary }}{{ end }}"> -<meta itemprop="image" content="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) -}}/media/profile/picture.png"> +<meta itemprop="image" content="{{ .Site.BaseURL }}/{{ $author.user -}}/media/profile/picture.png"> <!-- Open Graph Meta Tags --> <meta property="og:title" content="{{ partial "base-title.html" . -}}"> <meta property="og:description" content="{{- partial "base-description.html" . -}}"> <meta property="og:url" content="{{ .Permalink }}"> -<meta property="og:image" content="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) -}}/media/profile/picture.png"> +<meta property="og:image" content="{{ .Site.BaseURL }}/{{ $author.user -}}/media/profile/picture.png"> <meta property="og:type" content="website"> <meta property="article:published_time" content="{{ .Params.PublishDate }}"> <meta property="article:modified_time " content="{{ .Params.LastMod }}"> @@ -38,13 +42,13 @@ <meta name="twitter:card" content="summary_large_image"> <meta name="twitter:title" content="{{ partial "base-title.html" . -}}"> <meta name="twitter:description" content="{{- partial "base-description.html" . -}}"> -<meta name="twitter:image" content="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) -}}/media/profile/picture.png"> +<meta name="twitter:image" content="{{ .Site.BaseURL }}/{{ $author.user -}}/media/profile/picture.png"> <!-- Search Verification --> {{- partial "base-search.html" . -}} <!-- Link Tags --> -<link rel="home" href="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) }}"> +<link rel="home" href="{{ .Site.BaseURL }}/{{ $author.user }}/"> <!-- Style Sheets & Scripts --> {{- $index := resources.Get "js/index.js" -}} diff --git a/themes/default/layouts/partials/function-authors-data.html b/themes/default/layouts/partials/function-authors-data.html index c4ccf7a..079cf8c 100644 --- a/themes/default/layouts/partials/function-authors-data.html +++ b/themes/default/layouts/partials/function-authors-data.html @@ -1,3 +1,6 @@ -{{- $data := index .Site.Data ((or .Params.author .Site.Author.default.user) | default "default") -}} +{{- $context := or .Data.Context . -}} +{{- $authorDefaultUser := or .Data.AuthorDefaultUser $context.Site.Author.default.user -}} -{{- return $data -}} +{{- $output := index $context.Site.Data ((or $context.Params.author $authorDefaultUser) | default "default") -}} + +{{- return $output -}} |