jekyll-theme-conference 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91444cf0a7c14c4e1d4a10547c95fd9c6a10b176db297a2071830f2a634052c0
-  data.tar.gz: 5c16b5f374876f5bde05ff91c0e121133843f31ad42701ef8336b523933101ba
+  metadata.gz: d6dfd46bcf846b9381cf7a9f0b88a063339e1ba62ca33bfd979c56b2ffb20621
+  data.tar.gz: 9d6fb33e2b5d0c1c690af32947d7c93f8ae3003f78b0c179d28ed7e3dfe825c9
 SHA512:
-  metadata.gz: c2e410318beee836c5d3371185d5e5386f24a28c34061eeb0fc407ec68715326e55f9344021b93c2ded7631df376c45723fbeac84a3e7ae9c5f7a781e981abcc
-  data.tar.gz: a3a3fefe3e080e42fdf24923fe36189593aeaafd87a2e90624ce42a2fa6ba766a5436201cbb63a5e7b34fba71ea695e05a9ddbadf13352fddc4792c8423444f9
+  metadata.gz: 8b8ace8e151d2bac7f2a4f2624f8ab947cbb255c4c40de094e60ebb0205d87a5047bb33de6faea4deff3276ba6e6d0cea9f1bc920c0bacbc7946bcf999a251de
+  data.tar.gz: 96ee3c142c692447badd23a59244614d272f34ff86092fbe138465ac4257484de610ea3b2db9718b4fe7fbe7ff8179d7e69969818e1eba947c58cf3b7a7cfbb5

data/README.md

@@ -165,7 +165,7 @@ There exists a Python file in this repository, `_tools/create_entries.py`, which
 
 In case you do not want to install the entire Ruby/Jekyll toolchain on your machine you can make use of [GitHub Actions](https://github.com/features/actions), Github's continuous integration platform. This repository contains multiple example Github Action configuration files in the `_tools/` folder:
 
-- `build.yml`: automatically builds and minimizes the website upon adding a new tag starting with a `v` (e.g. `v2020.01.01`). It then attaches the generated website as an archive to a release for easy downloading.
+- `build.yml`: automatically builds and minimizes the website upon adding a new tag starting with a `v` (e.g. `v2020.01.01`). It then attaches the generated website as an archive to a release for easy downloading. Requires `purgecss.config.js` to be copied to the project's root too.
 - `test.yml`: automatically tries to build the website upon a new pull request. It can thus be used as status check before merging.
 - `schedule.yml`: automatically generates the schedule and content files when a new pull request contains a `schedule.json` file (see the _Automatic Import_subsection above). Thus, it allows quick updates of the site's content from [pretalx.com](https://pretalx.com/p/about/) exports.
 

data/_includes/js/conference-live.js

@@ -363,12 +363,21 @@ window.conference.live = (function() {
             }
         };
 
+        let getTalks = function (roomName) {
+            if (roomName in data.talks) {
+                return data.talks[roomName];
+            }
+            else {
+                return false;
+            }
+        };
+
         let getNextTalk = function (roomName) {
             // Get talk object for next talk in given room
             let timeNow = time();
-            let talksHere = data.talks[roomName];
+            let talksHere = getTalks(roomName);
 
-            if (typeof talksHere !== "undefined") {
+            if (talksHere) {
                 if (timeNow < talksHere[talksHere.length-1].end) {
                     for (var i = 0; i < talksHere.length; i++) {
                         if (timeNow < talksHere[i].end) {
@@ -383,9 +392,9 @@ window.conference.live = (function() {
         let getNextPause = function (roomName) {
             // Get time object for next pause in given room
             let timeNow = time();
-            let talksHere = data.talks[roomName];
+            let talksHere = getTalks(roomName);
 
-            if (typeof talksHere !== "undefined") {
+            if (talksHere) {
                 if (timeNow < talksHere[talksHere.length-1].end) {
                     for (var i = 1; i < talksHere.length; i++) {
                         if (timeNow < talksHere[i].start && streamPause*60 <= talksHere[i].start - talksHere[i-1].end) {
@@ -420,9 +429,29 @@ window.conference.live = (function() {
             // Show stream with start/pause/end message (for given room) and keep updated
             let timeNow = time();
 
-            let talksHere = data.talks[roomName];
-            let roomStart = talksHere[0].start;
-            let roomEnd = talksHere[talksHere.length-1].end;
+            let talksHere = getTalks(roomName);
+            let roomStart, roomEnd;
+            if (talksHere) {
+                roomStart = talksHere[0].start;
+                roomEnd = talksHere[talksHere.length-1].end;
+            }
+            else {
+                // If no program for given room, take overall first and last talk
+                roomStart = 0;
+                roomEnd = 0;
+                for (let roomNameTalk in data.talks) {
+                    talksHere = getTalks(roomNameTalk);
+                    let crntRoomStart = talksHere[0].start;
+                    let crntRoomEnd = talksHere[talksHere.length-1].end;
+
+                    if (roomStart == 0 || roomStart > crntRoomStart) {
+                        roomStart = crntRoomStart;
+                    }
+                    if (roomEnd == 0 || roomEnd < crntRoomEnd) {
+                        roomEnd = crntRoomEnd;
+                    }
+                }
+            }
 
             if (typeof streamVideoTimer !== "undefined") {
                 clearInterval(streamVideoTimer);
@@ -485,7 +514,7 @@ window.conference.live = (function() {
                 clearInterval(streamInfoTimer);
             }
 
-            if (timeNow >= talkNext.start - streamPause*60) {
+            if (talkNext && timeNow >= talkNext.start - streamPause*60) {
                 document.getElementById('stream-info').dataset.time = talkNext.start;
                 document.getElementById('stream-info-time').dataset.time = talkNext.start;
                 updateLive();
@@ -524,8 +553,10 @@ window.conference.live = (function() {
                         streamInfoTimer = setTimeout(setStreamInfo, delayStart(talkNext.start - streamPause*60) * 1000, roomName);
                     }
                     else if (demo) {
-                        let talksHere = data.talks[roomName];
-                        streamInfoTimer = setTimeout(setStreamInfo, delayStart(talksHere[0].start - streamPrepend*60) * 1000, roomName);
+                        let talksHere = getTalks(roomName);
+                        if (talksHere) {
+                            streamInfoTimer = setTimeout(setStreamInfo, delayStart(talksHere[0].start - streamPrepend*60) * 1000, roomName);
+                        }
                     }
                 }
             }

data/_layouts/data.html

@@ -12,13 +12,19 @@
     ],
 
     "rooms": {
+    {%- assign first_room = true -%}
     {%- for room in site.rooms %}
-        {%- if room.live %}
+        {%- if room.live -%}
+            {%- unless first_room -%}
+                ,
+            {%- else -%}
+                {%- assign first_room = false -%}
+            {%- endunless %}
         "{{ room.name }}": {
             "id": {{ forloop.index }},
             "name": "{{ room.name }}",
             "href": "{{ room.live }}"
-        }{%- unless forloop.last -%},{%- endunless %}
+        }
         {%- endif -%}
     {%- endfor %}
     },
@@ -41,18 +47,24 @@
     },
 
     "talks": {
+    {%- assign first_room = true -%}
     {%- for room in site.rooms -%}
-        {%- assign room_has_talks = false %}
+        {%- assign first_talk = true -%}
         {%- for d in site.data.program.days -%}
             {%- for r in d.rooms -%}
                 {%- if room.name == r.name and room.live %}
 
-                    {%- unless room_has_talks %}
+                    {%- if first_talk -%}
+                        {%- unless first_room -%}
+                            ,
+                        {%- else -%}
+                            {%- assign first_room = false -%}
+                        {%- endunless %}
         "{{ room.name | replace: '"', '\"' }}": [
-                        {%- assign room_has_talks = true %}
+                        {%- assign first_talk = false %}
                     {%- else -%}
                         ,
-                    {%- endunless -%}
+                    {%- endif -%}
 
                     {%- for t in r.talks %}
                         {%- assign talk = site.talks | where: 'name', t.name | first %}
@@ -82,9 +94,9 @@
             {%- endfor -%}
         {%- endfor -%}
 
-        {%- if room_has_talks %}
-        ]{%- unless forloop.last -%},{%- endunless -%}
-        {%- endif -%}
+        {%- unless first_talk %}
+        ]
+        {%- endunless -%}
     {%- endfor %}
     }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Lorenz Schmid