Move many paige.metadata.* params to paige

README.md

@@ -249,11 +249,14 @@ paige:
       hide: false # Don't credit this project in a data attribute
     link:
       hide: false # Don't credit this project in the footer
-  date: "published" # Page date displayed; must be "published" or "modified"
-  header:
-    menu:
-      breakpoint: "sm" # Bootstrap breakpoint at which to display all menu items
-      style: "pills" # Must be "links" or "pills"
+  date:
+    class: "text-center text-secondary"
+    format: ":date_long" # Hugo date format
+    hide: false
+    source: "published" # Displayed date; must be "published" or "modified"
+  menu:
+    breakpoint: "sm" # Bootstrap breakpoint at which to display all menu items
+    style: "pills" # Must be "links" or "pills"
   list:
     authors:
       class: "mb-0 text-center text-secondary"
@@ -288,31 +291,27 @@ paige:
       class: "mb-0 text-center"
       hide: false
   metadata:
-    authors:
-      class: "text-center text-secondary"
-      hide: false
-    date:
-      class: "text-center text-secondary"
-      format: ":date_long" # Hugo date format
-      hide: false
-    description:
-      class: "lead text-center"
-      hide: false
-    git:
-      commit_url_prefix: "" # Example is "https://github.com/willfaught/paige/commit/"
     max_width: ""
-    reading_time:
-      class: "text-center text-secondary"
-      hide: false
     section:
       class: "paige-metadata w-100"
-    terms:
-      hide: false
-      inner_class: "badge text-bg-secondary text-decoration-none"
-      outer_class: "text-center"
-    title:
-      class: "display-5 fw-bold text-center"
-      hide: false
+  authors:
+    class: "text-center text-secondary"
+    hide: false
+  description:
+    class: "lead text-center"
+    hide: false
+  git:
+    commit_url_prefix: "" # Example is "https://github.com/willfaught/paige/commit/"
+  reading_time:
+    class: "text-center text-secondary"
+    hide: false
+  terms:
+    hide: false
+    inner_class: "badge text-bg-secondary text-decoration-none"
+    outer_class: "text-center"
+  title:
+    class: "display-5 fw-bold text-center"
+    hide: false
   table_of_contents:
     class: "border mb-3 pe-3 ps-3 pt-3 rounded"
     hide: false

exampleSite/config.yaml

@@ -60,9 +60,15 @@ params:
     will_faught:
       name: "Will Faught"
   paige:
+    authors:
+      hide: true
     credit:
       link:
         hide: true
+    date:
+      hide: true
+    git:
+      commit_url_prefix: "https://github.com/willfaught/paige/commit/"
     list:
       authors:
         hide: true
@@ -76,20 +82,12 @@ params:
         hide: true
       terms:
         hide: true
-    main:
-      metadata:
-        authors:
-          hide: true
-        date:
-          hide: true
-        git:
-          commit_url_prefix: "https://github.com/willfaught/paige/commit/"
-        reading_time:
-          hide: true
-        terms:
-          hide: true
-      table_of_contents:
-        hide: true
+    reading_time:
+      hide: true
+    table_of_contents:
+      hide: true
+    terms:
+      hide: true
 social:
   twitter: "username"
 theme: "paige"

exampleSite/content/_index.md

@@ -8,12 +8,10 @@ paige:
     image:
       stretch: true
       url: landscape.webp
-  main:
-    metadata:
-      reading_time:
-        hide: true
-      title:
-        class: display-1 fw-bold text-center
+  reading_time:
+    hide: true
+  title:
+    class: display-1 fw-bold text-center
   social:
     github:
       bootstrap_icon: github

exampleSite/content/configuration/_index.md

@@ -4,6 +4,10 @@ categories: ["configuration", "paige"]
 date: "2022-02-23"
 description: "Demonstration of the Paige configuration."
 paige:
+  authors:
+    hide: false
+  date:
+    hide: false
   list:
     authors:
       hide: false
@@ -17,18 +21,12 @@ paige:
       hide: false
     terms:
       hide: false
-  main:
-    metadata:
-      authors:
-        hide: false
-      date:
-        hide: false
-      reading_time:
-        hide: false
-      terms:
-        hide: false
-      table_of_contents:
-        hide: false
+  reading_time:
+    hide: false
+  terms:
+    hide: false
+  table_of_contents:
+    hide: false
 tags: ["lists"]
 title: "Configuration"
 ---

exampleSite/content/configuration/hide.md

@@ -4,20 +4,18 @@ categories: ["configuration", "paige"]
 date: "2022-02-23"
 description: "Demonstration of the Paige hide configuration."
 paige:
-  main:
-    metadata:
-      authors:
-        hide: false
-      date:
-        hide: false
-      git:
-        commit_url_prefix: "https://github.com/willfaught/paige/commit/"
-      reading_time:
-        hide: false
-      terms:
-        hide: false
-    table_of_contents:
-      hide: false
+  authors:
+    hide: false
+  date:
+    hide: false
+  git:
+    commit_url_prefix: "https://github.com/willfaught/paige/commit/"
+  reading_time:
+    hide: false
+  table_of_contents:
+    hide: false
+  terms:
+    hide: false
 tags: ["hide", "singles"]
 title: "Hide Configuration"
 weight: 10

exampleSite/content/configuration/style.md

@@ -4,35 +4,33 @@ categories: ["configuration", "paige"]
 date: "2022-02-23"
 description: "Demonstration of the Paige style configuration."
 paige:
-  main:
-    metadata:
-      authors:
-        class: "fst-italic text-center text-secondary"
-        hide: false
-      date:
-        class: "fst-italic text-center text-secondary"
-        hide: false
-      description:
-        class: "fst-italic lead text-center"
-        hide: false
-      git:
-        commit_url_prefix: "https://github.com/willfaught/paige/commit/"
-      reading_time:
-        class: "fst-italic text-center text-secondary"
-        hide: false
-      terms:
-        hide: false
-        inner_class: "badge bg-secondary fst-italic text-decoration-none"
-        outer_class: "text-center"
-      title:
-        class: "display-5 fst-italic fw-bold text-center"
-        hide: false
-    table_of_contents:
-      class: "border fst-italic mb-3 pe-3 ps-3 pt-3 rounded"
-      hide: false
-    content:
-      class: "fst-italic mw-100 paige-content"
-      hide: false
+  authors:
+    class: "fst-italic text-center text-secondary"
+    hide: false
+  content:
+    class: "fst-italic mw-100 paige-content"
+    hide: false
+  date:
+    class: "fst-italic text-center text-secondary"
+    hide: false
+  description:
+    class: "fst-italic lead text-center"
+    hide: false
+  git:
+    commit_url_prefix: "https://github.com/willfaught/paige/commit/"
+  reading_time:
+    class: "fst-italic text-center text-secondary"
+    hide: false
+  table_of_contents:
+    class: "border fst-italic mb-3 pe-3 ps-3 pt-3 rounded"
+    hide: false
+  terms:
+    hide: false
+    inner_class: "badge bg-secondary fst-italic text-decoration-none"
+    outer_class: "text-center"
+  title:
+    class: "display-5 fst-italic fw-bold text-center"
+    hide: false
 tags: ["singles", "style"]
 title: "Style Configuration"
 weight: 20

layouts/partials/paige/metadata.html

@@ -8,29 +8,29 @@
     {{ $listshowcontent = $params.listshowcontent }}
 {{ end }}
 
-{{ $authors := cond ($page.Param "paige.metadata.authors.hide" | not) (partial "paige/authors.html" $page) "" }}
-{{ $authorsclass := $page.Param "paige.metadata.authors.class" | default "paige-authors text-center text-secondary" }}
-{{ $categories := cond ($page.Param "paige.metadata.terms.hide" | not) ($page.Params.categories | default slice) slice | uniq }}
+{{ $authors := cond ($page.Param "paige.authors.hide" | not) (partial "paige/authors.html" $page) "" }}
+{{ $authorsclass := $page.Param "paige.authors.class" | default "paige-authors text-center text-secondary" }}
+{{ $categories := cond ($page.Param "paige.terms.hide" | not) ($page.Params.categories | default slice) slice | uniq }}
 {{ $commiturl := "" }}
-{{ $date := cond ($page.Param "paige.metadata.date.hide" | not) (cond (eq ($page.Param "paige.date" | default "published") "published") $page.PublishDate $page.Lastmod) "" }}
-{{ $dateclass := $page.Param "paige.metadata.date.class" | default "paige-date text-center text-secondary" }}
-{{ $dateformat := $page.Param "paige.metadata.date.format" | default ":date_long" }}
-{{ $description := cond ($page.Param "paige.metadata.description.hide" | not) ($page.Description | markdownify) "" }}
-{{ $descriptionclass := $page.Param "paige.metadata.description.class" | default "lead paige-description text-center" }}
+{{ $date := cond ($page.Param "paige.date.hide" | not) (cond (eq ($page.Param "paige.date.source" | default "published") "published") $page.PublishDate $page.Lastmod) "" }}
+{{ $dateclass := $page.Param "paige.date.class" | default "paige-date text-center text-secondary" }}
+{{ $dateformat := $page.Param "paige.date.format" | default ":date_long" }}
+{{ $description := cond ($page.Param "paige.description.hide" | not) ($page.Description | markdownify) "" }}
+{{ $descriptionclass := $page.Param "paige.description.class" | default "lead paige-description text-center" }}
 {{ $nogap := "mb-0" }}
-{{ $readingtime := cond ($page.Param "paige.metadata.reading_time.hide" | not) $page.ReadingTime "" }}
-{{ $readingtimeclass := $page.Param "paige.metadata.reading_time.class" | default "paige-reading-time text-center text-secondary" }}
+{{ $readingtime := cond ($page.Param "paige.reading_time.hide" | not) $page.ReadingTime "" }}
+{{ $readingtimeclass := $page.Param "paige.reading_time.class" | default "paige-reading-time text-center text-secondary" }}
 {{ $sectionclass := "paige-metadata w-100" }}
-{{ $tags := cond ($page.Param "paige.metadata.terms.hide" | not) ($page.Params.tags | default slice) slice | uniq }}
-{{ $termsinnerclass := $page.Param "paige.metadata.terms.inner_class" | default "badge paige-terms-inner text-bg-secondary text-decoration-none" }}
-{{ $termsouterclass := $page.Param "paige.metadata.terms.outer_class" | default "paige-terms-outer text-center" }}
-{{ $title := cond ($page.Param "paige.metadata.title.hide" | not) ($page.Title | markdownify) "" }}
-{{ $titleclass := $page.Param "paige.metadata.title.class" | default "display-5 fw-bold paige-title text-center" }}
+{{ $tags := cond ($page.Param "paige.terms.hide" | not) ($page.Params.tags | default slice) slice | uniq }}
+{{ $termsinnerclass := $page.Param "paige.terms.inner_class" | default "badge paige-terms-inner text-bg-secondary text-decoration-none" }}
+{{ $termsouterclass := $page.Param "paige.terms.outer_class" | default "paige-terms-outer text-center" }}
+{{ $title := cond ($page.Param "paige.title.hide" | not) ($page.Title | markdownify) "" }}
+{{ $titleclass := $page.Param "paige.title.class" | default "display-5 fw-bold paige-title text-center" }}
 {{ $titlelink := $page.Params.link }}
 {{ $titlepage := $page.RelPermalink }}
 
-{{ if and ($page.Param "paige.metadata.git.commit_url_prefix") $page.GitInfo }}
-    {{ $commiturl = print ($page.Param "paige.metadata.git.commit_url_prefix") $page.GitInfo.Hash }}
+{{ if and ($page.Param "paige.git.commit_url_prefix") $page.GitInfo }}
+    {{ $commiturl = print ($page.Param "paige.git.commit_url_prefix") $page.GitInfo.Hash }}
 {{ end }}
 
 <section {{ with $sectionclass }} class="{{ . }}" {{ end }}>

layouts/partials/paige/pages.html

@@ -49,8 +49,8 @@
                     {{ $titleclass := $page.Param "paige.list.title.class" | default "mb-0 paige-title text-center" }}
                     {{ $titlelink := .RelPermalink }}
 
-                    {{ if and ($page.Param "paige.metadata.git.commit_url_prefix") $page.GitInfo }}
-                        {{ $commiturl = print ($page.Param "paige.metadata.git.commit_url_prefix") $page.GitInfo.Hash }}
+                    {{ if and ($page.Param "paige.git.commit_url_prefix") $page.GitInfo }}
+                        {{ $commiturl = print ($page.Param "paige.git.commit_url_prefix") $page.GitInfo.Hash }}
                     {{ end }}
 
                     {{ if $draft }}