diff options
Diffstat (limited to '')
| -rw-r--r-- | templates/help.md | 2 | ||||
| -rw-r--r-- | templates/page.tmpl | 194 | ||||
| -rw-r--r-- | templates/pagedraft.md | 5 | ||||
| -rw-r--r-- | templates/sched.md | 5 | ||||
| -rw-r--r-- | templates/script.js | 227 | ||||
| -rw-r--r-- | templates/time.md | 1 |
6 files changed, 240 insertions, 194 deletions
diff --git a/templates/help.md b/templates/help.md index fc133fcc..749c8ee3 100644 --- a/templates/help.md +++ b/templates/help.md @@ -1,4 +1,4 @@ -<details class="help"><summary>Help wanted<TMPL_IF summary>: <TMPL_VAR summary></TMPL_IF summary> <TMPL_IF volunteer>(Volunteered: <TMPL_VAR volunteer>)</TMPL_IF></summary> +<details class="help"><summary><TMPL_IF volunteer>Work in progress<TMPL_ELSE>Help wanted</TMPL_IF><TMPL_IF summary>: <TMPL_VAR summary></TMPL_IF summary> <TMPL_IF volunteer>(Volunteered: <TMPL_VAR volunteer>)</TMPL_IF></summary> <TMPL_IF main_captions> This talk does not have captions yet. Would you like to help [caption this talk](/2021/contribute/#edit-captions)? You may be able to start with these [auto-generated captions](<TMPL_VAR main_captions>). diff --git a/templates/page.tmpl b/templates/page.tmpl index 7cf2eb50..cb845818 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -36,77 +36,6 @@ </TMPL_IF> </TMPL_LOOP> </TMPL_UNLESS> - -<script> - // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0-or-later - /* - - SeekToTime - simple script to add video time jump functionality to timestamp links - Copyright (C) 2020 Grant Shangreaux - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. - - This script enables wiki editors to create anchor tags with the class "time-link" - that will be parsed for seeking to specific time stamps in the main video on a page. - The tag should look like this: - - <a href="#mainVideo" class="time-link">mm:ss</a> - - This could be extended to accept hours in the time stamp as well, but currently does not. - */ - let mainVideo; - let qnaVideo; // some pages have a questions and answers video - let timestamps; - - // expects a string like "mm:ss.mmm" - function parseSeconds(timeString) { - return timeString.split(":").reduce(function(prev, o) { - return prev * 60 + parseFloat(o); - }, 0); - } - - function handleSubtitleClick(event) { - var video = event.target.attributes['data-video'].value; - var start = event.target.attributes['data-start'].value - var videoElem = document.getElementById(video); - if (videoElem) { - videoElem.currentTime = parseSeconds(start); - videoElem.scrollIntoView(); - } - event.preventDefault(); - } - - window.onload = function initScript() { - mainVideo = document.getElementById("mainVideo"); - qnaVideo = document.getElementById("qnaVideo"); - timestamps = document.getElementsByClassName("time-link"); - var len = timestamps.length; - for (let i = 0; i < len; i++) { - timestamps[i].onclick = function () { - videoType = this.href.split("/").pop(); - video = (videoType == "#mainVideo") ? mainVideo : qnaVideo; - video.currentTime = parseSeconds(this.innerText) - }; - } - let subtitles = document.getElementsByClassName('subtitle'); - for (let i = 0; i < subtitles.length; i++) { - subtitles[i].onclick = handleSubtitleClick; - } - - } - // @license-end -</script> </head> <body <TMPL_IF SIDEBAR>class="has-sidebar"</TMPL_IF>> @@ -138,10 +67,11 @@ <TMPL_IF HAVE_ACTIONS> <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF> <ul> +<!-- <li><a href="<TMPL_VAR BASEURL>donate/">❤️ Donate</a></li> --> <TMPL_IF EDITURL> <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li> <TMPL_ELSE> -<li><a href="/edit/">Edit <span class="muted">(how to)</span></a></li> +<li><a href="<TMPL_VAR BASEURL>edit/">Edit <span class="muted">(how to)</span></a></li> </TMPL_IF> <TMPL_IF RECENTCHANGESURL> <li><a href="<TMPL_VAR RECENTCHANGESURL>">Recent Changes</a></li> @@ -291,124 +221,6 @@ Last edited <TMPL_VAR MTIME> <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF> <TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF> - -<script> - // @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt txt CC0-1.0 - // Copyright (C) 2021, 2022 Sacha Chua - - if (document.querySelector('.times')) { - var dateOptions = {dateStyle: 'short', timeStyle: 'short'}; - var localStart = (new Date(document.querySelector('.times').getAttribute('start'))).toLocaleString([], dateOptions); - var localEnd = (new Date(document.querySelector('.times').getAttribute('end'))).toLocaleString([], dateOptions); - var dateElem = document.createElement('div'); - dateElem.appendChild(document.createTextNode('Your local time: ~ ' + localStart + ' to ~ ' + localEnd)); - document.querySelector('.times').prepend(dateElem); - if (document.querySelector('.times').querySelector('.others')) { - document.querySelector('.times').querySelector('.others').style.display = 'none'; - } - } - if (document.querySelector('a[name=transcript]')) { - var transcriptLink = document.createElement('a'); - transcriptLink.setAttribute('href', '#transcript'); - transcriptLink.textContent = 'View transcript'; -var video = document.querySelector('.mainVideo video'); -if (video) { - var resources = document.querySelector('.mainVideo video').closest('.vid').querySelector('.resources'); - var transcriptDiv = document.createElement('div'); -transcriptDiv.appendChild(transcriptLink) - if (resources) { resources.prepend(transcriptDiv); } - } -} - var chat = document.querySelector('.chat-iframe'); - if (chat) { - if (chat.getAttribute('data-track')) { - chat.innerHTML = '<iframe src="https://chat.emacsconf.org?join=emacsconf,emacsconf-' + - chat.getAttribute('data-track').replace(/[^A-Za-z]/g, '') + '" height="600" width="100%"></iframe>'; - } else { - chat.innerHTML = '<iframe src="https://chat.emacsconf.org" height="600" width="100%"></iframe>'; - } - } - - // @license-end -</script> -<script> - // @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt txt CC0-1.0 - // Copyright (c) 2021 Sacha Chua - CC0 Public Domain - function displayChapters(elem) { - var i; - var chapter; - var list = document.createElement('ol'); - list.setAttribute('class', 'chapters'); - var link; - var target = elem.getAttribute('data-target'); - var video = document.getElementById(target); - var track; - if (video) { - track = video.addTextTrack('chapters'); - track.mode = 'hidden'; - } - var chapters = elem.textContent.split(/[ \t]*\n+[ \t]*/).forEach(function(line) { - var m = (line.match(/^(((?:[0-9]+:)?[0-9]+:[0-9]+)(?:\.[0-9]+))[ \t]+(.*)/)); - if (m) { - var start = m[1]; - var text = m[3]; - chapter = document.createElement('li'); - link = document.createElement('a'); - link.setAttribute('href', '#'); - link.setAttribute('data-video', target); - link.setAttribute('data-start', start); - link.setAttribute('data-start-s', parseSeconds(start)); - link.appendChild(document.createTextNode(m[2] + ' ' + text)); - link.onclick = handleSubtitleClick; - chapter.appendChild(link); - list.appendChild(chapter); - if (track) { - var time = parseSeconds(start); - if (track.cues.length > 0) { - track.cues[track.cues.length - 1].endTime = time - 1; - } - track.addCue(new VTTCue(time, time, text)); - } - } - }) - if (track && track.cues.length > 0) { - video.addEventListener('durationchange', function() { - track.cues[track.cues.length - 1].endTime = video.duration; - }); - track.addEventListener('cuechange', function() { - if (!this.activeCues[0]) return; - if (list.querySelector('.current')) { - list.querySelector('.current').className = ''; - } - var chapter; - if (chapter = list.querySelector('a[data-start-s="' + this.activeCues[0].startTime + '"]')) { - chapter.parentNode.className = 'current'; - } - }); - } - elem.parentNode.replaceChild(list, elem); - } - - document.querySelectorAll('pre.chapters').forEach(displayChapters); - - var video = document.querySelector('video.reload'); -if (video) { - var myVar = setInterval(reloadAsNeeded, 1000); - var oldTime = ''; - function reloadAsNeeded() { - if ((video.paused != true && (video.currentTime - oldTime) == 0 && video.currentTime != 0)) { - var source = video.querySelector('source'); - var oldVideo = source.src; - source.src = ''; - source.src = oldVideo; - video.load(); - video.play(); - } - oldTime = video.currentTime; - }; -} - - // @license-end -</script> +<script src="https://emacsconf.org/script.js"></script> </body> </html> diff --git a/templates/pagedraft.md b/templates/pagedraft.md new file mode 100644 index 00000000..7fd08768 --- /dev/null +++ b/templates/pagedraft.md @@ -0,0 +1,5 @@ +<div class="draft"> THIS IS A DRAFT DOCUMENT. It's not ready for +sharing yet. We're still working on it! Feel free to update it or +e-mail +<a href="mailto:emacsconf-org@gnu.org">emacsconf-org@gnu.org</a>. +</div> diff --git a/templates/sched.md b/templates/sched.md index 65cf4813..aa64e31a 100644 --- a/templates/sched.md +++ b/templates/sched.md @@ -5,12 +5,13 @@ <TMPL_IF end> - <span class="sched-end"><TMPL_VAR end></span></TMPL_IF end> </span></TMPL_IF start> <TMPL_IF track> <span class="sched-track <TMPL_VAR track>"><TMPL_IF watch><a href="<TMPL_VAR watch>"></TMPL_IF><TMPL_VAR track><TMPL_IF watch></a></TMPL_IF></span></TMPL_IF track> +<TMPL_IF q-and-a> <span class="sched-q-and-a">Q&A: <TMPL_VAR q-and-a></span> </TMPL_IF q-and-a> <TMPL_IF pad> <span class="sched-pad"><a href="<TMPL_VAR pad>">Etherpad</a></TMPL_IF pad> -<TMPL_IF q-and-a> <span class="sched-q-and-a">Q&A: <TMPL_VAR q-and-a>;</span> </TMPL_IF q-and-a> -<TMPL_IF slug> <span class="sched-slug">id:<TMPL_VAR slug></span></TMPL_IF slug> </div> <div class="sched-title"><a href="<TMPL_VAR url>"><TMPL_VAR title></a></div> <div class="sched-speakers"><TMPL_VAR speakers> <TMPL_IF note>- <TMPL_VAR note></TMPL_IF note></div> +<TMPL_IF time><span class="sched-duration><TMPL_VAR time></span> minutes</TMPL_IF time> +<TMPL_IF slug> <span class="sched-slug">id:<TMPL_VAR slug></span></TMPL_IF slug> <TMPL_IF resources> <ul class="resources"> <TMPL_VAR resources> diff --git a/templates/script.js b/templates/script.js new file mode 100644 index 00000000..428adf3a --- /dev/null +++ b/templates/script.js @@ -0,0 +1,227 @@ +// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0-or-later + /* + + SeekToTime - simple script to add video time jump functionality to timestamp links + Copyright (C) 2020 Grant Shangreaux + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + + This script enables wiki editors to create anchor tags with the class "time-link" + that will be parsed for seeking to specific time stamps in the main video on a page. + The tag should look like this: + + <a href="#mainVideo" class="time-link">mm:ss</a> + + This could be extended to accept hours in the time stamp as well, but currently does not. + */ + let timestamps; + + // expects a string like "mm:ss.mmm" + function parseSeconds(timeString) { + return timeString.split(":").reduce(function(prev, o) { + return prev * 60 + parseFloat(o); + }, 0); + } + + function handleSubtitleClick(event) { + var video = event.target.getAttribute('data-video'); + var start = event.target.getAttribute('data-start'); + var videoElem = document.getElementById(video); + if (videoElem) { + videoElem.currentTime = parseSeconds(start); + videoElem.scrollIntoView(); + } + if (event.preventDefault) { + event.preventDefault(); + } + } + + window.onload = function initScript() { + let subtitles = document.getElementsByClassName('subtitle'); + for (let i = 0; i < subtitles.length; i++) { + subtitles[i].onclick = handleSubtitleClick; + } + } +// @license-end + // @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt txt CC0-1.0 + // Copyright (C) 2021, 2022 Sacha Chua + + if (document.querySelector('.times')) { + var dateOptions = {dateStyle: 'short', timeStyle: 'short'}; + var localStart = (new Date(document.querySelector('.times').getAttribute('start'))).toLocaleString([], dateOptions); + var localEnd = (new Date(document.querySelector('.times').getAttribute('end'))).toLocaleString([], dateOptions); + var dateElem = document.createElement('div'); + dateElem.appendChild(document.createTextNode('Your local time: ~ ' + localStart + ' to ~ ' + localEnd)); + document.querySelector('.times').prepend(dateElem); + if (document.querySelector('.times').querySelector('.others')) { + document.querySelector('.times').querySelector('.others').style.display = 'none'; + } + } + if (document.querySelector('.time-overlay')) { + document.querySelectorAll('.time-overlay').forEach(function (o) { + if (o.getAttribute('title')) return; + var dateOptions = {dateStyle: 'short', timeStyle: 'short'}; + var localStart, localEnd; + if (o.getAttribute('start') && o.getAttribute('end')) { + localStart = (new Date(o.getAttribute('start'))).toLocaleString([], dateOptions); + localEnd = (new Date(o.getAttribute('end'))).toLocaleString([], dateOptions); + o.setAttribute('title', 'Your local time: ~ ' + localStart + ' to ~ ' + localEnd); + } else if (o.getAttribute('start')) { + localStart = (new Date(o.getAttribute('start'))).toLocaleString([], dateOptions); + o.setAttribute('title', 'Your local time: ~ ' + localStart); + } + }); + } + + if (document.querySelector('a[name=transcript]')) { + var transcriptLink = document.createElement('a'); + transcriptLink.setAttribute('href', '#transcript'); + transcriptLink.textContent = 'View transcript'; + var video = document.querySelector('.mainVideo video'); + if (video) { + var resources = document.querySelector('.mainVideo video').closest('.vid').querySelector('.resources'); + var transcriptDiv = document.createElement('div'); + transcriptDiv.appendChild(transcriptLink) + if (resources) { resources.prepend(transcriptDiv); } + } + } + var chat = document.querySelector('.chat-iframe'); + if (chat) { + if (chat.getAttribute('data-track')) { + chat.innerHTML = '<iframe src="https://chat.emacsconf.org?join=emacsconf,emacsconf-' + + chat.getAttribute('data-track').replace(/[^A-Za-z]/g, '') + '" height="600" width="100%"></iframe>'; + } else { + chat.innerHTML = '<iframe src="https://chat.emacsconf.org" height="600" width="100%"></iframe>'; + } + } + +// @license-end + // @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt txt CC0-1.0 + // Copyright (c) 2021 Sacha Chua - CC0 Public Domain + function displayChapters(elem) { + var i; + var chapter; + var list = document.createElement('ol'); + list.setAttribute('class', 'chapters'); + var link; + var target = elem.getAttribute('data-target'); + var video = document.getElementById(target); + var track; + if (video) { + track = video.addTextTrack('chapters'); + track.mode = 'hidden'; + } + var chapters = elem.textContent.split(/[ \t]*\n+[ \t]*/).forEach(function(line) { + var m = (line.match(/^(((?:[0-9]+:)?[0-9]+:[0-9]+)(?:\.[0-9]+))[ \t]+(.*)/)); + if (m) { + var start = m[1]; + var text = m[3]; + chapter = document.createElement('li'); + link = document.createElement('a'); + link.setAttribute('href', '#'); + link.setAttribute('data-video', target); + link.setAttribute('data-start', start); + link.setAttribute('data-start-s', parseSeconds(start)); + link.appendChild(document.createTextNode(m[2] + ' ' + text)); + link.onclick = handleSubtitleClick; + chapter.appendChild(link); + list.appendChild(chapter); + if (track) { + var time = parseSeconds(start); + if (track.cues.length > 0) { + track.cues[track.cues.length - 1].endTime = time - 1; + } + track.addCue(new VTTCue(time, time, text)); + } + } + }) + if (track && track.cues.length > 0) { + video.addEventListener('durationchange', function() { + track.cues[track.cues.length - 1].endTime = video.duration; + }); + track.addEventListener('cuechange', function() { + if (!this.activeCues[0]) return; + if (list.querySelector('.current')) { + list.querySelector('.current').className = ''; + } + var chapter; + if (chapter = list.querySelector('a[data-start-s="' + this.activeCues[0].startTime + '"]')) { + chapter.parentNode.className = 'current'; + } + }); + } + elem.parentNode.replaceChild(list, elem); + } + + document.querySelectorAll('pre.chapters').forEach(displayChapters); + + var video = document.querySelector('video.reload'); + if (video) { + var myVar = setInterval(reloadAsNeeded, 1000); + var oldTime = ''; + function reloadAsNeeded() { + if ((video.paused != true && (video.currentTime - oldTime) == 0 && video.currentTime != 0)) { + var source = video.querySelector('source'); + var oldVideo = source.src; + source.src = ''; + source.src = oldVideo; + video.load(); + video.play(); + } + oldTime = video.currentTime; + }; + } + + /* videoType: mainVideo, qanda */ + function addStickyVideo(videoType) { + const transcriptDiv = document.querySelector('.transcript-' + videoType); + const video = document.querySelector('.vid.' + videoType + ' video'); + if (!video || !transcriptDiv) return; + if (transcriptDiv.querySelector('.vid')) + transcriptDiv.querySelector('.vid').remove(); + // already has it + // TODO: Make a copy of the video and place it at the start of the btranscript div, positioned to the left, and sticky, but only on large screens. + const videoCopy = video.cloneNode(true); + transcriptDiv.prepend(videoCopy); + videoCopy.classList.add('sticky-video'); + // TODO: fix the ID + + } + + + + // @license-end + // @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt txt CC0-1.0 + // Copyright (c) 2023 Sacha Chua - CC0 Public Domain + function highlightTalks() { + // highlight any talk mentioned in the highlight URL parameter + var params = new URLSearchParams(window.location.search); + if (!params.get('highlight')) return; + var talks = params.get('highlight').split(',').filter(function(o) { return o.match(/^[-a-z0-9]+$/); }); + var regexp = new RegExp('/talks/(' + talks.join('|') + ')/?$'); + document.querySelectorAll('a[href]').forEach(function(link) { + console.debug(link.getAttribute('href'), link.getAttribute('href').match(regexp)); + if (link.getAttribute('href').match(regexp)) { + console.debug(link); + link.classList.add('highlight'); + } + }); + } + + addEventListener('DOMContentLoaded', highlightTalks); + addEventListener('DOMContentLoaded', function() { + addStickyVideo('mainVideo'); + addStickyVideo('qanda'); + }); + // @license-end diff --git a/templates/time.md b/templates/time.md new file mode 100644 index 00000000..b3f3c90e --- /dev/null +++ b/templates/time.md @@ -0,0 +1 @@ +<span class="time-overlay" data-start="<TMPL_VAR startutc>" data-end="<TMPL_VAR endutc>"><TMPL_VAR time></span> |
