diff options
| -rw-r--r-- | emacsconf-publish.el | 28 | ||||
| -rw-r--r-- | emacsconf-stream.el | 15 | ||||
| -rw-r--r-- | emacsconf.el | 4 |
3 files changed, 32 insertions, 15 deletions
diff --git a/emacsconf-publish.el b/emacsconf-publish.el index 5dbae57..b2ff788 100644 --- a/emacsconf-publish.el +++ b/emacsconf-publish.el @@ -153,16 +153,19 @@ (defun emacsconf-publish-res-index () (interactive) - (let ((info (mapcar (lambda (o) - (if (plist-get o :bbb-room) - (append (list - :qa-link - (format "<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">Join Q&A</a>" (plist-get o :bbb-room)) - :url - (plist-get o :bbb-room)) - o) - o)) - (emacsconf-prepare-for-display (emacsconf-get-talk-info))))) + (let ((emacsconf-use-absolute-url t) + (emacsconf-base-url "") + (info (mapcar (lambda (o) + (append (list + :url (concat "#" (plist-get o :slug))) + (if (and (string-match "live" (or (plist-get o :q-and-a) "")) + (plist-get o :bbb-room)) + (append (list + :qa-link + (format "<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">Join Q&A</a>" (plist-get o :bbb-room))) + o) + o))) + (emacsconf-prepare-for-display (emacsconf-get-talk-info))))) (mapc (lambda (track) (let ((track-talks (seq-filter (lambda (o) (string= (plist-get o :track) (plist-get track :name))) @@ -179,7 +182,10 @@ (lambda (o) (concat "<tr>" - "<td>" (plist-get o :qa-link) + (format + "<td><a name=\"%s\"></a>" + (plist-get o :slug)) + (plist-get o :qa-link) "</td>" "<td>" (if (plist-get o :pad-url) (format "<a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">Open pad</a>" (plist-get o :pad-url)) diff --git a/emacsconf-stream.el b/emacsconf-stream.el index bcf64f4..9e93f20 100644 --- a/emacsconf-stream.el +++ b/emacsconf-stream.el @@ -240,7 +240,7 @@ This uses the BBB room if available, or the IRC channel if not." (shell-quote-argument (file-name-nondirectory other-filename)))))) (defvar emacsconf-stream-asset-dir "/data/emacsconf/assets/") -(defvar emacsconf-stream-overlay-dir "/data/emacsconf/overlays/") +(defvar emacsconf-stream-overlay-dir "/data/emacsconf/assets/overlays/") (defun emacsconf-stream-generate-overlays (&optional info) (interactive) @@ -300,7 +300,11 @@ This uses the BBB room if available, or the IRC channel if not." (message nil) (with-temp-file (expand-file-name (concat (plist-get talk :slug) "-title.svg") (expand-file-name "titles" emacsconf-stream-asset-dir)) - (insert (x-export-frames nil 'svg)))) + (insert (x-export-frames nil 'svg))) + (shell-command + (concat "inkscape --export-type=png --export-dpi=96 --export-background-opacity=0 " + (shell-quote-argument (expand-file-name (concat (plist-get talk :slug) "-title.svg") + (expand-file-name "titles" emacsconf-stream-asset-dir)))))) (defun emacsconf-stream-generate-title-pages (&optional info) (interactive) @@ -374,6 +378,13 @@ This uses the BBB room if available, or the IRC channel if not." talk))) info))) +(defun emacsconf-stream-generate-assets-for-talk (talk) + (interactive (list (emacsconf-complete-talk-info))) + (let ((info (list talk))) + (emacsconf-stream-generate-test-videos info) + (emacsconf-stream-generate-test-subtitles info) + (emacsconf-stream-generate-title-pages info) + (emacsconf-stream-generate-overlays info))) ;; (emacsconf-stream-display-talk-info ;; '(:title "The ship that builds itself: How we used Emacs to develop a workshop for communities" ;; :speakers-with-pronouns "Noorah Alhasan (she/her), Joseph Corneli (he/him), Leo Vivier (he/him)" diff --git a/emacsconf.el b/emacsconf.el index 60f9ac2..7ea24ef 100644 --- a/emacsconf.el +++ b/emacsconf.el @@ -931,9 +931,9 @@ ;; (emacsconf-ansible-load-vars (expand-file-name "prod-vars.yml" emacsconf-ansible-directory)) ;;; Tracks (defvar emacsconf-tracks '((:name "General" :color "peachpuff" :id "gen" :channel "emacsconf-gen" - :tramp "/ssh:emacsconf-gen@localhost#46668:") + :tramp "/ssh:emacsconf-gen@res.emacsconf.org#46668:") (:name "Development" :color "skyblue" :id "dev" :channel "emacsconf-dev" - :tramp "/ssh:emacsconf-dev@localhost#46668:"))) + :tramp "/ssh:emacsconf-dev@res.emacsconf.org#46668:"))) (defun emacsconf-get-track (name) (when (listp name) (setq name (plist-get name :track))) |