>From aff0743966b06d524acc1d0be86f46b4b0a20828 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sun, 14 Jun 2015 20:06:40 +0200 Subject: [PATCH 1/2] website: Allow inclusion of Javascript. * website/www/utils.scm (js-url): New procedure. * website/www/shared.scm (html-page-header): Use it. Add #:js parameter. --- website/www/shared.scm | 7 +++++-- website/www/utils.scm | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/website/www/shared.scm b/website/www/shared.scm index 88dad4e..6b19db9 100644 --- a/website/www/shared.scm +++ b/website/www/shared.scm @@ -30,7 +30,7 @@ (define latest-guix-version (make-parameter "0.8.2")) -(define* (html-page-header title #:key (css "article.css")) +(define* (html-page-header title #:key (css "article.css") (js "")) `(head (meta (@ (charset "utf-8"))) (meta (@ (name "author") (content "GuixSD Contributors"))) @@ -58,7 +58,10 @@ Functional package management,"))) (rel "icon") (href ,(image-url "favicon.png")))) (link (@ (rel "license") (href "Pending..."))) - (title ,(string-append title " — GuixSD")))) + (title ,(string-append title " — GuixSD")) + ,(if (string-null? js) + "" + `(script (@ (src ,(js-url js))) "")))) (define (html-page-description) `(div (@ (class "message-box msg-info")) diff --git a/website/www/utils.scm b/website/www/utils.scm index 96ccb5f..029951f 100644 --- a/website/www/utils.scm +++ b/website/www/utils.scm @@ -28,6 +28,7 @@ guix-url static-base-url css-url + js-url image-url thumb-url screenshot-url @@ -66,6 +67,9 @@ (define (css-url file) (string-append (static-base-url) "css/" file)) +(define (js-url file) + (string-append (static-base-url) "js/" file)) + (define (image-url file) (string-append (static-base-url) "img/" file)) -- 2.1.4