diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-07-26 23:52:44 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-07-26 23:52:44 +0200 |
| commit | 79b334e0e0a16b61faadcc429f7c988f889cec36 (patch) | |
| tree | 013dd2bce47de9b68931974ba7ff4978dc3c465d | |
| parent | Add untested code for UI update on /remove. (diff) | |
| download | calp-79b334e0e0a16b61faadcc429f7c988f889cec36.tar.gz calp-79b334e0e0a16b61faadcc429f7c988f889cec36.tar.xz | |
Change html-id to randomly generate.
| -rw-r--r-- | module/output/html.scm | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/module/output/html.scm b/module/output/html.scm index 7d3905d2..4365270c 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -80,12 +80,10 @@ (date->string date "~Y-~m-~d")) ;; Generate an html id for an event. -;; NOTE Not unique if two instances of the same event are placed at the exact -;; same start time. Same event with different start times works fine. (define (html-id ev) - (string-append - (datetime->string (as-datetime (prop ev 'DTSTART)) "~Y~m~d~H~M~S") - (html-attr (prop ev 'UID)))) + (or (prop ev '-HTML-ID) + (set/r! (prop ev '-HTML-ID) + (symbol->string (gensym "__html_id_"))))) ;; Retuns an HTML-safe version of @var{str}. (define (html-attr str) @@ -166,11 +164,13 @@ "unknown")))) ,(btn "×" title: "Stäng" - onclick: (format #f "close_popup(document.getElementById('~a'))" id) + onclick: (format #f "close_popup(document.getElementById('~a'))" + id) class: '("close-tooltip")) ,(btn "🗑" title: "Ta bort" - onclick: (format #f "remove_event(document.getElementById('~a'))" id))) + onclick: (format #f "remove_event(document.getElementById('~a'))" + (html-id ev)))) ,(tabset (append @@ -218,14 +218,15 @@ (inner x (right-subtree tree)))))) (define* (make-block ev optional: (extra-attributes '()) - key: element-id + key: (popup-id (symbol->string (gensym "popup")))) - `((a (@ (href "#" ,(or element-id (html-id ev))) + `((a (@ (href "#" ,(html-id ev)) (class "hidelink")) (div (@ ,@(assq-merge extra-attributes - `((class "event CAL_" ,(html-attr (or (prop (parent ev) 'NAME) + `((id ,(html-id ev)) + (class "event CAL_" ,(html-attr (or (prop (parent ev) 'NAME) "unknown")) ,(when (and (prop ev 'PARTSTAT) (eq? 'TENTATIVE (prop ev 'PARTSTAT))) @@ -827,7 +828,8 @@ ;; form of special case with those in xhtml, but I can't find ;; the documentation for it. (div (@ (class "template event-container") (id "event-template") - ;; Only needed to create a duration. + ;; Only needed to create a duration. So actual dates + ;; dosen't matter (data-start "2020-01-01") (data-end "2020-01-02")) ,(let ((cal (vcalendar @@ -842,8 +844,7 @@ summary: "New Event"))))) (caddar ; strip <a> tag (make-block (car (children cal)) - `((class " generated ")) - element-id: "GENERATED"))))))))) + `((class " generated "))))))))))) |