jekyll-theme-conference 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50470940d27a0744cdf32312e829e73af0c6375241575e6eb074695edfee7028
-  data.tar.gz: 1444781b0f41ffc7d267fe324b9cfabb5afd709ee27c24d95bd6b34d02d57060
+  metadata.gz: b2ae0a8593b5af0caa18dddfbb46fc921b089d9f932ba6c3af44d787669c99c0
+  data.tar.gz: de8cf5e47442a94d1f411ad6309cfd3d4ae2f964e341e4f9b1f47e14de7eca1e
 SHA512:
-  metadata.gz: 872ad7d006fbcb1c552dc863982d037e3eb9ba2ca8e8aab9d785d9e55ba0651c19c367ce03a0280317947e5ad2352b40eefc66a47e6bb5e3cbc1a3c36d298d91
-  data.tar.gz: 8000b8d73b08f71554efad482cd8cf5518db22b01fc3828c985b669e5b013819785f4c41369ef5007ea375bf49f0b5b2195864e79d88c9d55bb089c9b5149388
+  metadata.gz: 3d347ca521f8ff60e328e9d6e1b0fa1557d78ac4dfd598f681ca2f3aba9683ea95d31b8d053295d5fd5cbe8c8cc7f56628a25b4eaf1a7149696b1611d6e1d84c
+  data.tar.gz: 6ef6506cb582b1620e4fa78b13b561b129076c208b2ca98993ea20c83faf77f12f2d28706dbac7a2cc944311133d585ce19b95dcd6cebfd44991b6f632de83fd

data/README.md

@@ -35,20 +35,20 @@ The theme was originally created for the yearly Winterkongress conference of the
   * [Open Graph Link Preview](#open-graph-link-preview)
   * [Main Landing Page](#main-landing-page)
   * [Information Boxes](#information-boxes)
-  * [Live Indications & Streaming](#live-indications---streaming)
+  * [Live Indications & Streaming](#live-indications--streaming)
   * [Map](#map)
   * [Talk Settings](#talk-settings)
   * [Speaker Settings](#speaker-settings)
   * [Location Settings](#location-settings)
   * [Program Settings](#program-settings)
 - [Content](#content)
-  * [Schedule / Program](#schedule---program)
+  * [Schedule / Program](#schedule--program)
   * [Talks](#talks)
   * [Speakers](#speakers)
   * [Rooms](#rooms)
   * [Links](#links)
 - [Overview Pages](#overview-pages)
-  * [Location / Room Overview](#location---room-overview)
+  * [Location / Room Overview](#location--room-overview)
   * [Live Stream Overview](#live-stream-overview)
   * [Additional Pages](#additional-pages)
 - [Design](#design)
@@ -590,7 +590,8 @@ Each talk is represented by a file in the `_talks/` directory. It must begin wit
 - the talk's `name` (used as identifier),
 - one or more existing `speakers` name(s),
 - optionally one or more `categories` of which one should be a main category as defined in the site's configuration,
-- optionally a list of `links` (see the _Links_ subsection below for the available properties per link; links with icons are treated separately and are also included on the talk overview page), and
+- optionally a list of `links` (see the _Links_ subsection below for the available properties per link; links with icons are treated separately and are also included on the talk overview page),
+- optionally a list of `live: links` (see the _Links_ subsection below for the available properties per link) which are shown below the live stream for the given talk in form of buttons, and
 - optionally `hide: true` if the talk's page should not be linked to.
 
 ### Speakers

data/_includes/js/conference-live.js

@@ -15,9 +15,9 @@ window.conference.live = (function() {
 
     let data;
 
-    let confStart = {{ conf_start }};
-    let confEnd = {{ conf_end }};
-    let confDur = confEnd - confStart;
+    const confStart = {{ conf_start }};
+    const confEnd = {{ conf_end }};
+    const confDur = confEnd - confStart;
 
     let freezeTime = false;
     let timeFrozen = 0;
@@ -34,34 +34,34 @@ window.conference.live = (function() {
     let streamVideoTimer;
     let streamInfoTimer;
 
-    let loadData = function () {
+    const loadData = function () {
         // Fetch schedule from external file
         $.getJSON('{{ site.baseurl }}/assets/js/data.json', function(json) {
             data = json;
         });
     };
 
-    let getData = function () {
+    const getData = function () {
         // Return data
         return data;
     };
 
-    let mod = function (n, m) {
+    const mod = function (n, m) {
         // Absolute modulo
         return ((n % m) + m) % m;
     };
 
-    let timeNow = function () {
+    const timeNow = function () {
         // Current timestamp in seconds
         return Math.floor(Date.now() / 1000);
     };
 
-    let timeCont = function () {
+    const timeCont = function () {
         // Continuous time (respecting previous pauses)
         return timeNow() - timeOffset;
     };
 
-    let timeCycle = function () {
+    const timeCycle = function () {
         // Cyclic timestamp in seconds
         let actTime = timeNow();
         let relTime = mod(actTime, durDemo + 2*durPause) / (durDemo + 2*durPause);
@@ -69,7 +69,7 @@ window.conference.live = (function() {
         return cycleTime;
     };
 
-    let time = function () {
+    const time = function () {
         // Return app time
         if (freezeTime) {
             return timeFrozen;
@@ -82,7 +82,7 @@ window.conference.live = (function() {
         }
     };
 
-    let pauseTime = function () {
+    const pauseTime = function () {
         // Pause app time
         if (!freezeTime) {
             timeFrozen = time();
@@ -92,7 +92,7 @@ window.conference.live = (function() {
         }
     };
 
-    let continueTime = function () {
+    const continueTime = function () {
         // Continue app time
         if (freezeTime) {
             freezeTime = false;
@@ -101,7 +101,7 @@ window.conference.live = (function() {
         }
     };
 
-    let resetTime = function () {
+    const resetTime = function () {
         // Reset app time
         timeOffset = 0;
         freezeTime = false;
@@ -109,7 +109,7 @@ window.conference.live = (function() {
         startUpdate();
     };
 
-    let setTime = function (newTime, newDay) {
+    const setTime = function (newTime, newDay) {
         // Set and pause app time
         pauseTime();
 
@@ -137,7 +137,7 @@ window.conference.live = (function() {
         update();
     };
 
-    let getTime = function () {
+    const getTime = function () {
         // Return app time as string
         let tConvert = time();
 
@@ -149,7 +149,7 @@ window.conference.live = (function() {
         return dStr +" "+ h +":"+ (m < 10 ? "0" : "") + m;
     };
 
-    let timeUnit = function () {
+    const timeUnit = function () {
         // App time refresh rate
         if (demo) {
             return 0.1;
@@ -159,7 +159,7 @@ window.conference.live = (function() {
         }
     };
 
-    let delayStart = function (startTime) {
+    const delayStart = function (startTime) {
         // Seconds until given startTime occurs
         let tNow = time();
         let tUnit = timeUnit();
@@ -179,18 +179,17 @@ window.conference.live = (function() {
         }
     };
 
-    let toggleDemo = function () {
-        // Toggle app demo mode
-        demo = !demo;
-        resetTime();
-    };
-
-    let demoOn = function () {
-        // Return app demo status
-        return demo;
+    let model = {
+        set demo(value) {
+            demo = value;
+            resetTime();
+        },
+        get demo() {
+            return demo;
+        }
     };
 
-    let updateLive = function () {
+    const updateLive = function () {
         // Update status all live elements in DOM
         let tNow = time();
         let liveShow = document.getElementsByClassName('live-show');
@@ -322,7 +321,7 @@ window.conference.live = (function() {
         }
     };
 
-    let startUpdateLive = function () {
+    const startUpdateLive = function () {
         // Start update timer to update live elements in DOM
         stopUpdateLive();
         updateLive();
@@ -339,7 +338,7 @@ window.conference.live = (function() {
         }
     };
 
-    let stopUpdateLive = function () {
+    const stopUpdateLive = function () {
         // stopUpdate update timer to update live elements in DOM
         if (typeof liveTimer !== "undefined") {
             clearInterval(liveTimer);
@@ -347,13 +346,13 @@ window.conference.live = (function() {
     };
 
     {% if site.conference.live.streaming -%}
-        let streamPause   = {{ site.conference.live.streaming.time_pause | default: 60 }};  // in minutes
-        let streamPrepend = {{ site.conference.live.streaming.time_prepend | default: 5 }};  // in minutes
-        let streamExtend  = {{ site.conference.live.streaming.time_extend | default: 5 }};  // in minutes
+        const streamPause   = {{ site.conference.live.streaming.time_pause | default: 60 }};  // in minutes
+        const streamPrepend = {{ site.conference.live.streaming.time_prepend | default: 5 }};  // in minutes
+        const streamExtend  = {{ site.conference.live.streaming.time_extend | default: 5 }};  // in minutes
 
         let streamModal;
 
-        let getRoom = function (roomName) {
+        const getRoom = function (roomName) {
             // Return room object for given room name
             if (roomName in data.rooms) {
                 return data.rooms[roomName];
@@ -363,7 +362,7 @@ window.conference.live = (function() {
             }
         };
 
-        let getTalks = function (roomName) {
+        const getTalks = function (roomName) {
             if (roomName in data.talks) {
                 return data.talks[roomName];
             }
@@ -372,7 +371,7 @@ window.conference.live = (function() {
             }
         };
 
-        let getNextTalk = function (roomName) {
+        const getNextTalk = function (roomName) {
             // Get talk object for next talk in given room
             let timeNow = time();
             let talksHere = getTalks(roomName);
@@ -389,7 +388,7 @@ window.conference.live = (function() {
             return false;
         };
 
-        let getNextPause = function (roomName) {
+        const getNextPause = function (roomName) {
             // Get time object for next pause in given room
             let timeNow = time();
             let talksHere = getTalks(roomName);
@@ -409,7 +408,7 @@ window.conference.live = (function() {
             return false;
         };
 
-        let setStreamIframeContent = function (content) {
+        const setStreamIframeContent = function (content) {
             // Set stream modal iframe to show given text
             streamModal.find('iframe').attr('src', '');
             streamModal.find('iframe').addClass('d-none');
@@ -417,14 +416,14 @@ window.conference.live = (function() {
             streamModal.find('#stream-placeholder').addClass('d-flex');
         };
 
-        let setStreamIframeSrc = function (href) {
+        const setStreamIframeSrc = function (href) {
             // Set stream modal iframe to show given URL
             streamModal.find('iframe').attr('src', href);
             streamModal.find('#stream-placeholder').addClass('d-none').removeClass('d-flex');
             streamModal.find('iframe').removeClass('d-none');
         };
 
-        let setStreamVideo = function (roomName) {
+        const setStreamVideo = function (roomName) {
             // Update stream modal iframe:
             // Show stream with start/pause/end message (for given room) and keep updated
             let timeNow = time();
@@ -504,7 +503,7 @@ window.conference.live = (function() {
             }
         };
 
-        let setStreamInfo = function (roomName) {
+        const setStreamInfo = function (roomName) {
             // Update stream modal info bar:
             // Show next talk and speaker (for given room) and keep updated
             let timeNow = time();
@@ -527,7 +526,7 @@ window.conference.live = (function() {
                 streamModal.find('#stream-info-talk').text(talkNext.name).attr('href', talkNext.href);
 
                 let speakerStr = '';
-                for (var i = 0; i < talkNext.speakers.length; i++) {
+                for (let i = 0; i < talkNext.speakers.length; i++) {
                     let speaker = data.speakers[talkNext.speakers[i]];
                     if (speaker.href == '') {
                         speakerStr += speaker.name +', '
@@ -539,6 +538,27 @@ window.conference.live = (function() {
                 speakerStr = speakerStr.slice(0, -2);
                 streamModal.find('#stream-info-speakers').html(speakerStr);
 
+                if (talkNext.live_links) {
+                    let linksStr = '';
+                    for (let i = 0; i < talkNext.live_links.length; i++) {
+                        const link = talkNext.live_links[i];
+
+                        linksStr += '<a href="' + link.href + '" class="btn btn-light m-1'
+                        if (link.disabled) {
+                            linksStr += ' disabled';
+                        }
+                        linksStr += '">';
+                        if (link.icon) {
+                            linksStr += '<i class="fas fa-' + link.icon + '"></i>&nbsp;';
+                        }
+                        linksStr += link.name + '</a>';
+                    }
+                    streamModal.find('#stream-info-links').html(linksStr).removeClass('d-none');
+                }
+                else {
+                    streamModal.find('#stream-info-links').addClass('d-none');
+                }
+
                 streamModal.find('#stream-info').removeClass('d-none');
 
                 if (!freezeTime) {
@@ -562,7 +582,7 @@ window.conference.live = (function() {
             }
         };
 
-        let setStream = function (roomName) {
+        const setStream = function (roomName) {
             // Update stream modal (iframe and info bar) for given room
             streamModal.find('.modal-footer .btn').removeClass('active');
             streamModal.find('#stream-select').val(0);
@@ -578,7 +598,7 @@ window.conference.live = (function() {
             streamModal.find('#stream-select').val(room.id);
         };
 
-        let updateStream = function () {
+        const updateStream = function () {
             // Update stream modal for currently active room button
             if (streamModal.hasClass('show')) {
                 let activeButton = streamModal.find('.modal-footer .btn.active');
@@ -590,7 +610,7 @@ window.conference.live = (function() {
             }
         };
 
-        let stopUpdateStream = function () {
+        const stopUpdateStream = function () {
             // Stop stream modal update timer
             if (typeof streamVideoTimer !== "undefined") {
                 clearInterval(streamVideoTimer);
@@ -600,14 +620,14 @@ window.conference.live = (function() {
             }
         };
 
-        let hideModal = function () {
+        const hideModal = function () {
             // Close stream modal
             streamModal.find('iframe').attr('src', '');
             streamModal.find('.modal-footer .btn').removeClass('active');
             streamModal.find('#stream-select').selectedIndex = -1;
         };
 
-        let setupStream = function () {
+        const setupStream = function () {
             // Setup events when modal opens/closes
             streamModal = $('#stream-modal');
 
@@ -638,43 +658,43 @@ window.conference.live = (function() {
             });
         };
 
-        let setup = function () {
+        const setup = function () {
             loadData();
             startUpdateLive();
             setupStream();
         };
 
-        let update = function () {
+        const update = function () {
             updateLive();
             updateStream();
         };
 
-        let startUpdate = function () {
+        const startUpdate = function () {
             startUpdateLive();
             updateStream();
         };
 
-        let stopUpdate = function () {
+        const stopUpdate = function () {
             stopUpdateLive();
             stopUpdateStream();
         };
 
     {%- else -%}
 
-        let setup = function () {
+        const setup = function () {
             loadData();
             startUpdateLive();
         };
 
-        let update = function () {
+        const update = function () {
             updateLive();
         };
 
-        let startUpdate = function () {
+        const startUpdate = function () {
             startUpdateLive();
         };
 
-        let stopUpdate = function () {
+        const stopUpdate = function () {
             stopUpdateLive();
         };
 
@@ -690,8 +710,7 @@ window.conference.live = (function() {
         setTime: setTime,
         getTime: getTime,
 
-        toggleDemo: toggleDemo,
-        demo: demoOn,
+        demo: model.demo,
         durDemo: durDemo,
         durPause: durPause
     };

data/_includes/partials/get_talk_timestamp.html

@@ -1,9 +1,9 @@
 {%- include partials/get_talk_time.html -%}
 
-{%- assign datetime_start = d.date | append: " " | append: time_start -%}
+{%- assign datetime_start = d.date | append: " " | append: talk_start -%}
 {%- assign add_days_start = talk_start_day | times: 24 | times: 60 | times: 60 -%}
 {%- assign timestamp_start = datetime_start | date: "%s" | plus: add_days_start | date: "%s" -%}
 
-{%- assign datetime_end = d.date | append: " " | append: time_end -%}
+{%- assign datetime_end = d.date | append: " " | append: talk_end -%}
 {%- assign add_days_end = talk_end_day | times: 24 | times: 60 | times: 60 -%}
 {%- assign timestamp_end = datetime_end | date: "%s" | plus: add_days_end | date: "%s" -%}

data/_includes/partials/modal_live.html

@@ -26,17 +26,18 @@
           </p>
           <p class="font-weight-light mb-0" id="stream-info-speakers"></p>
         </div>
+        <div class="align-self-center m-0 mt-1" id="stream-info-links"></div>
       </div>
 
       <div class="modal-footer justify-content-around">
-        {%- for room in site.rooms -%}
+        {% for room in site.rooms -%}
           <a id="stream-button{{ forloop.index }}" href="#" class="btn btn-outline-primary d-none d-sm-inline {% unless room.live %}disabled{% endunless %}" role="button" data-room="{{ room.name }}">
             {{ room.name }}
           </a>
         {%- endfor %}
         <div class="form-group w-100 d-block d-sm-none">
           <select class="form-control" id="stream-select">
-            {%- for room in site.rooms -%}
+            {% for room in site.rooms -%}
               <option value="{{ forloop.index }}" {% unless room.live %}disabled{% endunless %}>{{ room.name }}</option>
             {%- endfor %}
           </select>

data/_layouts/data.html

@@ -88,6 +88,23 @@
                         {%- include partials/get_talk_timestamp.html %}
                 "start": {{ timestamp_start }},
                 "end": {{ timestamp_end }}
+
+                        {%- if talk.live.links -%},
+                "live_links": [
+                            {%- for link in talk.live.links %}
+                    {
+                        "name": "{{ link.name | replace: '"', '\"' }}",
+                        "href": "{{ link.absolute_url | replace: '"', '%22' }}"
+                                {%- if link.icon -%},
+                        "icon": "{{ link.icon | replace: '"', '\"' }}"
+                                {%- endif %}
+                                {%- if link.disabled -%},
+                        "disabled": true
+                                {%- endif %}
+                    }{%- unless forloop.last -%},{%- endunless -%}
+                            {%- endfor %}
+                ]
+                        {%- endif %}
             }{%- unless forloop.last -%},{%- endunless -%}
                     {%- endfor -%}
                 {%- endif -%}

data/_layouts/stream-overview.html

@@ -18,7 +18,7 @@
   <div class="row">
       {%- endif %}
 
-    <div class="col-md">
+    <div class="col-md mb-4">
       <h3>{{ room.name }}</h3>
       <div class="embed-responsive embed-responsive-16by9">
         <iframe class="embed-responsive-item" src="{{ room.live }}" allowfullscreen></iframe>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Lorenz Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll