extending templates

src/templates/clean.scm

@@ -18,16 +18,20 @@
 (define (clean-tpl
          page-title
          page-content
-         #!optional (page-styles '()) (page-scripts '()))
+         #!optional (page-styles '()) (page-scripts '()) (page-meta '()))
   `(html (@ (xmlns "http://www.w3.org/1999/xhtml")
             (xml:lang "en")
             (lang "en"))
          (head
           (meta (@ (http-equiv "Content-Type")
                    (content "text/html; charset=ascii")))
+          (meta (@ (name "author") (content "Ivan Polyakov (vilor)")))
           (meta (@ (name "viewport")
                    (content "width=device-width, initial-scale=1")))
 
+          ,(map (lambda (args)
+                  `(meta ,(append '(@) args))) page-meta)
+
           ,(map (lambda (l)
                   `(link (@ (rel "stylesheet") (href ,l))))
                 page-styles)

src/templates/default.scm

@@ -17,31 +17,17 @@
 
 (load "./src/components/header.scm")
 (load "./src/components/footer.scm")
+(load "./src/templates/clean.scm")
 
 (define (default-tpl
           page-title
           page-content
           page-name
           page-desc
-          #!optional (page-styles '()) (page-scripts '()))
+          #!optional (page-styles '()) (page-scripts '()) (page-meta '()))
-  `(html (@ (xmlns "http://www.w3.org/1999/xhtml")
+  (clean-tpl
-            (xml:lang "en")
+    page-title
-            (lang "en"))
+    `(div (@ (class "wrapper"))
-         (head
-          (meta (@ (http-equiv "Content-Type")
-                   (content "text/html; charset=ascii")))
-          (meta (@ (name "viewport")
-                   (content "width=device-width, initial-scale=1")))
-
-          ,(map (lambda (l)
-                  `(link (@ (rel "stylesheet") (href ,l))))
-                page-styles)
-
-          (link (@ (rel "stylesheet") (href "/style.css")))
-
-          (title ,title))
-         (body
-          (div (@ (class "wrapper"))
           ,header
           (hr)
 
@@ -51,5 +37,9 @@
                ,page-content)
 
           (hr)
-               ,footer
+          ,footer)
-               ,(map (lambda (l) `(script (@ (src ,l)))) page-scripts)))))
+    (append
+      '("/style.css")
+      page-styles)
+    page-scripts
+    page-meta))