10 files changed, 30 insertions, 14 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" . }} &mdash; {{ 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 }}