Merge branch 'master' into english

[blog.git] / haunt.scm

diff --git a/haunt.scm b/haunt.scm
index 15f7cc39581489ee3a8b40689995d381102faf16..2051f6c80d01aa057a1402732a9fcb7223d550ad 100644 (file)
--- 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"))
@@ -40,13 +49,9 @@
                                    `(li (a (@ (href ,(cdr page))) ,(car page))))
                                  (assoc-ref metadata 'pages))))
                      (ul (@ (class "social"))
-                         (li (a (@ (class "sc-linkedin") (target "_blank") (href "")) (i (@ (class "fa fa-linkedin")))))
-                         " "
-                         (li (a (@ (class "sc-github") (target "_blank") (href "")) (i (@ (class "fa fa-github")))))
+                         (li (a (@ (class "sc-twitter") (target "_blank") (href "https://twitter.com/jsancho_gpl")) (i (@ (class "fa fa-twitter")))))
                          " "
-                         (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 +62,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 +73,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 +93,25 @@
                         (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"
+   `((div
+      (article
+       (header (h2 "About me"))
+       (p "I met GNU/Linux and free software while I was studying Computer Science at " (a (@ (href "http://www.uji.es/")) "Universitat Jaume I") " and, since then, my commitment with these ideas hasn't stopped growing.")
+       (p "It was in 2003 when I started as an activist, participating in events related with free software, demonstrations against software patents, talks and information sessions at install parties, schools, etc.")
+       (p "I enjoy programming and I use the programming language that better fits my needs (Python, PHP, Golang, Erlang, ...). For many years my favorite language was C, although over time that privileged place has been occupied by Lisp y Scheme. I'm in love with the functional paradigm.")
+       (p "I'm married with a wonderful woman and we have a kid that amaze us every day. They are the best of my life."))))))
+
 (define %collections
   `(("Home" "index.html" ,posts/reverse-chronological)))
 
@@ -104,13 +121,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")))