From cfff0eef996c14198888ad9b58ab1e2d2c058b80 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 6 Dec 2019 07:13:18 -0500 Subject: [PATCH] implement tag pages thanks to rekado and jakob svg feed icon under gplv2+ from https://en.wikipedia.org/wiki/File:Feed-icon.svg --- haunt.scm | 98 ++++++++++++++++++++++++++++++++++++++++++++----- static/feed.svg | 18 +++++++++ 2 files changed, 106 insertions(+), 10 deletions(-) create mode 100644 static/feed.svg diff --git a/haunt.scm b/haunt.scm index 30293b1..03af1aa 100644 --- a/haunt.scm +++ b/haunt.scm @@ -16,7 +16,7 @@ (define my-domain "bandali.eu.org") (define my-url (string-append (symbol->string my-scheme) "://" my-domain)) - +(define my-tag-prefix "tags") (define my-date-format "~B ~e, ~Y") (define (stylesheet name) @@ -45,9 +45,64 @@ (aa "license.html" "/license.html")) " for license conditions. Please copy and share.")))))) +(define* (tag-uri prefix tag #:optional (ext ".html")) + "Return a URI relative to the site's root for a page listing entries +in PREFIX that are tagged with TAG." + (string-append "/" my-tag-prefix "/" tag ext)) + +(define* (tag-pages #:key + (theme bandali-theme) + (prefix "") + (filter posts/reverse-chronological)) + "Return a builder procedure that renders a list page for every tag +used in a post. All arguments are optional: + +PREFIX: The directory in which to write the posts +FILTER: The procedure called to manipulate the posts list before rendering" + (lambda (site posts) + (define (tag-list tag posts all-posts) + (define (render-list title posts prefix) + (let ((body ((theme-collection-template theme) + site title posts prefix all-posts tag))) + ((theme-layout theme) site title body))) + (make-page (tag-uri my-tag-prefix tag) + (render-list (string-append "Notes tagged ‘" tag "’") + (filter posts) + prefix) + sxml->html)) + (let ((tag-groups (posts/group-by-tag posts))) + (map (match-lambda + ((tag . tagged-posts) (tag-list tag tagged-posts posts))) + tag-groups)))) + +(define (tag-links posts) + "Generate an alphabetically sorted list of links to tagged posts. +The link text consists of the tag name and the number of tagged posts +in parentheses." + `(ul (@ (class "tag-list")) + ,(map (match-lambda + ((tag . posts) + `(li + ,(aa (string-append tag + " (" + (number->string (length posts)) + ")") + (tag-uri my-tag-prefix tag))))) + ;; sort by tag + (sort (posts/group-by-tag posts) + (lambda (a b) (stringdate*) +(define (intersperse lst delim) + "Return the elements of LST delimited by DELIM, such that the +resulting list is of an odd length and every second element is DELIM." + (if (<= (length lst) 1) + lst + (cons* (car lst) + delim + (intersperse (cdr lst) delim)))) + (define (my-post-template post) `((header (h1 ,(post-ref post 'title)) @@ -60,7 +115,16 @@ `(p (@ (class "updated")) "Updated " ,(date->string (post-ref post 'updated) - my-date-format)) "")) + my-date-format)) '()) + ,(if (post-ref post 'tags) + `(p (@ (class "tags")) + "Tagged " + ,@(intersperse + (map (lambda (tag) + (aa tag (tag-uri my-tag-prefix tag))) + (post-ref post 'tags)) + ", ")) + '())) ,(post-sxml post) (p (@ (class "muted inbox")) "Have a question or comment? Start a discussion in my " @@ -73,12 +137,19 @@ "https://man.sr.ht/lists.sr.ht/etiquette.md") "]") "."))) -(define (my-collection-template site title posts prefix) +(define* (my-collection-template site title posts prefix + #:optional all-posts tag) (define (post-uri post) (string-append (or prefix "") "/" (site-post-slug site post) ".html")) - `((h2 ,title) + `((h2 ,title + ,(if tag + (aa `(img (@ (class "feed-icon") + (src "/feed.svg") + (alt "subscribe to atom feed"))) + (tag-uri my-tag-prefix tag ".xml")) + '())) (table (@ (class "post-list")) (tbody @@ -88,7 +159,13 @@ (td (@ (style "font-size: 0.875em;")) ,(date->string (post-date post) my-date-format)))) - posts))))) + posts))) + (h2 "Tags") + ,(tag-links (or all-posts posts)) + ,(if tag + '(a (@ (href "/notes.html")) + "← all posts") + '()))) (define bandali-theme (theme #:name "bandali" @@ -209,8 +286,8 @@ "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.") + "about. They’re also available via " ,(aa "Atom" "notes.atom") + " and " ,(aa "RSS" "notes.rss") " feeds.") (table (@ (class "post-list")) (tbody @@ -450,13 +527,14 @@ #:collections `(("Notes" "notes.html" ,posts/reverse-chronological))) + (tag-pages) index-page (atom-feed - #:file-name "feed.atom") + #:file-name "notes.atom") (atom-feeds-by-tag - #:prefix "tags") + #:prefix my-tag-prefix) (rss-feed - #:file-name "feed.rss") + #:file-name "notes.rss") contact-page cv-page license-page diff --git a/static/feed.svg b/static/feed.svg new file mode 100644 index 0000000..4efd2ef --- /dev/null +++ b/static/feed.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + -- 2.20.1