Changeset 20543 in project

Timestamp:

09/27/10 17:12:27 (11 years ago)

Author:

Moritz Heidkamp

Message:

gazette: add dates and authors to archive and reverse its ordering; fix a bug in the default-page-vars regexp for issue layouts

Location:

gazette

Files:

• hyde.scm (modified) (2 diffs)
• layouts/article.sxml (modified) (1 diff)
• src/archive.sxml (modified) (1 diff)
• src/gazette.scss (modified) (1 diff)

gazette/hyde.scm

@@ -1 +1 @@
 (use hyde hyde-atom environments)
 
-(default-page-vars '(((: bos "issues/" (+ any) ".wiki") 
+(default-page-vars '(((: bos "/issues/" (+ any) ".html")
                       (layouts "article.sxml" "default.sxml"))))
 
@@ -19 +19 @@
   (time->string (seconds->utc-time seconds) "%Y-%m-%d %z"))
 
+(define (authors->sxml authors)
+  `(,(car authors)
+    ,@(if (null? (cdr authors)) 
+          '()
+          (map (lambda (author)
+                 `(,(car author) (span (@ (class "author")) ,(cdr author))))
+               (append (map (cut cons ", " <>) (butlast (cdr authors)))
+                       `((" and " . ,(last authors))))))))
+
 (for-each (lambda (binding)
             (apply environment-extend! (cons (page-eval-env) binding)))
           `((page-updated ,page-updated)
             (format-seconds ,format-seconds)
+            (authors->sxml ,authors->sxml)
             (all-issues ,(lambda () 
                            (sort-by (pages-matching "issues/.+") page-updated)))))

gazette/layouts/article.sxml

@@ -1 +1 @@
 ()
 `((h1 ,($ 'title))
-
   (div (@ (class "article-meta"))
-       (p (@ (class "authors")) 
-          "by "
-          ,(car ($ 'authors))
-          ,@(if (null? (cdr ($ 'authors))) 
-                '()
-                (map (lambda (author)
-                       `(,(car author) (span (@ (class "author")) ,(cdr author))))
-                     (append (map (cut cons ", " <>) (butlast (cdr ($ 'authors))))
-                             `((" and " . ,(last ($ 'authors))))))))
-       (p  (@ (class "date")) ,(format-seconds ($ 'date))))
+       (p (@ (class "authors")) "by " ,(authors->sxml ($ 'authors)))
+       (p (@ (class "date")) ,(format-seconds ($ 'date))))
 
   (inject ,contents)

gazette/src/archive.sxml

@@ -1 +1 @@
 ((title . "Archive"))
 `(h1 ,($ 'title))
-`(dl ,(map (lambda (issue)
-             `((dt (a (@ (href ,(page-path issue))) ,($ 'title issue)))
-               (dd ,(format-seconds ($ 'date issue)))))
-           (reverse (all-issues))))
+`(dl (@ (id "archive"))
+     ,(map (lambda (issue)
+             `((dt (a (@ (href ,(page-path issue))) ,($ 'title issue))
+                   " "
+                   (span (@ (class "date")) ,(format-seconds ($ 'date issue))))
+               (dd (@ (class "authors"))
+                   "by " ,(authors->sxml ($ 'authors issue)))))
+           (all-issues)))

gazette/src/gazette.scss

@@ -21 +21 @@
     (margin-bottom "7em"))
 
+   ((// |#archive|)
+    ((// .date)
+     (font-weight "normal")
+     (margin-top ".5em")))
+
    ((// ul.links)
     (text-align "right")