diff options
21 files changed, 57 insertions, 35 deletions
diff --git a/themes/default/layouts/_default/home.history.html b/themes/default/layouts/_default/home.history.html index c901d33..5765826 100644 --- a/themes/default/layouts/_default/home.history.html +++ b/themes/default/layouts/_default/home.history.html @@ -20,6 +20,8 @@ ) }} + {{- $author := partial "function-authors-data.html" . -}} + <history-archive> <item-list> {{ range (.Paginator.Pages.GroupByDate "2006") }} @@ -37,7 +39,7 @@ <code title="{{ .Date | time.Format "Posted: Monday, January 2, 2006 at 15:04:05 MST" }}">{{ .Date.Format "02 Jan" }}</code> </span> <span>{{ partial "meta-title.html" . }}</span> - <span>@{{ partial "author-user.html" . }}</span> + <span>@{{ $author.user }}</span> </a> </li> {{ end }} diff --git a/themes/default/layouts/_default/home.records.html b/themes/default/layouts/_default/home.records.html index 1fe7425..137c673 100644 --- a/themes/default/layouts/_default/home.records.html +++ b/themes/default/layouts/_default/home.records.html @@ -20,6 +20,8 @@ ) }} + {{- $author := partial "function-authors-data.html" . -}} + <records-archive> <item-list> {{ range (.Paginator.Pages.GroupByDate "2006") }} @@ -33,7 +35,7 @@ <code title="{{ .Date | time.Format "Posted: Monday, January 2, 2006 at 15:04:05 MST" }}">{{ .Date.Format "02 Jan" }}</code> </span> <span>{{ partial "meta-tags.html" . }} — {{ partial "meta-title.html" . }}</span> - <span>@{{ partial "author-user.html" . }}</span> + <span>@{{ $author.user }}</span> </li> {{ end }} </ul> diff --git a/themes/default/layouts/_default/index.json b/themes/default/layouts/_default/index.json index 6cbc1ef..5655022 100644 --- a/themes/default/layouts/_default/index.json +++ b/themes/default/layouts/_default/index.json @@ -1,3 +1,5 @@ +{{- $author := partial "function-authors-data.html" . -}} + { "version": "https://jsonfeed.org/version/1.1", "title": "{{ .Site.Title }}", @@ -22,7 +24,7 @@ "type": "{{ $data.Type }}" }, "author": { - "name": "{{ partial "author-user.html" . }}" + "name": "{{ $author.user }}" }, "tags": [ {{- range $tags, $tag := $data.Params.tags -}} diff --git a/themes/default/layouts/_default/rss.xml b/themes/default/layouts/_default/rss.xml index 23497ba..9ff05d5 100644 --- a/themes/default/layouts/_default/rss.xml +++ b/themes/default/layouts/_default/rss.xml @@ -62,7 +62,7 @@ <link>{{ .Permalink }}</link> <description>{{ $description }}</description> <language>{{ .Site.LanguageCode }}</language> - <category>{{ partial "author-user.html" . }}</category> + <category>{{ $author.user }}</category> <generator>Hugo {{ hugo.Version }}</generator> <lastBuildDate>{{ $lastBuildDate }}</lastBuildDate> <image> diff --git a/themes/default/layouts/_default/section.drafts.html b/themes/default/layouts/_default/section.drafts.html index 569af84..ad862c4 100644 --- a/themes/default/layouts/_default/section.drafts.html +++ b/themes/default/layouts/_default/section.drafts.html @@ -1,5 +1,6 @@ {{ define "styles" }} -{{ $author := partial "author-user.html" . }} +{{- $author := partial "function-authors-data.html" . -}} +{{- $author = $author.user -}} <style> {{ partial "styles-navigator.html" (dict "Link" "/") | safeCSS }} @@ -31,7 +32,8 @@ {{ partial "profile.html" . }} - {{- $author := partial "author-user.html" . -}} + {{- $author := partial "function-authors-data.html" . -}} + {{- $author = $author.user -}} {{- $users := where .Site.RegularPages "Section" $author -}} {{- $drafts := where .Site.RegularPages "Draft" true -}} {{- $filteredPages := $users | intersect $drafts -}} diff --git a/themes/default/layouts/_default/section.feeds.html b/themes/default/layouts/_default/section.feeds.html index 2845ea0..20566df 100644 --- a/themes/default/layouts/_default/section.feeds.html +++ b/themes/default/layouts/_default/section.feeds.html @@ -1,5 +1,6 @@ {{ define "styles" }} -{{ $author := partial "author-user.html" . }} +{{- $author := partial "function-authors-data.html" . -}} +{{- $author = $author.user -}} <style> {{ partial "styles-navigator.html" (dict "Link" "/") | safeCSS }} diff --git a/themes/default/layouts/_default/section.html b/themes/default/layouts/_default/section.html index 97436fa..9d32210 100644 --- a/themes/default/layouts/_default/section.html +++ b/themes/default/layouts/_default/section.html @@ -23,9 +23,11 @@ "Messages" -}} + {{- $author := partial "function-authors-data.html" . -}} + {{ partial "navigator-middle.html" (dict - "Title" (partial "author-name.html" .) + "Title" $author.name "Subtitle" $messages "Icon" "arrow-left" "IconLabel" "Back" diff --git a/themes/default/layouts/_default/section.likes.html b/themes/default/layouts/_default/section.likes.html index ccd75fb..650c326 100644 --- a/themes/default/layouts/_default/section.likes.html +++ b/themes/default/layouts/_default/section.likes.html @@ -1,5 +1,6 @@ {{ define "styles" }} -{{ $author := partial "author-user.html" . }} +{{- $author := partial "function-authors-data.html" . -}} +{{- $author = $author.user -}} <style> {{ partial "styles-navigator.html" (dict "Link" "/") | safeCSS }} @@ -31,7 +32,8 @@ {{ partial "profile.html" . }} - {{- $author := partial "author-user.html" . -}} + {{- $author := partial "function-authors-data.html" . -}} + {{- $author = $author.user -}} {{- $users := where .Site.RegularPages "Section" $author -}} {{- $likes := where .Site.RegularPages ".Params.liked" true -}} {{- $filteredPages := $users | intersect $likes -}} diff --git a/themes/default/layouts/_default/section.media.html b/themes/default/layouts/_default/section.media.html index a140801..3bfaf58 100644 --- a/themes/default/layouts/_default/section.media.html +++ b/themes/default/layouts/_default/section.media.html @@ -1,5 +1,6 @@ {{ define "styles" }} -{{ $author := partial "author-user.html" . }} +{{- $author := partial "function-authors-data.html" . -}} +{{- $author = $author.user -}} <style> {{ partial "styles-navigator.html" (dict "Link" "/") | safeCSS }} @@ -31,7 +32,8 @@ {{ partial "profile.html" . }} - {{- $author := partial "author-user.html" . -}} + {{- $author := partial "function-authors-data.html" . -}} + {{- $author = $author.user -}} {{ $count := 0 }} {{ $result := false }} diff --git a/themes/default/layouts/_default/taxonomy.html b/themes/default/layouts/_default/taxonomy.html index f8048d0..bcacf3e 100644 --- a/themes/default/layouts/_default/taxonomy.html +++ b/themes/default/layouts/_default/taxonomy.html @@ -6,7 +6,8 @@ {{ define "middle" }} - {{ $title := .Title }} + {{- $title := .Title -}} + {{- $author := partial "function-authors-data.html" . -}} {{ if eq .Title "Tags" }} @@ -44,7 +45,7 @@ <code>{{ .Date.Format "02 Jan 2006" }}</code> </span> <span>{{ partial "meta-title.html" . }}</span> - <span>@{{ partial "author-user.html" . }}</span> + <span>@{{ $author.user }}</span> </a> </li> {{ if eq (mod $count $.Paginator.PageSize) 0 }} diff --git a/themes/default/layouts/partials/author-media-path.html b/themes/default/layouts/partials/author-media-path.html deleted file mode 100644 index 77090ea..0000000 --- a/themes/default/layouts/partials/author-media-path.html +++ /dev/null @@ -1,2 +0,0 @@ -{{ partial "author-user.html" . }}/media -{{- /* This comment removes trailing newlines and white spaces. */ -}} diff --git a/themes/default/layouts/partials/author-name.html b/themes/default/layouts/partials/author-name.html deleted file mode 100644 index a87dc58..0000000 --- a/themes/default/layouts/partials/author-name.html +++ /dev/null @@ -1,3 +0,0 @@ -{{- $author := partial "function-authors-data.html" . -}} - -{{- $author.name | markdownify -}} diff --git a/themes/default/layouts/partials/author-user.html b/themes/default/layouts/partials/author-user.html deleted file mode 100644 index 09e71f1..0000000 --- a/themes/default/layouts/partials/author-user.html +++ /dev/null @@ -1,3 +0,0 @@ -{{- $author := partial "function-authors-data.html" . -}} - -{{- $author.user -}} diff --git a/themes/default/layouts/partials/context-profile.html b/themes/default/layouts/partials/context-profile.html index ec18c21..609d045 100644 --- a/themes/default/layouts/partials/context-profile.html +++ b/themes/default/layouts/partials/context-profile.html @@ -4,13 +4,13 @@ {{- $user := $author.user -}} {{- $host := (urls.Parse .Site.BaseURL).Host -}} -{{- $href := print .Site.BaseURL "/" (partial "author-user.html" .) "/#" -}} +{{- $href := print .Site.BaseURL "/" $author.user "/#" -}} {{- if not $host -}} {{- $host = "localhost" -}} {{- end -}} -{{- $title := print (partial "author-user.html" .) "@" $host -}} +{{- $title := print $author.user "@" $host -}} {{- with .Params.feed -}} {{- $host = $.Params.feed.domain -}} diff --git a/themes/default/layouts/partials/count-drafts.html b/themes/default/layouts/partials/count-drafts.html index 78b57a5..3c0cc5a 100644 --- a/themes/default/layouts/partials/count-drafts.html +++ b/themes/default/layouts/partials/count-drafts.html @@ -1,4 +1,6 @@ -{{ $author := partial "author-user.html" . }} +{{- $author := partial "function-authors-data.html" . -}} +{{- $author = $author.user -}} + {{ $count := 0 }} {{ range .Site.Pages }} diff --git a/themes/default/layouts/partials/count-feeds.html b/themes/default/layouts/partials/count-feeds.html index cf54180..0b8cacc 100644 --- a/themes/default/layouts/partials/count-feeds.html +++ b/themes/default/layouts/partials/count-feeds.html @@ -1,4 +1,6 @@ -{{ $author := partial "author-user.html" . }} +{{- $author := partial "function-authors-data.html" . -}} +{{- $author = $author.user -}} + {{ $count := 0 }} {{ range .Site.Pages }} diff --git a/themes/default/layouts/partials/count-likes.html b/themes/default/layouts/partials/count-likes.html index a808576..3b8a9ef 100644 --- a/themes/default/layouts/partials/count-likes.html +++ b/themes/default/layouts/partials/count-likes.html @@ -1,4 +1,6 @@ -{{ $author := partial "author-user.html" . }} +{{- $author := partial "function-authors-data.html" . -}} +{{- $author = $author.user -}} + {{ $count := 0 }} {{ range .Site.Pages }} diff --git a/themes/default/layouts/partials/count-media.html b/themes/default/layouts/partials/count-media.html index 1d5e49b..13782cc 100644 --- a/themes/default/layouts/partials/count-media.html +++ b/themes/default/layouts/partials/count-media.html @@ -1,4 +1,6 @@ -{{ $author := partial "author-user.html" . }} +{{- $author := partial "function-authors-data.html" . -}} +{{- $author = $author.user -}} + {{ $count := 0 }} {{ range .Site.Pages }} diff --git a/themes/default/layouts/partials/meta-handle.html b/themes/default/layouts/partials/meta-handle.html index 20e11d7..4ec23e4 100644 --- a/themes/default/layouts/partials/meta-handle.html +++ b/themes/default/layouts/partials/meta-handle.html @@ -1,11 +1,13 @@ +{{- $author := partial "function-authors-data.html" . -}} + {{- $host := (urls.Parse .Site.BaseURL).Host -}} -{{- $href := print .Site.BaseURL "/" (partial "author-user.html" .) "/#" -}} +{{- $href := print .Site.BaseURL "/" $author.user "/#" -}} {{- if not $host -}} {{- $host = "localhost" -}} {{- end -}} -{{- $title := print (partial "author-user.html" .) "@" $host -}} +{{- $title := print $author.user "@" $host -}} {{- with .Params.feed -}} {{- $host = $.Params.feed.domain -}} diff --git a/themes/default/layouts/partials/meta-name.html b/themes/default/layouts/partials/meta-name.html index e867469..e381259 100644 --- a/themes/default/layouts/partials/meta-name.html +++ b/themes/default/layouts/partials/meta-name.html @@ -1,5 +1,7 @@ -{{- $href := print .Site.BaseURL "/" (partial "author-user.html" .) "/#" -}} -{{- $name := partial "author-name.html" . -}} +{{- $author := partial "function-authors-data.html" . -}} + +{{- $href := print .Site.BaseURL "/" $author.user "/#" -}} +{{- $name := $author.name -}} {{- $title := $name -}} {{- with .Params.feed -}} diff --git a/themes/default/layouts/partials/meta-via.html b/themes/default/layouts/partials/meta-via.html index c676e47..6aa405d 100644 --- a/themes/default/layouts/partials/meta-via.html +++ b/themes/default/layouts/partials/meta-via.html @@ -1,10 +1,12 @@ +{{- $author := partial "function-authors-data.html" . -}} + {{- if .Params.feed -}} <anchored-via> {{- safeHTML (readFile (print (partial "function-paths.html" "static") "/icons/feather/rss.svg")) -}} <a data-hover - title="{{ partial "author-user.html" . }}@{{ (urls.Parse .Site.BaseURL).Host }}" - href="{{ .Site.BaseURL }}/{{ partial "author-user.html" . }}/feeds/#"> - via @{{ partial "author-user.html" . }} + title="{{ $author.user }}@{{ (urls.Parse .Site.BaseURL).Host }}" + href="{{ .Site.BaseURL }}/{{ $author.user }}/feeds/#"> + via @{{ $author.user }} </a> </anchored-via> {{- end -}} |