jekyll-theme-conference 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ebb94e878ab7f234d64b2a45c45153438c9e075251d9dda31bc12e670168f91
-  data.tar.gz: '0980a8034943452466ce56df8e81a76b4e0f1bb9f2d66fa9ad7a8028157cf6b8'
+  metadata.gz: 582dbe31f3df063b308b3f7b79002541cdde192973decc215a2c5d23c69cf4d1
+  data.tar.gz: bd427c637147fc3fc2e8c10cc89d8cd95fbb7bab18479837755b098d5ef45815
 SHA512:
-  metadata.gz: dfb07d4cad799e4c8e1d2742966b5dce78d586e2d73b359f6f5b8cffd6aacc7f8b510dbadeec3af407f92cd9801eae12edff14240ec81621e8c86de0abc77e93
-  data.tar.gz: b2381ce0e3e608130c37f55695e3c27af9980f3097359b6989ecb257bad158611bbfc00b61464835b48a3aadb9144e31077a3e4778ee6f746c953a1f20269bd0
+  metadata.gz: 38790049e46cd6beed99be5367ef0ebb475855695400a8475b809e35f898c32c9c3908a75dcb1b5b16802bc0b9694ff2450e34ea599bdb35e7fbfc4ac8ad7e4f
+  data.tar.gz: 66cc4df70435f6f0ccf6dc7601483d1c9b892b9e35d5447ecc6ed3303b86b6758c049fc3136c0e86a54652a6f6c6c23ccd35e69635ac4631a6356bde01ae21ff

data/_includes/js/conference-data.js

@@ -0,0 +1,87 @@
+let rooms = {
+    {%- for r in site.data.program -%}
+        {%- assign room = site.rooms | where: 'name', r.room | first -%}
+        {%- if room.live -%}
+
+            {%- assign t = r.talks | first -%}
+            {%- include partials/get_talk_time.html -%}
+            {%- assign time_start = talk_start -%}
+            {%- assign time_end = talk_end -%}
+            {%- include partials/get_timestamp.html -%}
+
+            {%- assign offset_start = site.conference.live.streaming.start_early | default: 0 -%}
+            {%- assign room_ts_start = offset_start | times: -60 | plus: timestamp_start -%}
+
+            {%- assign t = r.talks | last -%}
+            {%- include partials/get_talk_time.html -%}
+            {%- assign time_start = talk_start -%}
+            {%- assign time_end = talk_end -%}
+            {%- include partials/get_timestamp.html -%}
+
+            {%- assign offset_end = site.conference.live.streaming.end_late | default: 0 -%}
+            {%- assign room_ts_end = offset_end | times: 60 | plus: timestamp_end -%}
+
+            "{{ room.name }}": {
+                "id": {{ forloop.index }},
+                "name": "{{ room.name }}",
+                "href": "{{ room.live }}",
+                "start": {{ room_ts_start }},
+                "end": {{ room_ts_end }}
+            },
+        {%- endif -%}
+    {%- endfor -%}
+};
+
+let speakers = {
+    {%- for speaker in site.speakers -%}
+        "{{ speaker.name }}" : {
+            {%- if site.conference.speakers.show_firstname -%}
+                "name": "{{ speaker.first_name | append: ' ' | append: speaker.last_name }}",
+            {%- else -%}
+                "name": "{{ speaker.first_name | slice: 0 | append : '. ' | append: speaker.last_name }}",
+            {%- endif -%}
+            {%- if speaker.hide -%}
+                "href": "",
+            {%- else -%}
+                "href": "{{ speaker.url | prepend: site.baseurl }}",
+            {%- endif -%}
+        },
+    {%- endfor -%}
+};
+
+let talks = {
+    {%- for r in site.data.program -%}
+        {%- assign room = site.rooms | where: 'name', r.room | first -%}
+        {%- if room.live -%}
+            "{{ room.name | replace: '"', '\"' }}": [
+                {%- for t in r.talks -%}
+                    {%- assign talk = site.talks | where: 'name', t.name | first -%}
+                    {
+                        "name": "{{ talk.name | replace: '"', '\"' }}",
+
+                        {%- unless talk.hide -%}
+                            "href": "{{ talk.url | prepend: site.baseurl }}",
+                        {%- else -%}
+                            "href": "",
+                        {%- endunless -%}
+
+                        {%- include partials/get_main_category.html -%}
+                        "color": "{{ main_cat_color }}",
+
+                        "speakers": [
+                            {%- for speaker_name in talk.speakers -%}
+                                "{{ speaker_name}}",
+                            {%- endfor -%}
+                        ],
+
+                        {%- assign time_start = t.time_start -%}
+                        {%- assign time_end = t.time_end -%}
+                        {%- include partials/get_timestamp.html -%}
+                        "start": {{ timestamp_start }},
+                        "end": {{ timestamp_end }}
+                    },
+                {%- endfor -%}
+            ],
+        {%- endif -%}
+    {%- endfor -%}
+};

data/_includes/js/conference-live.js

@@ -8,6 +8,8 @@
     let confEnd = {{ timestamp_end }};
     let confDur = confEnd - confStart;
 
+    let talkAnnounce = 120;  // in minutes
+
     let freezeTime = false;
     let timeFrozen = 0;
     let timeOffset = 0;
@@ -21,6 +23,7 @@
 
     let liveTimer;
     let streamTimer;
+    let streamInfoTimer;
 
     let mod = function (n, m) {
         return ((n % m) + m) % m;
@@ -138,6 +141,8 @@
         let tNow = time();
         let liveShow = document.getElementsByClassName('live-show');
         let liveHide = document.getElementsByClassName('live-hide');
+        let liveTime = document.getElementsByClassName('live-time');
+        let livePast = document.getElementsByClassName('live-past');
 
         for (let i = 0; i < liveShow.length; i++) {
             let tStart = liveShow[i].dataset.start;
@@ -169,6 +174,84 @@
             }
         }
 
+        for (let i = 0; i < liveTime.length; i++) {
+            let t = liveTime[i].dataset.time;
+            if (typeof t == "undefined") {
+                break;
+            }
+            let tRel = tNow - t;
+
+            let tStr;
+            if (tRel >= -60 && tRel < 0) {
+                tStr = '{{ site.data.lang[site.conference.lang].live.time.soon | default: "soon" }}';
+            }
+            else if (tRel >= 0 && tRel < 60) {
+                tStr = '{{ site.data.lang[site.conference.lang].live.time.now | default: "now" }}';
+            }
+            else {
+                if (tRel < 0) {
+                    tStr = '{{ site.data.lang[site.conference.lang].live.time.in | default: "in" }} ';
+                }
+                else {
+                    tStr = '{{ site.data.lang[site.conference.lang].live.time.since | default: "since" }} ';
+                }
+                tRel = Math.abs(tRel);
+
+                let dWeeks = Math.floor(tRel / (7*24*60*60));
+                let dDays  = Math.floor(tRel / (24*60*60));
+                let dHours = Math.floor(tRel / (60*60));
+                let dMins  = Math.floor(tRel / (60));
+                if (dWeeks > 4) {
+                    break;
+                }
+                else if (dWeeks > 1) {
+                    tStr += dWeeks +' {{ site.data.lang[site.conference.lang].live.time.weeks | default: "weeks" }}';
+                }
+                else if (dWeeks == 1) {
+                    tStr += '1 {{ site.data.lang[site.conference.lang].live.time.week | default: "week" }}';
+                }
+                else if (dDays > 1) {
+                    tStr += dDays +' {{ site.data.lang[site.conference.lang].live.time.days | default: "days" }}';
+                }
+                else if (dDays == 1) {
+                    tStr += '1 {{ site.data.lang[site.conference.lang].live.time.day | default: "day" }}';
+                }
+                else if (dHours > 1) {
+                    tStr += dHours +' {{ site.data.lang[site.conference.lang].live.time.hours | default: "hours" }}';
+                }
+                else if (dHours == 1) {
+                    tStr += '1 {{ site.data.lang[site.conference.lang].live.time.hour | default: "hour" }}';
+                }
+                else if (dMins > 1) {
+                    tStr += dMins +' {{ site.data.lang[site.conference.lang].live.time.minutes | default: "minutes" }}';
+                }
+                else {
+                    tStr += '1 {{ site.data.lang[site.conference.lang].live.time.minute | default: "minute" }}';
+                }
+            }
+
+            liveTime[i].innerHTML = tStr;
+        }
+
+        for (let i = 0; i < livePast.length; i++) {
+            let t = livePast[i].dataset.time;
+            if (typeof t == "undefined") {
+                break;
+            }
+            let tRel = tNow - t;
+
+            if (tRel < 0) {
+                // Grey out when in past
+                if (!livePast[i].classList.contains('text-secondary')) {
+                    livePast[i].classList.add('text-secondary');
+                }
+            }
+            else {
+                // Show normal otherwise
+                livePast[i].classList.remove('text-secondary');
+            }
+        }
+
         if (tNow > confEnd && !demo) {
             // Cancel timer after program is over
             stopUpdateLive();
@@ -198,39 +281,7 @@
     };
 
     {% if site.conference.live.streaming -%}
-
-        let rooms = {
-            {%- for r in site.data.program -%}
-                {%- assign room = site.rooms | where: 'name', r.room | first -%}
-                {%- if room.live -%}
-
-                    {%- assign t = r.talks | first -%}
-                    {%- include partials/get_talk_time.html -%}
-                    {%- assign time_start = talk_start -%}
-                    {%- assign time_end = talk_end -%}
-                    {%- include partials/get_timestamp.html -%}
-
-                    {%- assign offset_start = site.conference.live.streaming.start_early | default: 0 -%}
-                    {%- assign room_ts_start = offset_start | times: -60 | plus: timestamp_start -%}
-
-                    {%- assign t = r.talks | last -%}
-                    {%- include partials/get_talk_time.html -%}
-                    {%- assign time_start = talk_start -%}
-                    {%- assign time_end = talk_end -%}
-                    {%- include partials/get_timestamp.html -%}
-
-                    {%- assign offset_end = site.conference.live.streaming.end_late | default: 0 -%}
-                    {%- assign room_ts_end = offset_end | times: 60 | plus: timestamp_end -%}
-
-                    "{{ room.name }}": {
-                        "id": {{ forloop.index }},
-                        "href": "{{ room.live }}",
-                        "start": {{ room_ts_start }},
-                        "end": {{ room_ts_end }}
-                    },
-                {%- endif -%}
-            {%- endfor -%}
-        };
+        {% include js/conference-data.js %}
 
         let streamModal;
 
@@ -251,7 +302,9 @@
             streamModal.find('#stream-placeholder > div').text('{{ site.data.lang[site.conference.lang].live.pre_stream | default: "Live stream has not started yet." }}');
             streamModal.find('#stream-placeholder').addClass('d-flex');
 
-            stopUpdateStream();
+            if (typeof streamTimer !== "undefined") {
+                clearInterval(streamTimer);
+            }
             if (!freezeTime) {
                 streamTimer = setTimeout(activeStream, delayStart(room.start) * 1000, roomName);
             }
@@ -264,7 +317,9 @@
             streamModal.find('#stream-placeholder').addClass('d-none').removeClass('d-flex');
             streamModal.find('iframe').removeClass('d-none');
 
-            stopUpdateStream();
+            if (typeof streamTimer !== "undefined") {
+                clearInterval(streamTimer);
+            }
             if (!freezeTime) {
                 streamTimer = setTimeout(postEndStream, delayStart(room.end) * 1000, roomName);
             }
@@ -278,17 +333,73 @@
             streamModal.find('#stream-placeholder > div').text('{{ site.data.lang[site.conference.lang].live.post_stream | default: "Live stream has ended." }}');
             streamModal.find('#stream-placeholder').addClass('d-flex');
 
-            stopUpdateStream();
+            if (typeof streamTimer !== "undefined") {
+                clearInterval(streamTimer);
+            }
             if (!freezeTime && demo) {
                 streamTimer = setTimeout(preStartStream, delayStart(demoStart) * 1000, roomName);
             }
         };
 
+        let setStreamInfo = function (roomName) {
+            let timeNow = time();
+            let talksHere = talks[roomName];
+            let talkNow;
+
+            if (typeof streamInfoTimer !== "undefined") {
+                clearInterval(streamInfoTimer);
+            }
+
+            if (typeof talksHere !== "undefined") {
+                if (timeNow < talksHere[talksHere.length-1].end) {
+                    for (var i = 0; i < talksHere.length; i++) {
+                        if (timeNow < talksHere[i].end && timeNow >= talksHere[i].start - talkAnnounce*60) {
+                            talkNow = talksHere[i];
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (typeof talkNow !== "undefined") {
+                document.getElementById('stream-info').dataset.time = talkNow.start;
+                document.getElementById('stream-info-time').dataset.time = talkNow.start;
+                updateLive();
+
+                streamModal.find('#stream-info-color').addClass('border-soft-' + talkNow.color);
+
+                streamModal.find('#stream-info-talk').text(talkNow.name).attr('href', talkNow.href);
+
+                let speakerStr = '';
+                for (var i = 0; i < talkNow.speakers.length; i++) {
+                    let speaker = speakers[talkNow.speakers[i]];
+                    if (speaker.href == '') {
+                        speakerStr += speaker.name +', '
+                    }
+                    else {
+                        speakerStr += '<a class="text-reset" href="'+ speaker.href +'">'+ speaker.name +'</a>, ';
+                    }
+                }
+                speakerStr = speakerStr.slice(0, -2);
+                streamModal.find('#stream-info-speakers').html(speakerStr);
+
+                streamModal.find('#stream-info').removeClass('d-none');
+
+                if (!freezeTime) {
+                    streamInfoTimer = setTimeout(setStreamInfo, delayStart(talkNow.end) * 1000, roomName);
+                }
+            }
+            else {
+                streamModal.find('#stream-info').addClass('d-none');
+            }
+        };
+
         let setStream = function (roomName) {
             streamModal.find('.modal-footer .btn').removeClass('active');
             streamModal.find('#stream-select').selectedIndex = -1;
 
             let room = getRoom(roomName);
+            roomName = room.name;
             let tNow = time();
 
             if (tNow < room.start) {
@@ -300,6 +411,7 @@
             else {
                 activeStream(roomName);
             }
+            setStreamInfo(roomName);
 
             streamModal.find('#stream-button' + room.id).addClass('active');
             streamModal.find('#stream-select').selectedIndex = room.id;
@@ -320,6 +432,9 @@
             if (typeof streamTimer !== "undefined") {
                 clearInterval(streamTimer);
             }
+            if (typeof streamInfoTimer !== "undefined") {
+                clearInterval(streamInfoTimer);
+            }
         };
 
         let hideModal = function (event) {

data/_includes/partials/checks.html

@@ -4,7 +4,7 @@
   {% unless site.conference.lang == "en" %}
     {% assign errors = errors | push : "The internationalization file containing different strings for this template seems to be missing. Have you copied the `_data/lang.yml` file from the [theme's repository](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/blob/master/_data/lang.yml) to you local website folder?" %}
   {% endunless %}
-{% elsif site.data.lang.version < 3 %}
+{% elsif site.data.lang.version < 4 %}
   {% assign errors = errors | push : "The internationalization file in `_data/lang.yml` seems to be outdated and does not correspond to the current version of the theme. Grab the current version from the [theme's repository](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/blob/master/_data/lang.yml)." %}
 {% endunless %}
 {% unless site.conference.lang == "en" or site.conference.lang == "de" or site.conference.lang == "fr" or site.conference.lang == "pt" %}

data/_includes/partials/footer.html

@@ -25,7 +25,8 @@
     {% include partials/live-modal.html %}
   {% endif %}
 
-  <script src="{{ site.baseurl }}/assets/js/main.js"></script>
+  <!-- Append build time to avoid caching of live program embedded in JavaScript file -->
+  <script src="{{ site.baseurl }}/assets/js/main.js?t={{ site.time | date: "%s" }}"></script>
 
 </body>
 </html>

data/_includes/partials/live-modal.html

@@ -1,6 +1,7 @@
 <div class="modal fade" id="stream-modal" tabindex="-1" role="dialog" aria-labelledby="link-modal-label" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
     <div class="modal-content">
+
       <div class="modal-header">
         <h5 class="modal-title">
           {{ site.data.lang[site.conference.lang].live.streaming | default: "Live Stream" }}
@@ -9,12 +10,24 @@
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
+
       <div class="modal-body embed-responsive embed-responsive-16by9">
         <iframe class="embed-responsive-item" src="" allowfullscreen></iframe>
         <div id="stream-placeholder" class="embed-responsive-item d-none justify-content-center align-items-center">
           <div></div>
         </div>
       </div>
+
+      <div class="modal-footer flex-column justify-content-start d-none live-past" id="stream-info" data-time="">
+        <div class="my-0 small align-self-start live-time" id="stream-info-time" data-time=""></div>
+        <div class="pl-3 align-self-start" id="stream-info-color">
+          <p class="mb-0">
+            <a class="text-reset" href="#" id="stream-info-talk"></a>
+          </p>
+          <p class="font-weight-light mb-0" id="stream-info-speakers"></p>
+        </div>
+      </div>
+
       <div class="modal-footer justify-content-around">
         {% for r in site.data.program %}
           {% assign room = site.rooms | where: 'name', r.room | first %}
@@ -32,6 +45,7 @@
           </select>
         </div>
       </div>
+
     </div>
   </div>
 </div>

data/_layouts/delete_hidden.html

@@ -1,25 +1,25 @@
 #!/usr/bin/env bash
 
 {% if site.conference.location.hide -%}
-rm -r rooms
-rm -r {{ site.conference.location.url | default: "location" }}
+rm -r _site/rooms
+rm -r _site/{{ site.conference.location.url | default: "location" }}
 {% else -%}
 {%- for room in site.rooms -%}
 {%- if room.hide -%}
-rm -r {{ room.url | slice: 1, room.url.size }}
+rm -r _site/{{ room.url | slice: 1, room.url.size }}
 {% endif -%}
 {%- endfor -%}
 {%- endif -%}
 
 {%- for speaker in site.speakers -%}
 {%- if speaker.hide -%}
-rm -r {{ speaker.url | slice: 1, speaker.url.size }}
+rm -r _site/{{ speaker.url | slice: 1, speaker.url.size }}
 {% endif -%}
 {%- endfor -%}
 
 {%- for talk in site.talks -%}
 {%- if talk.hide -%}
-rm -r {{ talk.url | slice: 1, talk.url.size }}
+rm -r _site/{{ talk.url | slice: 1, talk.url.size }}
 {% endif -%}
 {%- endfor %}
-rm delete_hidden.sh
+rm _site/delete_hidden.sh

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Lorenz Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -62,6 +62,7 @@ files:
 - LICENSE.md
 - README.md
 - _includes/js/bootstrap.js
+- _includes/js/conference-data.js
 - _includes/js/conference-live.js
 - _includes/js/conference-map.js
 - _includes/js/conference-modal.js