From: Javier Sancho Date: Tue, 13 Feb 2018 11:31:17 +0000 (+0100) Subject: Merge branch 'master' into spanish X-Git-Url: https://git.jsancho.org/?p=blog.git;a=commitdiff_plain;h=8003b14f44b06527b6c5f1d77650c2edc7af55e9 Merge branch 'master' into spanish --- 8003b14f44b06527b6c5f1d77650c2edc7af55e9 diff --cc haunt.scm index 6cdaae9,96838c4..668551a --- a/haunt.scm +++ b/haunt.scm @@@ -92,16 -96,15 +96,15 @@@ `( ,@(map (lambda (post) - `(article - (header - (h2 - (a (@ (href ,(post-uri post))) - ,(post-ref post 'title))) - (p "Publicado el " ,(date->string (post-date post) "~d/~m/~Y"))) - (div ,(post-summary post) - (br) - (a (@ (class "btn") (href ,(post-uri post))) " Seguir leyendo ")) - (hr))) + `(article (@ (class "inline")) + (header + (h2 (@ (class "title")) + (a (@ (href ,(post-uri post))) + ,(post-ref post 'title))) + ,(post-date-and-tags (post-date post) (get-tags post))) + ,(post-summary post) + (footer (@ (class "read-more")) - (a (@ (href ,(post-uri post))) "...read more...")))) ++ (a (@ (href ,(post-uri post))) "...seguir leyendo...")))) (posts/reverse-chronological posts)))))) (define about-page @@@ -121,14 -118,13 +124,14 @@@ (site #:title "Javier Sancho" #:domain "jsancho.org" + #:build-directory "site-spanish" #:default-metadata '((author . "Javier Sancho") - (description . "Free Software Evangelist - Programmer") + (description . "Evangelizador del software libre - Programador") (email . "jsf@jsancho.org") (picture . "images/jsancho.jpg") - (pages . (("sobre mi" . "about.html") - ("proyectos" . "http://git.jsancho.org/")))) - (pages . (("projects" . "http://git.jsancho.org/") - ("about me" . "about.html")))) ++ (pages . (("proyectos" . "http://git.jsancho.org/") ++ ("sobre mi" . "about.html")))) #:readers (list sxml-reader html-reader) #:builders (list (blog #:theme flex-theme #:collections %collections) (atom-feed)