X-Git-Url: https://git.jsancho.org/?p=blog.git;a=blobdiff_plain;f=haunt.scm;h=30885d25cbb445476fe89b863a0ff9dda2b011da;hp=15f7cc39581489ee3a8b40689995d381102faf16;hb=be959e462ef7f0eb363c0e1f1501f559f8bc1080;hpb=1566b5771b9caeb6dcd637f2ede3f5eb8ae1bb3b

diff --git a/haunt.scm b/haunt.scm
index 15f7cc3..30885d2 100644
--- a/haunt.scm
+++ b/haunt.scm
@@ -2,15 +2,24 @@
              (haunt builder blog)
              (haunt builder atom)
              (haunt builder assets)
+	     (haunt html)
+	     (haunt page)
              (haunt reader)
              (haunt reader texinfo)
              (haunt site)
              (haunt post)
-             (srfi srfi-1))
+             (srfi srfi-1)
+             (srfi srfi-19))
 
 (define (stylesheet name)
   `(link (@ (rel "stylesheet")
-            (href ,(string-append "/css/" name ".css")))))
+            (href ,(string-append "css/" name ".css")))))
+
+(define (static-page title file-name body)
+  (lambda (site posts)
+    (make-page file-name
+	       (with-layout flex-theme site title body)
+	       sxml->html)))
 
 (define flex-theme
   (theme #:name "Flex"
@@ -31,8 +40,8 @@
                ,(let ((metadata (site-default-metadata site)))
                   `(aside
                     (div
-                     (a (@ (href "/")) (img (@ (src ,(assoc-ref metadata 'picture)))))
-                     (h1 (a (@ (href "/")) ,(assoc-ref metadata 'author)))
+                     (a (@ (href "index.html")) (img (@ (src ,(assoc-ref metadata 'picture)))))
+                     (h1 (a (@ (href "index.html")) ,(assoc-ref metadata 'author)))
                      (p ,(assoc-ref metadata 'description))
                      (nav
                       (ul (@ (class "list"))
@@ -46,7 +55,7 @@
                          " "
                          (li (a (@ (class "sc-twitter") (target "_blank") (href "")) (i (@ (class "fa fa-twitter")))))
                          " "
-                         (li (a (@ (class "sc-rss") (target "_blank") (href "/feed.xml")) (i (@ (class "fa fa-rss")))))))))
+                         (li (a (@ (class "sc-rss") (target "_blank") (href "feed.xml")) (i (@ (class "fa fa-rss")))))))))
                (main ,body)))))
 
 	 #:post-template
@@ -57,7 +66,7 @@
 	   `((article (@ (class "single"))
 		      (header
 		       (h1 ,(post-ref post 'title))
-		       (p ,(date->string* (post-date post))))
+		       (p "Posted on " ,(date->string (post-date post) "~B ~d, ~Y")))
 		      ,(post-sxml post)
 		      (div (@ (class "tag-cloud"))
 			   (p
@@ -68,7 +77,7 @@
          #:collection-template
          (lambda (site title posts prefix)
            (define (post-uri post)
-             (string-append "/" (or prefix "")
+             (string-append (or prefix "")
                             (site-post-slug site post) ".html"))
 
 	   (define (get-paragraphs sxml count)
@@ -88,13 +97,19 @@
 			 (h2
 			  (a (@ (href ,(post-uri post)))
 			     ,(post-ref post 'title)))
-			 (p ,(date->string* (post-date post))))
+			 (p "Posted on " ,(date->string (post-date post) "~B ~d, ~Y")))
 			(div ,(post-summary post)
 			     (br)
-			     (a (@ (class "btn") (href ,(post-uri post))) " Seguir leyendo "))
+			     (a (@ (class "btn") (href ,(post-uri post))) " Continue reading "))
 			(hr)))
 		    (posts/reverse-chronological posts))))))
 
+(define about-page
+  (static-page
+   "About me"
+   "about.html"
+   `((h2 "hi."))))
+
 (define %collections
   `(("Home" "index.html" ,posts/reverse-chronological)))
 
@@ -104,13 +119,14 @@
       '((author . "Javier Sancho")
         (description . "Free Software Evangelist - Programmer")
         (email . "jsf@jsancho.org")
-        (picture . "/images/jsancho.jpg")
-        (pages . (("sobre mi" . "about.html")
-                  ("proyectos" . "http://git.jsancho.org/"))))
+        (picture . "images/jsancho.jpg")
+        (pages . (("about" . "about.html")
+                  ("projects" . "http://git.jsancho.org/"))))
       #:readers (list sxml-reader html-reader)
       #:builders (list (blog #:theme flex-theme #:collections %collections)
                        (atom-feed)
                        (atom-feeds-by-tag)
+		       about-page
                        (static-directory "images")
                        (static-directory "fonts")
                        (static-directory "css")))