summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2025-11-27 14:39:17 -0500
committerSacha Chua <sacha@sachachua.com>2025-11-27 14:40:17 -0500
commite62179f14218f3eee01cf780160f09867641f9e5 (patch)
tree1f83ea0f401ea69e7c00c603b9358849df9f00a8
parenteca830537dd70ba0d9cc3a39071a4d99b9528b8c (diff)
downloademacsconf-el-e62179f14218f3eee01cf780160f09867641f9e5.tar.xz
emacsconf-el-e62179f14218f3eee01cf780160f09867641f9e5.zip
pad tweaks
-rw-r--r--emacsconf-pad.el16
1 files changed, 9 insertions, 7 deletions
diff --git a/emacsconf-pad.el b/emacsconf-pad.el
index 0a958e1..7d43423 100644
--- a/emacsconf-pad.el
+++ b/emacsconf-pad.el
@@ -765,19 +765,19 @@ ${bbb-checklist}</li>")
", and \\1"
(plist-get talk :speakers))
(emacsconf-surround " (" (plist-get talk :pronunciation) ")" "")
- (pcase (plist-get talk :q-and-a)
+ (pcase (plist-get talk :qa-type)
((or 'nil "") "")
- ((rx "after") "\nYou can ask questions via Etherpad and IRC.\nWe'll send them to the speaker,\nand we'll post the answers on the talk page afterwards.")
- ((rx "live")
+ ("none" "\nYou can ask questions via Etherpad and IRC.\nWe'll send them to the speaker,\nand we'll post the answers on the talk page afterwards.")
+ ("live"
(if pronoun
(format "\n%s will answer questions via web conference.\nYou can join using the URL from the talk page\nor ask questions through Etherpad or IRC."
pronoun)
"\nYou can ask questions via web conference by joining from the talk page\nor ask questions through Etherpad or IRC."))
- ((rx "pad")
+ ("pad"
(if pronoun
(format "\n%s will answer questions via Etherpad." pronoun)
"\nYou can ask questions via Etherpad."))
- ((rx "IRC")
+ ("irc"
(if pronoun
(format "\n%s will answer questions via IRC in the #%s channel."
pronoun
@@ -822,7 +822,7 @@ ${bbb-checklist}</li>")
(setq result
(emacsconf-replace-plist-in-string
modified-talk
- (format "<li><strong>%s %s (intro: %s, talk: %s, Q&A: %s) %s <a href=\"%s\">%s</a></strong><ul>%s</ul>\n</li>"
+ (format "<li><strong>%s %s (intro: %s, talk: %s, Q&A: %s) %s <a href=\"%s\">%s</a></strong><br /><ul><li>%s%s%s</li>%s</ul>\n</li>"
(format-time-string "%-l:%M %p" (plist-get talk :start-time) emacsconf-timezone)
(plist-get talk :slug)
(if (plist-get talk :recorded-intro) "recorded" "live")
@@ -831,7 +831,9 @@ ${bbb-checklist}</li>")
(plist-get talk :title)
(plist-get talk :absolute-url)
(plist-get talk :absolute-url)
-
+ (emacsconf-surround "" (plist-get talk :speakers) "" "No speakers")
+ (emacsconf-surround " Pron: " (plist-get talk :pronunciation) "" "")
+ (emacsconf-surround " (" (plist-get talk :pronouns) ")" "")
(concat
(emacsconf-surround "<li><strong>" (plist-get talk :hyperlist-note) "</strong></li>" "")
"<li>Recorded intro: <a href=\"${media-base}${year}/backstage/${file-prefix}--intro.webm\">${media-base}${year}/backstage/${file-prefix}--intro.webm</a>"