From 2545016f8d6b63b0d857fc20fdd7276d2f0fc2a9 Mon Sep 17 00:00:00 2001
From: Zach Berwaldt <zberwaldt@tutamail.com>
Date: Thu, 12 Oct 2023 23:40:26 -0400
Subject: Layout refinements. add config, disclaimer

---
 layouts/_default/list.html       | 19 ++----------
 layouts/_default/summary.html    | 18 +++++------
 layouts/book/list.html           | 54 ++++++++++++++++-----------------
 layouts/partials/disclaimer.html |  2 ++
 layouts/partials/footer.html     | 64 ++++++++++++++--------------------------
 layouts/post/single.html         |  5 +++-
 6 files changed, 64 insertions(+), 98 deletions(-)
 create mode 100644 layouts/partials/disclaimer.html

(limited to 'layouts')

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 065f708..7a26339 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,26 +1,11 @@
 {{ define "main" }}
-    <h1>{{ .Title }}</h1>
+    <h1>{{ .Title | title }}</h1>
     {{ if .Content }}
         <p>{{ .Content }}</p>
     {{ end }}
     <section>
-        {{ range sort (.Paginator 3).Pages "Date" "desc" }}
+        {{ range sort .Pages "Date" "desc" }}
         <div>{{ .Render "summary" }}</div>
         {{ end }}
-        {{ with .Paginator }}
-        <div class="grid">
-            <div class='flex'>
-            {{ if .HasPrev }}
-                <a href="{{ .Prev.URL }}">prev</a>
-            {{ end }}
-            {{ if (or (.HasPrev) (.HasNext)) }}
-                <p>{{ .PageNumber }} of {{ .TotalPages }}</p>
-            {{ end }}
-            {{ if .HasNext }}
-                <a href="{{ .Next.URL }}">next</a>
-            {{ end }}
-            </div>
-        </div>
-        {{ end }}
     </section>
 {{ end }}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 4512b16..48c7b97 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -1,19 +1,17 @@
-<div class='post' style="margin-bottom: 2em;">
-  <div>
-    <h1 class="f3 near-black">
+<section>
+  <hgroup>
+    <h3 class="f3 near-black">
       <a href="{{ .RelPermalink }}" class="link black dim">
         {{ .Title }}
       </a>
       {{ if isset .Params "rating" }}
         {{ .Params.rating }}
       {{ end }}
-    </h1>
+    </h3>
+    <p>{{ .Date | time.Format ":date_full" }}</p>
     <p>
-      <span>{{ .WordCount }} words</span>
       <span>{{ .ReadingTime }} min read</span>
     </p>
-    <p>Published: {{ .Date | time.Format ":date_full" }}
-    </p>
-    <div>{{ .Summary | markdownify }}</div>
-  </div>
-</div>
+  </hgroup>
+  <div>{{ .Summary | markdownify }}</div>
+</section>
diff --git a/layouts/book/list.html b/layouts/book/list.html
index 346a918..d1d1263 100644
--- a/layouts/book/list.html
+++ b/layouts/book/list.html
@@ -1,33 +1,31 @@
 {{ define "main" }}
-  <article>
-    <h1>{{ .Title }}</h1>
-    {{ if .Content }}
-      <p>{{- .Content -}}</p>
-    {{ end }}
-    <section>
-      {{ if .IsSection }}
-        {{ range sort (.Paginator 3).Pages "Date" "desc" }}
-          {{ if ne .Layout "list" }}
-            <div>{{ .Render "summary" }}</div>
-          {{ end }}
-        {{ end }}
-      {{ else }}
-        {{ $metric := .Params.sortby }}
-        {{ $direction := "asc" }}
-        {{ if eq .Params.sortby "rating" }}
-          {{ $direction = "desc" }}
-        {{ end }}
-        {{ $pages := (where .Site.RegularPages "Type" "book") }}
-        {{ $pages = (where $pages "Layout" "!=" "list")}}
-        {{ if eq $direction "desc" }}
-          {{ $pages = (sort ($pages.ByParam $metric).Reverse) }}
-        {{ else }}
-          {{ $pages = (sort ($pages.ByParam $metric)) }}
-        {{ end }}
-        {{ range $pages }}
+  <h1>{{ .Title }}</h1>
+  {{ if .Content }}
+    <p>{{- .Content -}}</p>
+  {{ end }}
+  <section>
+    {{ if .IsSection }}
+      {{ range sort (.Paginator 3).Pages "Date" "desc" }}
+        {{ if ne .Layout "list" }}
           <div>{{ .Render "summary" }}</div>
         {{ end }}
       {{ end }}
-    </section>
-  </article>
+    {{ else }}
+      {{ $metric := .Params.sortby }}
+      {{ $direction := "asc" }}
+      {{ if eq .Params.sortby "rating" }}
+        {{ $direction = "desc" }}
+      {{ end }}
+      {{ $pages := (where .Site.RegularPages "Type" "book") }}
+      {{ $pages = (where $pages "Layout" "!=" "list")}}
+      {{ if eq $direction "desc" }}
+        {{ $pages = (sort ($pages.ByParam $metric).Reverse) }}
+      {{ else }}
+        {{ $pages = (sort ($pages.ByParam $metric)) }}
+      {{ end }}
+      {{ range $pages }}
+        <div>{{ .Render "summary" }}</div>
+      {{ end }}
+    {{ end }}
+  </section>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/disclaimer.html b/layouts/partials/disclaimer.html
new file mode 100644
index 0000000..7cac018
--- /dev/null
+++ b/layouts/partials/disclaimer.html
@@ -0,0 +1,2 @@
+{{ $disclaimer := .Site.GetPage "/disclaimer.md" }}
+{{ $disclaimer.Content }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 3800b98..171d3ba 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,55 +1,35 @@
 <footer>
   <div class="container">
-    <h3>{{ .Site.Title }}</h3>
-    <div class="grid">
-      <div class="flex col">
-        <section>
-          <h4>Contact Info</h4>
-          <p>Phone: {{ .Site.Params.phone }}</p>
-          <p>Email: {{ .Site.Params.email }}</p>
-        </section>        
-        <section>
+    <div class="flex row space-between">
+      <hgroup>
+        <h3>{{ .Site.Title | upper }}</h3>
+        <p>{{ .Site.Params.description }}</p>
+        <div>
           <h4>Connect</h4>
           <ul>
             {{ range $key, $value := .Site.Social }}
-              <li>
-                {{ partial "social.html" (dict "social" $key "username" $value) }}
-              </li>
+            <li>
+              {{ partial "social.html" (dict "social" $key "username" $value) }}
+            </li>
             {{ end }}
           </ul>
-        </section>
-      </div>
-      {{ with .Site.Params.friends }}
-      <div class="friends-list">
-        <h3>Friends</h3>
+        </div>
+      </hgroup>
+      <div class="flex col align-end">
+        <h4>Get Around</h4>
         <ul>
-          {{ range . }}
-            <li>
-              <a href="{{ .url }}" target="_blank">
-                {{ if isset . "icon" }}
-                  <img src="{{ .icon }}" alt="{{ .name }}" />
-                {{ else }}
-                  {{ .name }}
-                {{ end }}
-              </a>
-            </li>
+          {{ range .Site.Menus.main }}
+          <li><a href="{{ .URL }}">{{ .Name }}</a></li>
           {{ end }}
         </ul>
       </div>
-      {{ end }}
-        <section>
-          <h4>Navigation</h4>
-          <ul>
-            {{ range .Site.Menus.main }}
-              <li><a href="{{ .URL }}">{{ .Name }}</a></li>
-            {{ end }}
-          </ul>
-        </section>
+    </div>
+    <div class="flex row space-between">
+      <div>Powered by <a href="https://gohugo.io">Hugo</a> &amp; Blackbear (v{{.Site.Params.themeVersion }})</div>
+      <div>
+        <span title="site version">v{{.Site.Params.siteVersion}}</span>
       </div>
+      <div>&copy; Copyright {{ now.Format "2006" }} | All Rights Reserved</div>
+    </div>
   </div>
-  <div class="poweredby">
-      Powered by <a href="https://gohugo.io">Hugo</a> &amp; Blackbear
-  </div>
-  <div class="copyright">&copy; Copyright {{ now.Format "2006" }} | All Rights Reserved
-  </div>
-</footer>
+</footer>
\ No newline at end of file
diff --git a/layouts/post/single.html b/layouts/post/single.html
index 166ecd6..25bfc23 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -1,10 +1,13 @@
 {{ define "main" }}
+    {{ if not .Params.dontDisclaim }}
+        {{ partial "disclaimer" . }}
+    {{ end }}
     <hgroup>
         <h1>{{ .Title }}</h1>
         <h6>{{ .Date | time.Format ":date_full" }}</h6>
+        <h6>{{ .Lastmod | time.Format ":date_full" }}</h6>
     </hgroup>
     <section class="content">
         {{- .Content -}}
     </section>
-</article>
 {{ end }}
-- 
cgit v1.1