themes/default/layouts/partials/head: Try variable context

Try explicit inputs on default templates. Header links
properly reflects home configuration now. Initial experiment for
showing follow list.

4 files changed, 32 insertions, 19 deletions

diff --git a/themes/default/layouts/partials/author-list.html b/themes/default/layouts/partials/author-list.html
index 5435592..a5d50cb 100644
--- a/themes/default/layouts/partials/author-list.html
+++ b/themes/default/layouts/partials/author-list.html
@@ -1,16 +1,13 @@
-<author-list>
-  {{ $authors := slice }}
-
-  {{- range $index, $data := .Site.RegularPages -}}
-    {{ $authors = $authors | append $data.Type }}
-  {{- end -}}
-
-  {{ $authors = shuffle (uniq $authors) }}
+{{ $authors := slice }}
+{{ range $index, $data := .Site.RegularPages -}}
+  {{- $authors = $authors | append $data.Type -}}
+{{- end -}}
 
+<author-list>
   <h1>Authors</h1>
   <section>
-    {{ range $author := first 3 $authors }}
-    {{ $data := index $.Site.Data.authors $author | default "default" }}
+    {{- range $author := first 3 (shuffle (uniq $authors)) -}}
+      {{ $data := index $.Site.Data.authors $author | default "default" }}
       {{ partial "author-card.html" (dict "Data" $data) }}
     {{ end }}
   </section>
diff --git a/themes/default/layouts/partials/author-name.html b/themes/default/layouts/partials/author-name.html
index 405569c..0b3b43c 100644
--- a/themes/default/layouts/partials/author-name.html
+++ b/themes/default/layouts/partials/author-name.html
@@ -1,2 +1,8 @@
-{{ $author := index .Site.Data.authors ((or .Params.author .Site.Author.default.user) | default "default") }}
+{{- $author := .Data.Author -}}
+
+{{- with $author -}}
+{{- else -}}
+  {{- $author = index .Site.Data.authors ((or .Params.author .Site.Author.default.user) | default "default") -}}
+{{- end -}}
+
 {{- $author.name | markdownify -}}
diff --git a/themes/default/layouts/partials/author-user.html b/themes/default/layouts/partials/author-user.html
index 8d7036a..cf4e32d 100644
--- a/themes/default/layouts/partials/author-user.html
+++ b/themes/default/layouts/partials/author-user.html
@@ -1,2 +1,8 @@
-{{ $author := index .Site.Data.authors ((or .Params.author .Site.Author.default.user) | default "default") }}
+{{- $author := .Data.Author -}}
+
+{{- with $author -}}
+{{- else -}}
+  {{- $author = index .Site.Data.authors ((or .Params.author .Site.Author.default.user) | default "default") -}}
+{{- end -}}
+
 {{- $author.user | markdownify -}}
diff --git a/themes/default/layouts/partials/head.html b/themes/default/layouts/partials/head.html
index 33c1a6a..8eb9435 100644
--- a/themes/default/layouts/partials/head.html
+++ b/themes/default/layouts/partials/head.html
@@ -1,6 +1,12 @@
+{{- $data :=
+  (dict
+    "Author" (index .Site.Data.authors ((or .Params.author .Site.Author.default.home) | default "default"))
+  )
+-}}
+
 <!-- HTML Meta Tags -->
 <meta charset="utf-8">
-<meta name="author" content="{{ partial "author-name.html" . -}}">
+<meta name="author" content="{{ partial "author-name.html" (dict "Data" $data) -}}">
 {{ if or .Params.Unlisted .Params.ExpiryDate -}}
 <meta name="robots" content="noindex,nofollow">
 {{- else -}}
@@ -16,13 +22,13 @@
 <!-- Search Engine Tags -->
 <meta itemprop="name" content="{{ partial "site-title.html" . -}}">
 <meta itemprop="description" content="{{ if .Params.summary }}{{ .Params.summary }}{{ else }}{{ .Summary }}{{ end }}">
-<meta itemprop="image" content="{{ .Site.BaseURL }}/{{ partial "author-media-path.html" . }}/profile/picture.png">
+<meta itemprop="image" content="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) -}}/media/profile/picture.png">
 
 <!-- Open Graph Meta Tags -->
 <meta property="og:title" content="{{ partial "site-title.html" . -}}">
 <meta property="og:description" content="{{- partial "site-description.html" . -}}">
 <meta property="og:url" content="{{ .Permalink }}">
-<meta property="og:image" content="{{ .Site.BaseURL }}/{{ partial "author-media-path.html" . }}/profile/picture.png">
+<meta property="og:image" content="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) -}}/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 }}">
@@ -31,15 +37,13 @@
 <meta name="twitter:card" content="summary_large_image">
 <meta name="twitter:title" content="{{ partial "site-title.html" . -}}">
 <meta name="twitter:description" content="{{- partial "site-description.html" . -}}">
-<meta name="twitter:image" content="{{ .Site.BaseURL }}/{{ partial "author-media-path.html" . }}/profile/picture.png">
+<meta name="twitter:image" content="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) -}}/media/profile/picture.png">
 
 <!-- Search Verification -->
 {{- partial "head-search.html" . -}}
 
 <!-- Link Tags -->
-{{- range first 1 (where .Site.Pages "Params.Author" .Site.Author.default.home) -}}
-<link rel="home" href="{{ .Site.BaseURL }}/{{ partial "author-user.html" . }}">
-{{- end }}
+<link rel="home" href="{{ .Site.BaseURL }}/{{ partial "author-user.html" (dict "Data" $data) }}">
 
 <!-- Style Sheets & Scripts -->
 {{- $index   := resources.Get "js/index.js" -}}