From e1f3254c256edf715f75b778513d14f18e865e67 Mon Sep 17 00:00:00 2001
From: tdro <tdro@noreply.example.com>
Date: Mon, 6 Nov 2023 20:15:38 -0500
Subject: themes/default/layouts: Remove author dependency

---
 themes/default/layouts/_default/index.html                 | 5 +++--
 themes/default/layouts/partials/base-footer.html           | 2 +-
 themes/default/layouts/partials/base-title.html            | 2 +-
 themes/default/layouts/partials/function-authors-data.html | 4 +++-
 themes/default/layouts/partials/gallery-walk.html          | 2 +-
 themes/default/layouts/partials/navigator-right.html       | 3 ++-
 6 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'themes/default/layouts')

diff --git a/themes/default/layouts/_default/index.html b/themes/default/layouts/_default/index.html
index f1ab369..2f97bbd 100644
--- a/themes/default/layouts/_default/index.html
+++ b/themes/default/layouts/_default/index.html
@@ -30,13 +30,14 @@
 {{- end -}}
 
 {{- define "right" -}}
+  {{- $author := "Section" -}}
   {{- partial "author-list.html" . -}}
 
-  {{- range first 1 (where .Site.Pages "Params.Author" .Site.Author.default.gallery) -}}
+  {{- range first 1 (where .Site.Pages $author .Site.Author.default.gallery) -}}
     {{- partial "gallery.html" . -}}
   {{- end -}}
 
-  {{- range first 1 (where .Site.Pages "Params.Author" .Site.Author.default.webring) -}}
+  {{- range first 1 (where .Site.Pages $author .Site.Author.default.webring) -}}
     {{- partial "following-list.html" . -}}
     {{- partial "webring.html"        . -}}
   {{- end -}}
diff --git a/themes/default/layouts/partials/base-footer.html b/themes/default/layouts/partials/base-footer.html
index d83f07c..53b3b2f 100644
--- a/themes/default/layouts/partials/base-footer.html
+++ b/themes/default/layouts/partials/base-footer.html
@@ -1,5 +1,5 @@
 {{- $kind := in (slice "home" "taxonomy" "term") .Page.Kind -}}
-{{- $author := index .Site.Data ((or .Params.author .Site.Author.default.footer) | default "default") -}}
+{{- $author := index .Site.Data ((or .Section .Site.Author.default.footer) | default "default") -}}
 
 <footer>
   {{- with .Site.Author.footer -}}
diff --git a/themes/default/layouts/partials/base-title.html b/themes/default/layouts/partials/base-title.html
index b34355d..79e34ca 100644
--- a/themes/default/layouts/partials/base-title.html
+++ b/themes/default/layouts/partials/base-title.html
@@ -1,4 +1,4 @@
-{{- $author := index .Site.Data ((or .Params.author .Site.Author.default.title) | default "default") -}}
+{{- $author := index .Site.Data ((or .Section .Site.Author.default.title) | default "default") -}}
 
 {{- if not (eq .Title $.Site.Title) -}}
   {{- with $title := or .Title .Summary -}}
diff --git a/themes/default/layouts/partials/function-authors-data.html b/themes/default/layouts/partials/function-authors-data.html
index f2ef800..88af43d 100644
--- a/themes/default/layouts/partials/function-authors-data.html
+++ b/themes/default/layouts/partials/function-authors-data.html
@@ -4,6 +4,8 @@
 
 {{- $authorDefaultUser := or .Data.AuthorDefaultUser $pageContext.Site.Author.default.user -}}
 
-{{- $output := index $pageContext.Site.Data ((or $pageContext.Params.author $authorDefaultUser) | default "default") -}}
+{{- $author :=  $pageContext.Section -}}
+
+{{- $output := index $pageContext.Site.Data ((or $author $authorDefaultUser) | default "default") -}}
 
 {{- return $output -}}
diff --git a/themes/default/layouts/partials/gallery-walk.html b/themes/default/layouts/partials/gallery-walk.html
index b621633..4b0df36 100644
--- a/themes/default/layouts/partials/gallery-walk.html
+++ b/themes/default/layouts/partials/gallery-walk.html
@@ -13,7 +13,7 @@
 
 {{- $filteredPages := partial "function-filters-content.html" .Site.RegularPages -}}
 
-{{- range (where $filteredPages "Params.Author" $author.user) -}}
+{{- range (where $filteredPages "Section" $author.user) -}}
   {{- if in .Content "<picture>" -}}
     {{- $data = $data | append (dict
         "alt"         (delimit   (findRE `(?sU)alt=".*"`    .Content 1) "")
diff --git a/themes/default/layouts/partials/navigator-right.html b/themes/default/layouts/partials/navigator-right.html
index 573cb8f..4ad5d42 100644
--- a/themes/default/layouts/partials/navigator-right.html
+++ b/themes/default/layouts/partials/navigator-right.html
@@ -1,4 +1,5 @@
 {{- partial "author-list.html" . -}}
+{{- $author := "Section" -}}
 
 {{- if or
   (eq .Page.Kind "page")
@@ -19,7 +20,7 @@
 
 {{- else -}}
 
-  {{- range first 1 (where .Site.Pages "Params.Author" .Site.Author.default.webring) -}}
+  {{- range first 1 (where .Site.Pages $author .Site.Author.default.webring) -}}
     {{- partial "webring.html" . -}}
   {{- end -}}
 
-- 
cgit v1.2.3