From: Javier Sancho <jsf@jsancho.org>
Date: Mon, 12 Feb 2018 15:54:06 +0000 (+0100)
Subject: Posts with new style
X-Git-Url: https://git.jsancho.org/?p=blog.git;a=commitdiff_plain;h=4847e2c26207bfcf6a0a453782550966ce7b1827;ds=inline

Posts with new style
---

diff --git a/haunt.scm b/haunt.scm
index 82f6f7f..70247b9 100644
--- a/haunt.scm
+++ b/haunt.scm
@@ -24,6 +24,21 @@
 (define (get-tags post)
   (or (assoc-ref (post-metadata post) 'tags) '()))
 
+(define (post-date-and-tags date tags)
+  (let ((div `(div (@ (class "date-and-tags"))
+		   (time (@ (datetime ,(date->string date "~Y-~m-~dT~H:~M:~S")))
+			 ,(date->string date "~Y-~m-~d")))))
+    (cond ((> (length tags) 0)
+	   (append div
+		   `(" "
+		     (span (@ (style "margin: 0 3px")) ⦿)
+		     (span (@ (class "tags"))
+			   ,@(map (lambda (tag)
+				    `((a (@ (href ,(format #f "tags/~a.html" tag))) ,tag) " "))
+				  tags)))))
+	  (else
+	   div))))
+
 (define flex-theme
   (theme #:name "Flex"
          #:layout
@@ -56,16 +71,11 @@
 
 	 #:post-template
 	 (lambda (post)
-	   `((article (@ (class "single"))
+	   `((article (@ (class "inline"))
 		      (header
-		       (h1 ,(post-ref post 'title))
-		       (p "Posted on " ,(date->string (post-date post) "~B ~d, ~Y")))
-		      ,(post-sxml post)
-		      (div (@ (class "tag-cloud"))
-			   (p
-			    ,@(map (lambda (tag)
-				     `((a (@ (href "")) ,tag) " "))
-				   (get-tags post)))))))
+		       (h1 (@ (class "title")) ,(post-ref post 'title))
+		       ,(post-date-and-tags (post-date post) (get-tags post)))
+		      ,(post-sxml post))))
 
          #:collection-template
          (lambda (site title posts prefix)
@@ -90,20 +100,10 @@
 				 (h2 (@ (class "title"))
 				     (a (@ (href ,(post-uri post)))
 					,(post-ref post 'title)))
-				 (div (@ (class "date-and-tags"))
-				      (time (@ (datetime ,(date->string (post-date post) "~Y-~m-~dT~H:~M:~S")))
-					    ,(date->string (post-date post) "~Y-~m-~d"))
-				      " "
-				      ,(let ((tags (get-tags post)))
-					 (cond ((= (length tags) 0)
-						`(span (@ (style "margin: 0 3px")) ⦿)
-						`(span (@ (class "tags"))
-						      ,@(map (lambda (tag)
-							       `((a (@ (href (format #f "tags/~a.html" ,tag))) ,tag) " "))
-							     tags)))))))
+				 ,(post-date-and-tags (post-date post) (get-tags post)))
 				,(post-summary post)
 				(footer (@ (class "read-more"))
-					   (a (@ (href ,(post-uri post))) "...more..."))))
+					   (a (@ (href ,(post-uri post))) "...read more..."))))
 		    (posts/reverse-chronological posts))))))
 
 (define about-page