From fd507da44a491bfdc8d87139c4c366a3f1f1b83b Mon Sep 17 00:00:00 2001 From: Sacha Chua Date: Thu, 24 Nov 2022 10:31:45 -0500 Subject: add title to schedule --- emacsconf-pad.el | 55 ++++++++++++++++++++++++++++++--------------------- emacsconf-publish.el | 3 ++- emacsconf-schedule.el | 10 ++++++---- emacsconf.el | 2 +- 4 files changed, 42 insertions(+), 28 deletions(-) diff --git a/emacsconf-pad.el b/emacsconf-pad.el index afd734b..5f53d7f 100644 --- a/emacsconf-pad.el +++ b/emacsconf-pad.el @@ -323,14 +323,17 @@ ${next-talk-list} (let* ((prefixed (list :start (plist-get shift :start) :end (plist-get shift :end) + :base-url emacsconf-base-url :year emacsconf-year - :host (emacsconf-surround "HOST-" (plist-get shift :host) "" "HOST") - :stream (emacsconf-surround "STREAM-" (plist-get shift :streamer) "" "STREAM") - :irc-volunteer (emacsconf-surround "IRC-" (plist-get shift :irc) "" "IRC") + :host (format "%s" + (emacsconf-surround "HOST-" (plist-get shift :host) "" "HOST")) + :stream (format "%s" + (emacsconf-surround "STREAM-" (plist-get shift :streamer) "" "STREAM")) + :irc-volunteer (format "%s" (emacsconf-surround "IRC-" (plist-get shift :irc) "" "IRC")) :track-id (plist-get (emacsconf-get-track (plist-get shift :track)) :id) - :checkin (emacsconf-surround "CHECKIN-" (plist-get shift :checkin) "" "CHECKIN") - :pad (emacsconf-surround "PAD-" (plist-get shift :pad) "" "PAD") - :coord (emacsconf-surround "COORD-" (plist-get shift :coord) "" "COORD") + :checkin (format "%s" (emacsconf-surround "CHECKIN-" (plist-get shift :checkin) "" "CHECKIN")) + :pad (format "%s" (emacsconf-surround "PAD-" (plist-get shift :pad) "" "PAD")) + :coord (format "%s" (emacsconf-surround "COORD-" (plist-get shift :coord) "" "COORD")) :checkin-pad (concat emacsconf-pad-base "checkin-" (downcase (format-time-string "%a" (date-to-time (plist-get shift :start))))))) (shift-talks (mapcar (lambda (o) (append prefixed o)) @@ -352,12 +355,14 @@ ${next-talk-list} prefixed (concat " +

Ctrl-5 is the shortcut for striking through on Etherpad.

+ Setup " "Teardown ")) ))) @@ -405,11 +416,11 @@ ${next-talk-list} talk) (pcase (or (plist-get talk :q-and-a) "") ((rx "live") - "
  • [ ] ${time} ${checkin}: ${speakers} should be checked into ${bbb-backstage} and set as moderator(s) for talk time of ${start}
    • ") + "
  • [ ] ${time} ${checkin}: ${speakers} should be checked into ${bbb-backstage} and set as moderator(s) for talk time of ${start}
    • ") ((rx "IRC") - "
  • [ ] ${time} ${checkin}: ${speakers} should be in #${channel} (${irc-nick}) for talk time of ${start}
    • ") + "
  • [ ] ${time} ${checkin}: ${speakers} should be in #${channel} (${irc-nick}) for talk time of ${start}
    • ") ((rx "Mumble") - "
  • [ ] ${time} ${checkin}: ${speakers} should be Mumble for talk time of ${start}
    • ") + "
  • [ ] ${time} ${checkin}: ${speakers} should be Mumble for talk time of ${start}
    • ") (_ "")))) (defun emacsconf-pad-prepopulate-checkins (&optional info) diff --git a/emacsconf-publish.el b/emacsconf-publish.el index fd2949b..9d82335 100644 --- a/emacsconf-publish.el +++ b/emacsconf-publish.el @@ -930,6 +930,7 @@ Entries are sorted chronologically, with different tracks interleaved." :speakers (plist-get o :speakers) :q-and-a (plist-get o :q-and-a) :qa-link (plist-get o :qa-link) + :watch (plist-get o :watch-url) :note (string-join (delq nil @@ -1714,7 +1715,7 @@ This video is available under the terms of the Creative Commons Attribution-Shar (mapconcat (lambda (track) (emacsconf-replace-plist-in-string track - "${name}${channel}${stream}${id}-480p.webm")) + "
    ${name}
    ${channel}${stream}${id}-480p.webm")) emacsconf-tracks "\n") "\n\n" diff --git a/emacsconf-schedule.el b/emacsconf-schedule.el index cfd20f3..f4cdeda 100644 --- a/emacsconf-schedule.el +++ b/emacsconf-schedule.el @@ -301,6 +301,7 @@ Each function should take the info and manipulate it as needed, returning the ne (x 0) (y label-margin) (scale (/ width (float-time (time-subtract end start)))) (time start)) + (dom-append-child elem (dom-node 'title nil (concat "Schedule for " label))) (svg-rectangle elem 0 0 width height :fill "white") (svg-text elem label :x 3 :y (- label-margin 3) :fill "black" :font-size "10") (mapc (lambda (track) @@ -330,8 +331,8 @@ Each function should take the info and manipulate it as needed, returning the ne (x . 0) (y . ,(- height 2 label-margin)) (font-size . 10) - (text-anchor . "middle")) - (svg--encode-text (format-time-string "%-l" time emacsconf-timezone))))) + (text-anchor . "left")) + (svg--encode-text (format-time-string "%-l %p" time emacsconf-timezone))))) (setq time (time-add time (seconds-to-time 3600))))) elem)) @@ -380,12 +381,13 @@ Each function should take the info and manipulate it as needed, returning the ne "lightgreen") ((rx (or "TO_STREAM")) "green") - (t "gray"))))) + (_ "gray"))))) (defun emacsconf-schedule-svg-days (width height days) - (let ((svg (svg-create width height :background "white")) + (let ((svg (svg-create width height)) (day-height (/ height (length days))) (y 0)) + (dom-append-child svg (dom-node 'title nil "Graphical view of the schedule")) (mapc (lambda (day) (let ((group (dom-node 'g `((transform . ,(format "translate(0,%d)" y)))))) diff --git a/emacsconf.el b/emacsconf.el index cce14b6..a3fc06c 100644 --- a/emacsconf.el +++ b/emacsconf.el @@ -600,7 +600,7 @@ ((string-match "live" (plist-get o :q-and-a)) (plist-put o :bbb-redirect (format "https://emacsconf.org/current/%s/room/" (plist-get o :slug))) (plist-put o :qa-info (plist-get o :bbb-redirect)) - (plist-put o :qa-link (format "live" (plist-get o :bbb-redirect)))) + (plist-put o :qa-link (format "BBB" (plist-get o :bbb-redirect)))) ((string-match "IRC" (plist-get o :q-and-a)) (plist-put o :qa-info (concat (emacsconf-surround "nick: " (plist-get o :irc) ", " "") (plist-get o :channel))) -- cgit v1.2.3