jekyll-theme-conference 2.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85035d6385b1339b58d26c9aa7656bb63c390e82e59b995a954b032bda281b61
-  data.tar.gz: 6cde36017cc9d2b667ea921edcb6ed8938fea8cf63b87169f2ea8399b0e42b53
+  metadata.gz: b4319ed637aa4734e12cd0d9eef3a807f314e8a9e4c0ff3a79b8781e8e00ebb9
+  data.tar.gz: d0c52c4aa84e87fb5c9892b6509db3de79a640e2e3ad005359febda835c412be
 SHA512:
-  metadata.gz: 6ee86daa817de1f8ce650b73c8a1116a28293307da1cfe10abd775331251d88af1a33e6dbc425011cf5d4358e89978e2601cf5eaf35c22874222715f170c0a88
-  data.tar.gz: 93606208e131a2d476732a828248cbdc7d58cf28ed0e6e678a585d677e18b6939721a6ca099a1f7805e0b431e2585989168aed5e45f009f7d35780b498d615ba
+  metadata.gz: 849e5facbe864d96c63fcdcd218ee4a4a4d8e63a9787aca58c10b1fafdf20704ce3d529caa519940ae65bd3a561ffc6127f2da243a823e676604b538e2f24c35
+  data.tar.gz: 5bca6a3b8624e8e8f04797292cc969dd2f995fb74ffedd178dee2d59b0410cd93d1dd5479d8c64cdc99728ca7160e05c31e9537a93866093ed88bd65142e0a03

data/README.md

@@ -2,14 +2,16 @@
 
 ![Screenshot](screenshot.png)
 
-This is a [Jekyll](http://jekyllrb.com) theme based on [Bootstrap 4](http://getbootstrap.com) which can be used to make a simple, responsive website for a one-day conference or workshop with parallel tracks containing:
+This is a responsive [Jekyll](http://jekyllrb.com) theme based on [Bootstrap 4](http://getbootstrap.com) for conferences. It contains
 
-- program / schedule
-- talk and speaker descriptions
-- map for directions
+- multiday program / schedule,
+- talk and speaker descriptions,
+- map for directions,
+- realtime live indications during the conference, and
+- supports embedded video streaming or recordings.
 
-All components such as talks, speakers or rooms are represented as collection of files. The schedule is given is defined via a simple structure stored in a [YAML](https://en.wikipedia.org/wiki/YAML) file. There is no need for databases and once generated the website consists only of static files.
-The design is easily modifiable and is adapted for mobile uses and printing.
+All components such as talks, speakers or rooms are represented as collection of files. The schedule is given is defined via a simple structure stored in a [YAML](https://en.wikipedia.org/wiki/YAML) file. There is no need for databases and once generated the website consists only of static files. A script and workflows are available for easy import, e.g. of [frab](https://github.com/frab/frab/wiki/Manual#introduction) compatible schedules.
+The design is easily customizable and is adapted for mobile uses and printing.
 
 The theme was originally created for the yearly Winterkongress conference of the [Digital Society Switzerland](https://digitale-gesellschaft.ch/). You can see this theme in action here:
 
@@ -44,11 +46,7 @@ This allows for easier installation and updating as you don't have to manage any
    theme: jekyll-theme-conference
    ```
 
-4. Copy the internationalization file containing the different language strings for this repository to your Jekyll folder:
-
-   - `_data/lang.yml`
-
-5. Continue with the _Setup_ section further below to customize the theme and add some content for your conference
+4. Continue with the _Setup_ section further below to customize the theme and add some content for your conference
 
 To update the theme run `bundle update`.
 
@@ -76,11 +74,7 @@ To install:
 
 4. Add `remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@2.0.0"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
 
-5. Copy the internationalization file containing the different language strings for this repository to your Jekyll folder:
-
-   - `_data/lang.yml`
-
-6. Continue with the _Setup_ section further below to customize the theme and add some content for your conference
+5. Continue with the _Setup_ section further below to customize the theme and add some content for your conference
 
 
 ## Setup
@@ -89,6 +83,10 @@ The different talks, speakers and rooms are stored as a collection of files. Eac
 
 The actual schedule defining when and in which room a talk takes place is stored as a [YAML data file](https://jekyllrb.com/docs/datafiles/) under `_data/program.yml`. For further details about it see below in the section _Content_.
 
+:warning: Please note that the generated website can be quite large containing many unnecessary whitespaces. It is recommended to minimize the generated output files before uploading them to a server (e.g. with [minify](https://github.com/tdewolff/minify)).
+
+### Jump Start
+
 In order to be up and running simply use the default content of this repository as an initial base for your new website. After having setup a new Jekyll website copy the following files and folders into the website's folder:
 
 - `_config.example.yml` -> `_config.yml`
@@ -102,11 +100,43 @@ In order to be up and running simply use the default content of this repository
 - `speakers/`
 - `talks/`
 
-There exists a Python file in this repository, `create_entries.py`, which can be used to import content from a CSV table and generate the different talk, speakers and room files automatically based on it. Just open your terminal and type `python create_entries.py --help` to show the help and get started.
+### Automatic Import
+
+There exists a Python file in this repository, `_tools/create_entries.py`, which can be used to import content from a [frab](https://github.com/frab/frab/wiki/Manual#introduction) compatible JSON file (e.g. from [pretalx.com](https://pretalx.com/p/about/)) or a CSV table and generate the different talk, speakers and room files automatically. It has as only dependency [PyYAML](https://pypi.org/project/PyYAML/):
+
+1. Copy the file `_tools/create_entries.py` from this repository
 
-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 an example Github Action configuration file which automatically builds the website upon adding a new tag. It then attaches the generated website as package to a release for easy downloading. Simply copy the following file to your repository and adapt it to your needs:
+2. Create a virtual environment and activate it
 
-- `workflows.example.yml` -> `.github/workflows.main.yml`
+   ```bash
+   python -m venv venv
+   source venv/bin/activate
+   ```
+
+3. Install PyYAML
+
+   ```bash
+   pip install pyyaml
+   ```
+
+4. Execute the script, e.g. to show the help type
+
+   ```bash
+   python _tools/create_entries.py --help
+   ```
+
+
+### Automatic Build
+
+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.
+- `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.
+
+To get started, simply copy the desired workflow file to your repository and adapt it to your needs:
+
+- `_tools/build.yml` -> `.github/workflows/build.yml`
 
 
 ## Configuration
@@ -124,6 +154,8 @@ conference:
   show_errors: false
 ```
 
+:warning: Please be sure to disable this parameter for your production system.
+
 ### Collection URLs
 
 The three required collections containing the files for the talks, speakers and rooms have to be specified in the `_config.yml` file. The first block declares them and sets the URL under which they will later be accessed. The second block defines the default layout for each of the collection.
@@ -183,11 +215,6 @@ conference:
 
 The navigation bar is located at the top and visible on every site. On the right it show the title of the website (`site.title`) followed by the links listed under the `links` property of the `navigation` property. See the _Content_ > _Links_ section below for the available properties per link.
 
-Additionally, a navigation bar link can also have the following properties:
-
-- `menu` containing another list of links. This creates a dropdown menu of multiple sublinks. The sublinks have the same properties as regular links (see the _Content_ > _Links_ section), or
-- `live` making the link only visible during the conference and adds a live indication. The `name` property can be omitted. If streaming is enabled and any URL property is omitted, a click on the link will open the streaming modal (see section _Live Indications_ below).
-
 Example:
 
 ```yaml
@@ -294,21 +321,23 @@ In order to help users navigating the program during the congress, a _Live_ indi
 
 This can be further extended if some of the talks have an associated live stream: Upon clicking one of the live indications a modal will open containing the corresponding live stream embedded. The URL to the live stream has to be set via `live` property in each room (see the _Content_ > _Room_ section below).
 
-In order to activate the functionality the `live` property has to be set containing
+In order to activate the functionality, each day in the `program.yml` file must contain a `date` property (see section _Content_ > _Schedule / Program_ below) and the `live` property has to be set in the configuration file containing
 
-- the date of the day at which the conference takes place (`date`),
-- the timezone in which the conference takes place (`timezone`),
-- optionally if streaming is enabled (`streaming`) with indications how many minutes early the stream will begin and end, and
+- how long a pause between two consecutive talks has to be for the live indication to pause (`time_stop`),
+- optionally if streaming is enabled (`streaming`) with indications
+  + how many minutes the stream goes active before a talk (`time_prepend`),
+  + how many minutes the stream stays active after a talk (`time_extend`), and
+  + how long a pause between two consecutive talks has to be for the stream to pause (`time_pause`),
 - optionally a demo mode setting, whereby the JavaScript function cycles through the entire program in five minutes for demonstration purposes (`demo: true`, default: `false`).
 
 ```yaml
 conference:
   live:
-    date: 01.01.2020
-    timezone: GMT+1
+    time_stop: 240      # in minutes
     streaming:
-      start_early: 15  # in minutes
-      end_late:     0  # in minutes
+      time_pause:   60  # in minutes
+      time_prepend:  5  # in minutes
+      time_extend:   5  # in minutes
     demo: false
 ```
 
@@ -430,33 +459,52 @@ The actual schedule defining when and in which room a talk takes place is stored
 
 ### Schedule / Program
 
-The schedule of the conference linking the talks with the rooms and indicating when each talk talks place and how long it goes is set in the `_data/program.yml` file. It consists of an array of rooms each consisting of a
+The schedule of the conference linking the talks with the rooms and indicating when each talk talks place and how long it goes is set in the `_data/program.yml` file. It contains a list of days, whereby each day contains a list of rooms, whereby each room contains a list of talks.
+
+Each day consists of
 
-- `room` name (must correspond to one of the room identifier), and
-- an array of `talks` which also can be empty `[]`.
+- a list of rooms (`rooms`) in which talks are taking place on that day
+- optionally, the day's `name`, e.g. the weekday
+- optionally, the short form of the day's name (`abbr`), and
+- optionally only if no live indications are active, a `date` in the format `YYYY-MM-DD`.
 
-The order of the room in the file defines the order of the rooms on the website (program and room listings). Each talk in the array consists of
+Each room consists of
+
+- the room's `name` (must correspond to one of the room identifier), and
+- a list of talks (`talks`) which also can be empty `[]`.
+
+The order of the rooms in the list defines the order of the rooms as shown in the schedule on the program page. For the live streaming or the room overview the order of the rooms is alphabetical but can be adapted via the [main configuration file](https://jekyllrb.com/docs/collections/#sort-by-front-matter-key).
+
+Each talk consists of
 
 - a `name` (must correspond to one of the talk identifier),
 - a starting time `time_start` given as `H:M` ([`strftime`](http://www.strfti.me) formated), and
 - an end time `time_end`.
 
-The array should (manually) be ordered by time. Currently talks can only take place on the same day and multi-day conferences are not supported.
+The list of talks should (manually) be ordered by time, i.e. the first occurring talk should be listed first.
 
 Example:
 
 ```yaml
-- room: Room A
-  talks:
-    - name: Vim Impetus Placerat Cotidieque Ad
-      time_start: '12:00'
-      time_end: '12:45'
-    - name: Condimentum Vitae Sapien Pellentesque
-      time_start: '12:45'
-      time_end: '13:30'
-- room: Room B
-  talks:
-    ...
+days:
+- name: Monday
+  abbr: Mo
+  date: 2020-01-31
+  rooms:
+  - name: Room A
+    talks:
+      - name: Vim Impetus Placerat Cotidieque Ad
+        time_start: '12:00'
+        time_end: '12:45'
+      - name: Condimentum Vitae Sapien Pellentesque
+        time_start: '12:45'
+        time_end: '13:30'
+
+  - name: Room B
+    talks:
+      - name: Arcu Non Odio
+        time_start: '12:00'
+        time_end: '13:00'
 ```
 
 ### Talks
@@ -501,6 +549,11 @@ Links are used at different location throughout the theme: They can either be us
   + pointing to a file uploaded to the `/documents` folder (for talks `/documents/slides`, for speakers `/documents/bio`): `file:`
   + pointing to an external video: `video:`
 
+Additionally, a navigation bar or main landing page link can also have the following properties:
+
+- `menu` containing another list of links. This creates a dropdown menu of multiple sublinks. The sublinks have the same properties as regular links, or
+- `live` making the link only visible during the conference and adds a live indication. The `name` property can be omitted. If streaming is enabled and any URL property is omitted, a click on the link will open the streaming modal (see section _Live Indications_ above).
+
 Using the `file:` indicator, the relative address is automatically set as well as the icon. Using the `video:` indicator, the link is automatically configured to open in an iframe with a corresponding title and the icon is set.
 
 Example:

data/_includes/js/conference-live.js

@@ -1,11 +1,21 @@
 window.conference.live = (function() {
-    {%- include partials/get_conf_time.html -%}
-    {%- assign time_start = conf_start -%}
-    {%- assign time_end = conf_end -%}
-    {%- include partials/get_timestamp.html -%}
+    {% assign d = site.data.program.days | first -%}
+    {%- include partials/get_day_time.html -%}
+    {%- assign t = day_start_talk -%}
 
-    let confStart = {{ timestamp_start }};
-    let confEnd = {{ timestamp_end }};
+    {%- include partials/get_talk_timestamp.html -%}
+    {%- assign conf_start = timestamp_start -%}
+
+    {%- assign d = site.data.program.days | last -%}
+    {%- include partials/get_day_time.html -%}
+    {%- assign t = day_end_talk -%}
+
+    {%- include partials/get_talk_timestamp.html -%}
+    {%- assign conf_end = timestamp_end -%}
+
+    let confStart = {{ conf_start }};
+    let confEnd = {{ conf_end }};
+    let confDur = confEnd - confStart;
 
     let freezeTime = false;
     let timeFrozen = 0;
@@ -15,250 +25,509 @@ window.conference.live = (function() {
     let durDemo  = 5*60; // in seconds
     let durPause =   10; // in seconds
 
+    let demoStart = confStart - confDur/durDemo*durPause;
+    let demoEnd = confEnd + confDur/durDemo*durPause;
+
     let liveTimer;
-    let liveTimerCorr;
+    let streamVideoTimer;
+    let streamInfoTimer;
+
+    let mod = function (n, m) {
+        return ((n % m) + m) % m;
+    };
 
-    let timeNowReal = function () {
-        // Return UNIX timestamp in seconds
+    let timeNow = function () {
         return Math.floor(Date.now() / 1000);
     };
 
-    let timeNowCycle = function() {
-        // Cycle time over program for a fixed duration
-        let relTime = (Math.floor(Date.now() / 1000) % durDemo - durPause) / (durDemo - 2*durPause);
-        let cycleTime = (confEnd - confStart) * relTime + confStart;
+    let timeCont = function () {
+        return timeNow() - timeOffset;
+    };
+
+    let timeCycle = function () {
+        let actTime = timeNow();
+        let relTime = mod(actTime, durDemo + 2*durPause) / durDemo;
+        let cycleTime = mod((demoEnd - demoStart) * relTime - timeOffset, (demoEnd - demoStart)) + demoStart;
         return cycleTime;
     };
 
-    let timeNow = function() {
+    let time = function () {
         if (freezeTime) {
             return timeFrozen;
         }
         else if (demo) {
-            return timeNowCycle() - timeOffset;
+            return timeCycle();
         }
         else {
-            return timeNowReal() - timeOffset;
+            return timeCont();
         }
     };
 
     let pauseTime = function () {
-        timeFrozen = timeNow();
-        freezeTime = true;
+        if (!freezeTime) {
+            timeFrozen = time();
+            freezeTime = true;
+
+            stopUpdate();
+        }
     };
 
     let continueTime = function () {
-        if (demo) {
-            timeOffset = timeNowCycle() - timeFrozen;
-        }
-        else {
-            timeOffset = timeNow() - timeFrozen;
+        if (freezeTime) {
+            freezeTime = false;
+            timeOffset += time() - timeFrozen;
+            startUpdate();
         }
-        freezeTime = false;
     };
 
     let resetTime = function (timeStr) {
-        continueTime();
         timeOffset = 0;
+        freezeTime = false;
+
+        startUpdate();
     };
 
-    let setTime = function (timeStr) {
+    let setTime = function (newTime, newDay=1) {
         pauseTime();
 
-        let d = new Date(timeNow() * 1000);
-        time = timeStr.split(':');
-        d.setHours(time[0], time[1]);
+        let dayIdx;
+        if (Number.isInteger(newDay)) {
+            dayIdx = newDay-1;
+        }
+        else if (/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/.test(newDay)) {
+            dayIdx = data.days.find(o => o.name === newDay);
+        }
+        else {
+            dayIdx = data.days.find(o => o.name === newDay);
+        }
+        newDate = data.days[dayIdx].date;
+
+        let d = new Date(newDate);
+        newTime = newTime.split(':');
+        d.setHours(newTime[0], newTime[1]);
 
         timeFrozen = Math.floor(d.getTime() / 1000);
+
+        update();
     };
 
-    let getTime = function () {
-        let d = new Date(timeNow() * 1000);
+    let getTime = function (tConvert=time()) {
+        let d = new Date(tConvert * 1000);
+        let dStr = d.toISOString().slice(0,10);
         let h = d.getHours();
         let m = d.getMinutes();
 
-        return h + ":" + (m < 10 ? "0" : "") + m;
+        return dStr +" "+ h +":"+ (m < 10 ? "0" : "") + m;
     };
 
-    let timeStart = function () {
-        let tNow = timeNow();
-        if (confStart - 60 > tNow) {
-            // Start when conference start (-60s)
-            return confStart - 60 - tNow;
+    let timeUnit = function () {
+        if (demo) {
+            return 0.1;
         }
         else {
-            // Start on the minute
-            return (60 - (tNow % 60));
+            return 60;
         }
     };
 
-    let updateLiveButtons = function() {
-        let tNow = timeNow();
+    let delayStart = function (startTime) {
+        let tNow = time();
+        let tUnit = timeUnit();
+
+        if (demo) {
+            // Convert virtual duration to real duration
+            return mod(startTime - tNow, demoEnd - demoStart) / (demoEnd - demoStart) * (durDemo + 2*durPause);
+        }
+        else {
+            if (startTime > tNow) {
+                return startTime - tNow;
+            }
+            else {
+                // Start on the unit
+                return (tUnit - (tNow % tUnit));
+            }
+        }
+    };
+
+    let toggleDemo = function () {
+        demo = !demo;
+        resetTime();
+    };
+
+    let demoOn = function () {
+        return demo;
+    };
+
+    let updateLive = function () {
+        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;
-            let tEnd = liveShow[i].dataset.end;
+            let tStarts = liveShow[i].dataset.start.split(',');
+            let tEnds = liveShow[i].dataset.end.split(',');
+
+            for (let k = 0; k < tStarts.length; k++) {
+                if (tNow >= tStarts[k] && tNow < tEnds[k]) {
+                    // Show when active
+                    liveShow[i].classList.remove('d-none');
+                    break;
+                }
+                else if (!liveShow[i].classList.contains('d-none')) {
+                    // Hide otherwise
+                    liveShow[i].classList.add('d-none');
+                }
+            }
+        }
 
-            if (tNow >= tStart && tNow < tEnd) {
-                // Show when active
-                liveShow[i].classList.remove('d-none');
+        for (let i = 0; i < liveHide.length; i++) {
+            let tStarts = liveHide[i].dataset.start.split(',');
+            let tEnds = liveHide[i].dataset.end.split(',');
+
+            for (let k = 0; k < tStarts.length; k++) {
+                if (tNow >= tStarts[k] && tNow < tEnds[k]) {
+                    // Hide when active
+                    if (!liveHide[i].classList.contains('d-none')) {
+                        liveHide[i].classList.add('d-none');
+                        break;
+                    }
+                }
+                else {
+                    // Show otherwise
+                    liveHide[i].classList.remove('d-none');
+                }
             }
-            else if (!liveShow[i].classList.contains('d-none')) {
-                // Hide otherwise
-                liveShow[i].classList.add('d-none');
+        }
+
+        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 < liveHide.length; i++) {
-            let tStart = liveHide[i].dataset.start;
-            let tEnd = liveHide[i].dataset.end;
+        for (let i = 0; i < livePast.length; i++) {
+            let t = livePast[i].dataset.time;
+            if (typeof t == "undefined") {
+                break;
+            }
+            let tRel = tNow - t;
 
-            if (tNow >= tStart && tNow < tEnd) {
-                // Hide when active
-                if (!liveHide[i].classList.contains('d-none')) {
-                    liveHide[i].classList.add('d-none');
+            if (tRel < 0) {
+                // Grey out when in past
+                if (!livePast[i].classList.contains('text-secondary')) {
+                    livePast[i].classList.add('text-secondary');
                 }
             }
             else {
-                // Show otherwise
-                liveHide[i].classList.remove('d-none');
+                // Show normal otherwise
+                livePast[i].classList.remove('text-secondary');
             }
         }
 
-        if (timeNow() > confEnd && !demo) {
+        if (tNow > confEnd && !demo) {
             // Cancel timer after program is over
-            clearInterval(liveTimer);
+            stopUpdateLive();
         }
     };
 
-    let startUpdate = function () {
-        if(typeof liveTimer !== "undefined") {
-            clearInterval(liveTimer);
-        }
-        updateLiveButtons();
+    let startUpdateLive = function () {
+        stopUpdateLive();
+        updateLive();
 
         if (demo) {
-            liveTimerCorr = (confEnd - confStart) / (durDemo - 2*durPause);
-            liveTimer = setInterval(updateLiveButtons, 100);
+            // Immediate start required since delayStart would wait for next wrap around
+            liveTimer = setInterval(updateLive, timeUnit() * 1000);
         }
         else {
-            liveTimerCorr = 1;
             setTimeout(function() {
-                liveTimer = setInterval(updateLiveButtons, 60*1000);
-                updateLiveButtons();
-            }, timeStart() * 1000);
+                liveTimer = setInterval(updateLive, timeUnit() * 1000);
+                updateLive();
+            }, delayStart(confStart) * 1000);
         }
     };
 
-    let toggleDemo = function () {
-        demo = !demo;
-        timeOffset = 0;
-        startUpdate();
-    };
-
-    let demoOn = function() {
-        return demo;
+    let stopUpdateLive = function () {
+        if (typeof liveTimer !== "undefined") {
+            clearInterval(liveTimer);
+        }
     };
 
     {% 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
+
+        let streamModal;
+        let data;
 
-        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 -%}
+        let getRoom = function (roomName) {
+            if (roomName in data.rooms) {
+                return data.rooms[roomName];
+            }
+            else {
+                return data.rooms[Object.keys(data.rooms)[0]];
+            }
         };
 
-        let streamModal;
-        let streamTimer;
+        let getNextTalk = function (roomName) {
+            let timeNow = time();
+            let talksHere = data.talks[roomName];
+
+            if (typeof talksHere !== "undefined") {
+                if (timeNow < talksHere[talksHere.length-1].end) {
+                    for (var i = 0; i < talksHere.length; i++) {
+                        if (timeNow < talksHere[i].end) {
+                            return talksHere[i];
+                        }
+                    }
+                }
+            }
+            return false;
+        };
+
+        let getNextPause = function (roomName) {
+            let timeNow = time();
+            let talksHere = data.talks[roomName];
+
+            if (typeof talksHere !== "undefined") {
+                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) {
+                            return {
+                                'start': talksHere[i-1].end,
+                                'end':   talksHere[i].start,
+                            };
+                        }
+                    }
+                }
+            }
+            return false;
+        };
 
-        let preStartStream = function(href, startTime, endTime) {
+        let setStreamContent = function (content) {
             streamModal.find('iframe').attr('src', '');
             streamModal.find('iframe').addClass('d-none');
-            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 > div').text(content);
             streamModal.find('#stream-placeholder').addClass('d-flex');
+        };
 
-            if(typeof streamTimer !== "undefined") {
-                clearTimeout(streamTimer);
-            }
-            streamTimer = setTimeout(activeStream, (startTime - timeNow())/liveTimerCorr*1000, href, endTime);
-        }
-
-        let activeStream = function(href, endTime) {
+        let setStreamSrc = function (href) {
             streamModal.find('iframe').attr('src', href);
             streamModal.find('#stream-placeholder').addClass('d-none').removeClass('d-flex');
             streamModal.find('iframe').removeClass('d-none');
+        };
 
-            if(typeof streamTimer !== "undefined") {
-                clearTimeout(streamTimer);
+        let setStreamVideo = function (roomName) {
+            let timeNow = time();
+
+            let talksHere = data.talks[roomName];
+            let roomStart = talksHere[0].start;
+            let roomEnd = talksHere[talksHere.length-1].end;
+
+            if (typeof streamVideoTimer !== "undefined") {
+                clearInterval(streamVideoTimer);
             }
-            streamTimer = setTimeout(postEndStream, (endTime - timeNow())/liveTimerCorr*1000);
-        }
 
-        let postEndStream = function() {
-            streamModal.find('iframe').attr('src', '');
-            streamModal.find('iframe').addClass('d-none');
-            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');
-        }
+            // Conference not yet started
+            if (timeNow < roomStart - streamPrepend*60) {
+                setStreamContent('{{ site.data.lang[site.conference.lang].live.pre_stream | default: "Live stream has not started yet." }}');
 
-        let setStream = function (roomName) {
-            if (roomName in rooms) {
-                room = rooms[roomName];
+                if (!freezeTime) {
+                    streamVideoTimer = setTimeout(setStreamVideo, delayStart(roomStart - streamPrepend*60) * 1000, roomName);
+                }
             }
+
+            // Conference is over
+            else if (timeNow > roomEnd + streamExtend*60) {
+                setStreamContent('{{ site.data.lang[site.conference.lang].live.post_stream | default: "Live stream has ended." }}');
+
+                if (!freezeTime && demo) {
+                    streamVideoTimer = setTimeout(setStreamVideo, delayStart(roomEnd - streamPrepend*60) * 1000, roomName);
+                }
+            }
+
+            // Conference ongoing
             else {
-                room = rooms[Object.keys(rooms)[0]];
+                let pauseNext = getNextPause(roomName);
+
+                // Currently stream is paused
+                if (pauseNext && timeNow >= pauseNext.start + streamExtend*60 && timeNow <= pauseNext.end - streamPrepend*60) {
+                    setStreamContent('{{ site.data.lang[site.conference.lang].live.pause_stream | default: "Live stream is currently paused." }}');
+
+                    if (!freezeTime) {
+                        streamVideoTimer = setTimeout(setStreamVideo, delayStart(pauseNext.end - streamPrepend*60) * 1000, roomName);
+                    }
+                }
+                // Currently a talk is active
+                else {
+                    let room = getRoom(roomName);
+                    setStreamSrc(room.href);
+
+                    if (!freezeTime) {
+                        if (pauseNext) {
+                            streamVideoTimer = setTimeout(setStreamVideo, delayStart(pauseNext.start + streamExtend*60) * 1000, roomName);
+                        }
+                        else {
+                            streamVideoTimer = setTimeout(setStreamVideo, delayStart(roomEnd + streamExtend*60) * 1000, roomName);
+                        }
+                    }
+                }
             }
+        };
 
-            streamModal.find('.modal-footer .btn').removeClass('active');
-            if (timeNow() < room.start) {
-                preStartStream(room.href, room.start, room.end);
+        let setStreamInfo = function (roomName) {
+            let timeNow = time();
+            let talkNext = getNextTalk(roomName);
+
+            if (typeof streamInfoTimer !== "undefined") {
+                clearInterval(streamInfoTimer);
             }
-            else if (timeNow() > room.end) {
-                postEndStream();
+
+            if (timeNow >= talkNext.start - streamPause*60) {
+                document.getElementById('stream-info').dataset.time = talkNext.start;
+                document.getElementById('stream-info-time').dataset.time = talkNext.start;
+                updateLive();
+
+                streamModal.find('#stream-info-color').removeClass(function (index, className) {
+                    return (className.match(/(^|\s)border-soft-\S+/g) || []).join(' ');
+                });
+                streamModal.find('#stream-info-color').addClass('border-soft-' + talkNext.color);
+
+                streamModal.find('#stream-info-talk').text(talkNext.name).attr('href', talkNext.href);
+
+                let speakerStr = '';
+                for (var i = 0; i < talkNext.speakers.length; i++) {
+                    let speaker = data.speakers[talkNext.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(talkNext.end) * 1000, roomName);
+                }
             }
             else {
-                activeStream(room.href, room.end);
+                streamModal.find('#stream-info').addClass('d-none');
+
+                if (!freezeTime) {
+                    if (talkNext) {
+                        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 setStream = function (roomName) {
+            streamModal.find('.modal-footer .btn').removeClass('active');
+            streamModal.find('#stream-select').selectedIndex = -1;
+
+            // Recover room name in case of empty default
+            let room = getRoom(roomName);
+            roomName = room.name;
+
+            setStreamVideo(roomName);
+            setStreamInfo(roomName);
+
             streamModal.find('#stream-button' + room.id).addClass('active');
+            streamModal.find('#stream-select').selectedIndex = room.id;
+        };
+
+        let updateStream = function () {
+            if (streamModal.hasClass('show')) {
+                let activeButton = streamModal.find('.modal-footer .btn.active');
+                let roomName = activeButton.data('room');
+
+                if (typeof roomName !== "undefined") {
+                    setStream(roomName);
+                }
+            }
+        };
+
+        let stopUpdateStream = function () {
+            if (typeof streamVideoTimer !== "undefined") {
+                clearInterval(streamVideoTimer);
+            }
+            if (typeof streamInfoTimer !== "undefined") {
+                clearInterval(streamInfoTimer);
+            }
         };
 
         let hideModal = function (event) {
             streamModal.find('iframe').attr('src', '');
             streamModal.find('.modal-footer .btn').removeClass('active');
+            streamModal.find('#stream-select').selectedIndex = -1;
         };
 
-        let startStream = function() {
+        let setupStream = function () {
             streamModal = $('#stream-modal');
 
+            // configure modal opening buttons
             streamModal.on('show.bs.modal', function (event) {
                 let button = $(event.relatedTarget);
                 let roomName = button.data('room');
@@ -268,27 +537,70 @@ window.conference.live = (function() {
                 hideModal(event);
             });
 
+            // configure room selection buttons in modal
             streamModal.find('.modal-footer .btn').on('click', function(event) {
                 event.preventDefault();
 
-                let roomName = $(this).data('room')
+                let roomName = $(this).data('room');
+                setStream(roomName);
+            });
+
+            // configure room selection menu in modal
+            streamModal.find('#stream-select').on('change', function(event) {
+                event.preventDefault();
+
+                let roomName = $(this).children('option:selected').text();
                 setStream(roomName);
             });
+
+            // load data
+            $.getJSON('{{ site.baseurl }}/assets/js/data.json', function(json) {
+                data = json;
+            });
+        };
+
+        let setup = function () {
+            startUpdateLive();
+            setupStream();
+        };
+
+        let update = function () {
+            updateLive();
+            updateStream();
+        };
+
+        let startUpdate = function () {
+            startUpdateLive();
+            updateStream();
+        };
+
+        let stopUpdate = function () {
+            stopUpdateLive();
+            stopUpdateStream();
         };
 
     {%- else -%}
 
-        let startStream = function() {};
+        let setup = function () {
+            startUpdateLive();
+        };
 
-    {%- endif %}
+        let update = function () {
+            updateLive();
+        };
 
-    let init = function () {
-        startUpdate();
-        startStream();
-    };
+        let startUpdate = function () {
+            startUpdateLive();
+        };
+
+        let stopUpdate = function () {
+            stopUpdateLive();
+        };
+
+    {%- endif %}
 
     return {
-        init: init,
+        init: setup,
 
         pauseTime: pauseTime,
         continueTime: continueTime,
@@ -297,7 +609,7 @@ window.conference.live = (function() {
         getTime: getTime,
 
         toggleDemo: toggleDemo,
-        demoOn: demoOn,
+        demo: demoOn,
         durDemo: durDemo,
         durPause: durPause
     };