simplify title logic

[~bandali/bndl.org] / bandali / theme.scm

diff --git a/bandali/theme.scm b/bandali/theme.scm
index 44c00f6..e2b2375 100644 (file)
--- a/bandali/theme.scm
+++ b/bandali/theme.scm
@@ -64,8 +64,11 @@
            `(tr
              (td ,(aa (post-ref post 'title)
                       (post-uri site post prefix)))
-             (td (small ,(date->string (post-date post)
-                                       my-date-format)))))
+             (td (small (@ (title
+                            ,(date->string (post-date post)
+                                           my-secondary-date-format)))
+                        ,(date->string (post-date post)
+                                       my-primary-date-format)))))
          posts)))))
 
 (define (my-post-template post)
@@ -74,33 +77,31 @@
      (address "By " ,(aa (post-ref post 'author) "/")
               " <" ,(post-ref post 'email) ">")
      (p (@ (class "date"))
-        "Published "
-        ,(date->string (post-date post) my-date-format))
-     ,(if (post-ref post 'updated)
-          `(p (@ (class "updated"))
-              "Updated "
-              ,(date->string (post-ref post 'updated)
-                             my-date-format)) '())
+        (span (@ (title ,(date->string (post-date post)
+                                       my-secondary-date-format)))
+              ,(date->string (post-date post)
+                             my-primary-date-format))
+        ,(if (post-ref post 'updated)
+             `(" (updated on "
+               (span (@ (title
+                         ,(date->string (post-ref post 'updated)
+                                        my-secondary-date-format)))
+                     ,(date->string (post-ref post 'updated)
+                                    my-primary-date-format))
+               ")") '()))
      ,(if (post-ref post 'tags)
           `(p (@ (class "tags"))
-              "Tagged "
               ,@(intersperse
                  (map (lambda (tag)
-                        (aa tag (tag-uri my-tag-prefix tag)))
+                        (aa tag (tag-uri my-tag-prefix tag)
+                            "Notes tagged ‘" tag "’"))
                       (post-ref post 'tags))
                  ", "))
           '()))
     ,(post-sxml post)
     (p (@ (class "muted inbox"))
-       "Have a question or comment?  Start a discussion in my "
-       ,(aa "public inbox" "https://lists.sr.ht/~bandali/public-inbox")
-       " by sending an email to "
-       ,(aa "~bandali/public-inbox@lists.sr.ht"
-            "mailto:~bandali/public-inbox@lists.sr.ht")
-       (small
-        " [" ,(aa "mailing list etiquette"
-                  "https://man.sr.ht/lists.sr.ht/etiquette.md") "]")
-       ".")))
+       "Got a question or comment?  Write to me at my email address "
+       "at the top of this page!")))
 
 (define* (my-collection-template site title posts prefix
                                  #:optional all-posts tag)