add post-specific copyright years

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

diff --git a/haunt.scm b/haunt.scm
index dbb34c1..30293b1 100644 (file)
--- a/haunt.scm
+++ b/haunt.scm
@@ -17,6 +17,8 @@
 (define my-url
   (string-append (symbol->string my-scheme) "://" my-domain))
 
 (define my-url
   (string-append (symbol->string my-scheme) "://" my-domain))
 

+(define my-date-format "~B ~e, ~Y")
+

 (define (stylesheet name)
   `(link (@ (rel "stylesheet")
             (href ,(string-append "/" name ".css")))))
 (define (stylesheet name)
   `(link (@ (rel "stylesheet")
             (href ,(string-append "/" name ".css")))))


@@ -24,7 +26,7 @@
 (define* (aa content #:optional (uri content) . title)
   `(a (@ (href ,uri) (title ,(apply string-append title))) ,content))
 
 (define* (aa content #:optional (uri content) . title)
   `(a (@ (href ,uri) (title ,(apply string-append title))) ,content))
 

-(define* (base-layout site body #:key title)
+(define* (base-layout site body #:key title copy license-page?)

   `((doctype "html")
     (html
      (head
   `((doctype "html")
     (html
      (head


@@ -36,11 +38,15 @@
      (body
       (main ,body)
       (footer
      (body
       (main ,body)
       (footer

-       (p
-        "Copyright 2016–2019 Amin Bandali.  See " ,(aa "license.html")
-        " for license conditions. Please copy and share."))))))
+       (p "Copyright © "
+          ,(if copy copy "2016–2019")
+          " Amin Bandali.  See "
+          ,(if license-page? "the above"
+               (aa "license.html" "/license.html"))
+          " for license conditions.  Please copy and share."))))))
+

 
 

-(define my-date-format "~B ~d, ~Y")
+(register-metadata-parser! 'updated string->date*)

 
 (define (my-post-template post)
   `((header
 
 (define (my-post-template post)
   `((header


@@ -48,7 +54,13 @@
      (address "By " ,(aa (post-ref post 'author) "/")
               " <" ,(post-ref post 'email) ">")
      (p (@ (class "date"))
      (address "By " ,(aa (post-ref post 'author) "/")
               " <" ,(post-ref post 'email) ">")
      (p (@ (class "date"))

-        ,(date->string (post-date post) my-date-format)))
+        "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)) ""))

     ,(post-sxml post)
     (p (@ (class "muted inbox"))
        "Have a question or comment?  Start a discussion in my "
     ,(post-sxml post)
     (p (@ (class "muted inbox"))
        "Have a question or comment?  Start a discussion in my "


@@ -74,7 +86,8 @@
                `(tr
                  (td ,(aa (post-ref post 'title) (post-uri post)))
                  (td (@ (style "font-size: 0.875em;"))
                `(tr
                  (td ,(aa (post-ref post 'title) (post-uri post)))
                  (td (@ (style "font-size: 0.875em;"))

-                     ,(date->string (post-date post) my-date-format))))
+                     ,(date->string (post-date post)
+                                    my-date-format))))

              posts)))))
 
 (define bandali-theme
              posts)))))
 
 (define bandali-theme


@@ -86,15 +99,15 @@
          #:post-template my-post-template
          #:collection-template my-collection-template))
 
          #:post-template my-post-template
          #:collection-template my-collection-template))
 

-(define (static-page title file-name body)
+(define* (static-page title file-name body copy #:key license?)

   (lambda (site posts)
     (make-page file-name
   (lambda (site posts)
     (make-page file-name

-               (with-layout bandali-theme site title body)
+               (base-layout site body #:title title #:copy copy
+                            #:license-page? license?)

                sxml->html)))
 
 (define (index-material site posts)
                sxml->html)))
 
 (define (index-material site posts)

-  `(div
-    (h1 (@ (style "font-size: 0;"))
+  `((h1 (@ (style "font-size: 0;"))

         "Amin Bandali")
     (p (@ (style "margin-top: 0;"))
        "Hi, I’m "
         "Amin Bandali")
     (p (@ (style "margin-top: 0;"))
        "Hi, I’m "


@@ -201,16 +214,16 @@
     (table
      (@ (class "post-list"))
      (tbody
     (table
      (@ (class "post-list"))
      (tbody

-     ,@(map
-        (lambda (post)
-          (define (post-uri post)
-            (string-append "/"
-                           (site-post-slug site post) ".html"))
-          `(tr
-            (td ,(aa (post-ref post 'title) (post-uri post)))
-            (td (small
-                 ,(date->string (post-date post) my-date-format)))))
-        (take-up-to 10 (posts/reverse-chronological posts)))))))
+      ,@(map
+         (lambda (post)
+           (define (post-uri post)
+             (string-append "/"
+                            (site-post-slug site post) ".html"))
+           `(tr
+             (td ,(aa (post-ref post 'title) (post-uri post)))
+             (td (small
+                  ,(date->string (post-date post) my-date-format)))))
+         (take-up-to 10 (posts/reverse-chronological posts)))))))

 
 (define (index-page site posts)
   (make-page
 
 (define (index-page site posts)
   (make-page


@@ -222,7 +235,8 @@
   (static-page
    "Licensing Information"
    "license.html"
   (static-page
    "Licensing Information"
    "license.html"

-   `((h1 "License information for " ,my-domain)
+   `((h1 "License information for "
+         ,(aa my-domain my-url))

      (p "I strongly believe in "
         ,(aa "free culture"
              "https://questioncopyright.org/what_is_free_culture")
      (p "I strongly believe in "
         ,(aa "free culture"
              "https://questioncopyright.org/what_is_free_culture")


@@ -240,7 +254,9 @@
       (li ,(aa "Various Licenses and Comments about Them"
                "https://www.gnu.org/licenses/license-list.html"))
       (li ,(aa "Proprietary Software Is Often Malware"
       (li ,(aa "Various Licenses and Comments about Them"
                "https://www.gnu.org/licenses/license-list.html"))
       (li ,(aa "Proprietary Software Is Often Malware"

-               "https://www.gnu.org/proprietary/proprietary.html"))))))
+               "https://www.gnu.org/proprietary/proprietary.html"))))
+      "2019"
+      #:license? #t))

 
 (define contact-page
   (static-page
 
 (define contact-page
   (static-page


@@ -305,7 +321,8 @@
       (li (del ,(aa "bandali0" "https://github.com/bandali0")
                " on GitHub"))
       (li (del ,(aa "bandali0" "https://twitter.com/bandali0")
       (li (del ,(aa "bandali0" "https://github.com/bandali0")
                " on GitHub"))
       (li (del ,(aa "bandali0" "https://twitter.com/bandali0")

-               " on Twitter"))))))
+               " on Twitter"))))
+   "2019"))

 
 (define cv-page
   (static-page
 
 (define cv-page
   (static-page


@@ -369,7 +386,8 @@
      (p "Teaching Assistant")
      (p (abbr (@ (title "Net-Centric Introduction to Computing"))
               "EECS 1012")
      (p "Teaching Assistant")
      (p (abbr (@ (title "Net-Centric Introduction to Computing"))
               "EECS 1012")

-        ": TA in Fall 2017"))))
+        ": TA in Fall 2017"))
+   "2019"))

 
 (define se212-f19-page
   (static-page
 
 (define se212-f19-page
   (static-page


@@ -407,7 +425,17 @@
       (li "Tutorial 8: —")
       (li "Tutorial 9: —")
       (li "Tutorial 10: worked through questions 1–10 of "
       (li "Tutorial 8: —")
       (li "Tutorial 9: —")
       (li "Tutorial 10: worked through questions 1–10 of "

-          "Homework 10")))))
+          "Homework 10")))
+   "2019"))
+
+(module-define!
+ (resolve-module '(haunt builder blog))
+ 'render-post
+ (lambda (theme site post)
+   (let ((title (post-ref post 'title))
+         (body ((theme-post-template theme) post))
+         (copy (post-ref post 'copyright)))
+     (base-layout site body #:title title #:copy copy))))

 
 (site #:title "Amin Bandali"
       ;; TODO: uncomment after new haunt release
 
 (site #:title "Amin Bandali"
       ;; TODO: uncomment after new haunt release