From 0a9023fc23eb29f0e8937f153341c4859457a89b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 10 Aug 2020 17:32:05 +0200 Subject: Fix problems with new HTML for calendar view. --- configure | 2 +- module/entry-points/server.scm | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 6f5dc927..a5ef456e 100755 --- a/configure +++ b/configure @@ -21,7 +21,7 @@ (define PREFIX //) (define CACHE_DIR (string-append PREFIX // "var/cache/calp")) -(define LIBEXEC (if *develop* here (string-append PREFIX // "usr/lib/calp")) +(define LIBEXEC (if *develop* here (string-append PREFIX // "usr/lib/calp"))) (define pipe (-> LIBEXEC diff --git a/module/entry-points/server.scm b/module/entry-points/server.scm index 0d2f84b2..fb6b2575 100644 --- a/module/entry-points/server.scm +++ b/module/entry-points/server.scm @@ -32,11 +32,13 @@ :use-module (vcomponent) :use-module (vcomponent search) :use-module (datetime) - :use-module (output html) + ;; :use-module (output html) :use-module (output ical) :autoload (vcomponent instance) (global-event-object) + :use-module (html view calendar) + :export (main) ) @@ -111,7 +113,7 @@ end-date: (date+ start-date (date day: 6)) next-start: (lambda (d) (date+ d (date day: 7))) prev-start: (lambda (d) (date- d (date day: 7))) - render-calendar: render-calendar + render-calendar: (@ (html view calendar week) render-calendar) intervaltype: 'week )))))) @@ -128,7 +130,8 @@ (date day: 1)) next-start: month+ prev-start: month- - render-calendar: render-calendar-table + render-calendar: (@ (html view calendar month) + render-calendar-table) pre-start: (start-of-week start-date (get-config 'week-start)) post-end: (end-of-week (end-of-month start-date) (get-config 'week-start)) intervaltype: 'month -- cgit v1.2.3