add page-specific copyright years

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

diff --git a/haunt.scm b/haunt.scm
index 5bc9039..7a225a9 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 "


@@ -66,14 +78,17 @@
     (string-append (or prefix "") "/"
                    (site-post-slug site post) ".html"))
 
     (string-append (or prefix "") "/"
                    (site-post-slug site post) ".html"))
 

-  `((h3 ,title)
-    (ul
-     ,@(map (lambda (post)
-              `(li
-                ,(aa (post-ref post 'title) (post-uri post))
-                " — "
-                ,(date->string (post-date post) my-date-format)))
-            posts))))
+  `((h2 ,title)
+    (table
+     (@ (class "post-list"))
+     (tbody
+      ,@(map (lambda (post)
+               `(tr
+                 (td ,(aa (post-ref post 'title) (post-uri post)))
+                 (td (@ (style "font-size: 0.875em;"))
+                     ,(date->string (post-date post)
+                                    my-date-format))))
+             posts)))))

 
 (define bandali-theme
   (theme #:name "bandali"
 
 (define bandali-theme
   (theme #:name "bandali"


@@ -84,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 "


@@ -193,19 +208,22 @@
      (dd "Library and CLI for converting TeX and LaTeX to PNG "
          "images"))
     (h2 (@ (id "notes")) "Notes")
      (dd "Library and CLI for converting TeX and LaTeX to PNG "
          "images"))
     (h2 (@ (id "notes")) "Notes")

+    (p "Here are notes about a variety of topics and issues I care "
+       "about.  They’re also available via " ,(aa "Atom" "feed.atom")
+       " and " ,(aa "RSS" "feed.rss") " feeds.")

     (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 (@ (style "font-size: 0.875em;"))
-             ,(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


@@ -217,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")


@@ -235,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


@@ -300,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


@@ -364,7 +386,47 @@
      (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
+   "SE 212 Material"
+   "se212-f19/index.html"
+   `((h1 "Material from SE 212 tutorials")
+     (p "This page contains slides and other material from "
+        ,(aa "SE 212 tutorials"
+             "https://www.student.cs.uwaterloo.ca/~se212/times.html")
+        " held by me in Fall 2019. "
+        (del "If you have any questions, concerns, or suggestions "
+             "about the presented material, please email me at "
+             "bandali@uwaterloo.ca or come see me during my "
+             ,(aa "Friday office hours"
+                  "https://www.student.cs.uwaterloo.ca/~se212/personnel.html")
+             "."))
+     (ul
+      (li "Tutorial 1:"
+          (ul
+           (li ,(aa "TUT 101 slides" "se212-t01-101.pdf"))
+           (li ,(aa "TUT 102 slides" "se212-t01-102.pdf"))
+           (li ,(aa "Org beamer sources" "se212-t01.org"))))
+      (li "Tutorial 2:"
+          (ul
+           (li ,(aa "Homework 2 q04d solution"
+                    "se212-h02q04d-soln.grg"))))
+      (li "Tutorial 3: —")
+      (li "Tutorial 4: —")
+      (li "Tutorial 5:"
+          (ul
+           (li ,(aa "Slides" "se212-t05.pdf"))
+           (li ,(aa "Org beamer sources" "se212-t05.org"))))
+      (li "Tutorial 6: —")
+      (li "Tutorial 7: worked through questions 1–5 of Homework 7")
+      (li "Tutorial 8: —")
+      (li "Tutorial 9: —")
+      (li "Tutorial 10: worked through questions 1–10 of "
+          "Homework 10")))
+   "2019"))

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


@@ -389,4 +451,5 @@
                        contact-page
                        cv-page
                        license-page
                        contact-page
                        cv-page
                        license-page

+                       se212-f19-page

                        (static-directory "static" "")))
                        (static-directory "static" "")))