01/01: website: Fix missing HTML document type declaration (see bug #24981)

[Luis Felipe López Acevedo]

felipelopez pushed a commit to branch master
in repository guix-artwork.

commit 368ec7de00f4eaff708bb0d636c86700daa25502
Author: sirgazil <address@hidden>
Date:   Tue Nov 22 14:29:07 2016 -0500

    website: Fix missing HTML document type declaration (see bug #24981)
    
    * haunt.scm (site): Add doctype declaration.
    * www/news.scm (base-layout): Ditto.
---
 website/haunt.scm    |    6 ++++--
 website/www/news.scm |   17 +++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/website/haunt.scm b/website/haunt.scm
index ed78634..4c5c6df 100644
--- a/website/haunt.scm
+++ b/website/haunt.scm
@@ -74,7 +74,7 @@
       #:builders
       `(,(lambda (site posts)                     ;the main page
            (with-url-parameters
-            (make-page "guix.html" (main-page site posts)
+            (make-page "guix.html" `((doctype "html") ,(main-page site posts))
                        sxml->html)))
         ,@(filter-map (match-lambda
                         (("guix.html" _)          ;handled above
@@ -82,7 +82,9 @@
                         ((file-name contents)
                          (lambda (site posts)
                            (with-url-parameters
-                            (make-page file-name (contents) sxml->html)))))
+                            (make-page file-name
+                                      `((doctype "html") ,(contents))
+                                      sxml->html)))))
                       %web-pages)
         ,(blog #:theme (parameterized-theme %news-haunt-theme)
                #:prefix "news")
diff --git a/website/www/news.scm b/website/www/news.scm
index 849fc44..e6b59ef 100644
--- a/website/www/news.scm
+++ b/website/www/news.scm
@@ -56,17 +56,18 @@
                 posts))))
 
 (define (base-layout body)
-  `(html (@ (lang "en"))
-        ,(html-page-header "News" #:css "news.css")
+  `((doctype "html")
+    (html (@ (lang "en"))
+         ,(html-page-header "News" #:css "news.css")
 
-        (body
-         ,(html-page-description)
-         ,(html-page-links)
+         (body
+          ,(html-page-description)
+          ,(html-page-links)
 
-         (div (@ (id "content-box"))
-               (article ,body))
+          (div (@ (id "content-box"))
+               (article ,body))
 
-         ,(html-page-footer))))
+          ,(html-page-footer)))))
 
 (define %news-haunt-theme
   ;; Theme for the rendering of the news pages.