diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-07-14 12:54:05 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-07-14 13:03:28 +0200 |
| commit | 982ec24a4ff33513391e860d2c04d1b11271a62f (patch) | |
| tree | 6de9420fc2260f6a143610028090b4090f04126f /module | |
| parent | Add functions for TZ dates in JS. (diff) | |
| download | calp-982ec24a4ff33513391e860d2c04d1b11271a62f.tar.gz calp-982ec24a4ff33513391e860d2c04d1b11271a62f.tar.xz | |
Javascripts date should now work for both local and UTC dates.
Diffstat (limited to 'module')
| -rw-r--r-- | module/output/html.scm | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/module/output/html.scm b/module/output/html.scm index 307f18e5..6265b189 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -335,8 +335,8 @@ (lambda (e) (event-length/day day-date e))) `(div (@ (class "events event-container") (id ,(date-link day-date)) - (data-start ,(date->string day-date) "T00:00Z") - (data-end ,(date->string (add-day day-date)) "T00:00Z")) + (data-start ,(date->string day-date)) + (data-end ,(date->string (add-day day-date)) )) ,@(map (lambda (time) `(div (@ (class "clock clock-" ,time)))) (iota 12 0 2)) @@ -371,8 +371,8 @@ (div (@ (class "days")) ,@(time-marker-div) (div (@ (class "longevents event-container") - (data-start ,(date->string start-date) "T00:00Z") - (data-end ,(date->string (add-day end-date)) "T00:00Z") + (data-start ,(date->string start-date) ) + (data-end ,(date->string (add-day end-date)) ) (style "grid-column-end: span " ,(days-in-interval start-date end-date))) ,@(lay-out-long-events start-date end-date long-events)) ,@(map (lambda (day-date) @@ -441,16 +441,16 @@ (div ,(call-with-values (lambda () (fmt-time-span ev)) (case-lambda [(start) `(div (span (@ (class "dtstart") - (data-fmt "%H:%M")) + (data-fmt "%L%H:%M")) ,start))] [(start end) `(div (span (@ (class "dtstart") ;; TODO same format string ;; as fmt-time-span used - (data-fmt "%H:%M")) + (data-fmt "%L%H:%M")) ,start) " — " (span (@ (class "dtend") - (data-fmt "%H:%M")) + (data-fmt "%L%H:%M")) ,end))])) ,(when (and=> (prop ev 'LOCATION) (negate string-null?)) `(div (b "Plats: ") @@ -827,7 +827,10 @@ ;; This would idealy be a <template> element, but there is some ;; form of special case with those in xhtml, but I can't find ;; the documentation for it. - (div (@ (class "template") (id "event-template")) + (div (@ (class "template event-container") (id "event-template") + ;; Only needed to create a duration. + (data-start "2020-01-01") + (data-end "2020-01-02")) ,(let ((cal (vcalendar name: "Generated" children: (list (vevent |