jekyll-theme-conference 3.5.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3463207643540289c9e9bc5f6c7bf57a63d0b1f48f3dc72e4a0dac3f98d2034
-  data.tar.gz: 1c475f305b05cea1a9866f025e2d215320b1b20a7c8ce8a79769d3e310732d3e
+  metadata.gz: 64608f074739a5b9544e9c1e620c7801330e4a22ea778b940018f493b6334100
+  data.tar.gz: 5d74b4841bbfcc28f740a9b5464fbde28b8257dd98499c77e938c56865b15378
 SHA512:
-  metadata.gz: a250438190ceec15cfc5bebf1d73dffa1a07c0f3c5056b39ff180273abdd37dc16c0b8e2a69e16f7493730ac4cb017b86a08c6890933f714fc91010742a15e12
-  data.tar.gz: d1fec1808da818d9d241ecd3dede1253f60f4e4d2fde4b260433b32d57b8e0bc4714c1afa00a0746e7317fadb0de61f323f48ca7443b9d80610d5781bfd635d3
+  metadata.gz: 5ebd2f83933b0aed0216e34cc7ed10896531dd24c897d465af591cbeecaf8763027358570163b94bf9d920406f4b8268acda84fc72733882ea5904ade4f58ac6
+  data.tar.gz: 0d2c4d6c3e3ee34a390889d1b59153816ac6cdcc0f4a7c1a298e9f79f6b4fbada379b7e0d2335c9c5b3af2d781b69b32e8c4add0162c082400ce7722c6c0c1d0

data/README.md

@@ -110,7 +110,7 @@ To install:
    bundle
    ```
 
-4. Add `remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@2.0.0"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
+4. Add `remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@v3.6.1"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
 
 5. Continue with the _Setup_ section further below to customize the theme and add some content for your conference
 
@@ -384,12 +384,12 @@ This can be further extended if some of the talks have an associated live stream
 
 In order to activate these functionalities, 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
 
-- how long a pause between two consecutive talks has to be for the live indication to pause (`time_stop`),
+- how long a pause between two consecutive talks has to be for the live indication to pause (`stop`),
 - optionally under the `streaming` property:
   + if streaming should be enabled (`enable`), and if enabled
-  + how many minutes the stream goes active before a talk (`time_prepend`),
-  + how many minutes the stream stays active after a talk (`time_extend`),
-  + how long a pause between two consecutive talks has to be for the stream to pause (`time_pause`), and
+  + how many minutes the stream goes active before a talk (`prepend`),
+  + how many minutes the stream stays active after a talk (`extend`),
+  + how long a pause between two consecutive talks has to be for the stream to pause (`pause`), and
   + optionally an external (absolute) link to which the user will be redirected instead of opening the modal (`external`),
 - optionally under the `demo` property:
   + if a demonstration mode should be enabled (`enable`), whereby the JavaScript function cycles continuously through the entire program in a few minutes, and if enabled
@@ -399,12 +399,12 @@ In order to activate these functionalities, each day in the `program.yml` file m
 ```yaml
 conference:
   live:
-    time_stop: 240      # in minutes
+    stop: 240      # in minutes
     streaming:
       enable: true
-      time_pause:   60  # in minutes
-      time_prepend:  5  # in minutes
-      time_extend:   5  # in minutes
+      pause:   60  # in minutes
+      prepend:  5  # in minutes
+      extend:   5  # in minutes
     demo:
       enable: false
       duration: 300  # in seconds
@@ -620,7 +620,22 @@ Each room is represented by a file in the `_rooms/` directory. It must begin wit
 
 - the room's `name`
 - optionally `hide: true` if the room's page should not be linked to, and
-- optionally a URL pointing to a live stream for the given room during the conference (`live`, see the section _Live Indications & Streaming_ above).
+- optionally under the `live` property a URL pointing to a live stream for the given room during the conference (see the section _Live Indications & Streaming_ above), either:
+  * as an `absolute_url`, or
+  * a `relative_url`.
+
+Example:
+
+```yaml
+---
+name: The Room
+hide: false
+live:
+  absolute_url: https://github.com
+---
+
+...
+```
 
 ### Links
 

data/_includes/js/live.js

@@ -27,6 +27,8 @@ window.conference.live = (() => {
     let streamVideoTimer;
     let streamInfoTimer;
 
+    let streamModal;
+
     const loadData = () => {
         // Load schedule
         const request = new Request(window.conference.config.baseurl + '/assets/js/data.json');
@@ -306,13 +308,22 @@ window.conference.live = (() => {
             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');
+                if (livePast[i].nodeName == 'A' || livePast[i].nodeName == 'BUTTON') {
+                    // Disable when in past
+                    if (!livePast[i].classList.contains('disabled')) {
+                        livePast[i].classList.add('disabled');
+                    }
+                }
+                else {
+                    // 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('disabled');
                 livePast[i].classList.remove('text-secondary');
             }
         }
@@ -347,8 +358,6 @@ window.conference.live = (() => {
         }
     };
 
-    let streamModal;
-
     const getRoom = (roomName) => {
         // Return room object for given room name
         if (roomName in data.rooms) {
@@ -361,7 +370,14 @@ window.conference.live = (() => {
 
     const getTalks = (roomName) => {
         if (roomName in data.talks) {
-            return data.talks[roomName];
+            return data.talks[roomName].map((talk) => {
+                // For talks with live links, add some grace period to the end
+                // time in order to prevent that the next talk is announced
+                // immediately
+                const end = talk.live_links && talk.live_links.length > 0 ?
+                    talk.end + streamExtend * 60 : talk.end;
+                return { ...talk, end };
+            });
         }
         else {
             return false;
@@ -454,7 +470,7 @@ window.conference.live = (() => {
         }
 
         // Conference not yet started
-        if (timeNow < roomStart - streamPrepend*60) {
+        if (timeNow <= roomStart - streamPrepend*60) {
             setStreamIframeContent(lang.pre_stream);
 
             if (!freezeTime) {
@@ -463,7 +479,7 @@ window.conference.live = (() => {
         }
 
         // Conference is over
-        else if (timeNow > roomEnd + streamExtend*60) {
+        else if (timeNow >= roomEnd + streamExtend*60) {
             setStreamIframeContent(lang.post_stream);
 
             if (!freezeTime && demo) {
@@ -513,7 +529,6 @@ window.conference.live = (() => {
         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();
 
             streamModal.find('#stream-info-color').removeClass((index, className) => {
                 return (className.match(/(^|\s)border-soft-\S+/g) || []).join(' ');
@@ -540,11 +555,12 @@ window.conference.live = (() => {
                 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';
+                    // Skip empty links
+                    if ((link.name == '' && !link.icon) || link.href == '') {
+                        continue;
                     }
-                    linksStr += '">';
+
+                    linksStr += '<a href="' + link.href + '" class="btn btn-light m-1 live-past" data-time="'+ talkNext.start +'">';
                     if (link.icon) {
                         linksStr += '<i class="fas fa-' + link.icon + '"></i>&nbsp;';
                     }
@@ -558,6 +574,7 @@ window.conference.live = (() => {
 
             streamModal.find('#stream-info').removeClass('d-none');
 
+            updateLive();
             if (!freezeTime) {
                 streamInfoTimer = setTimeout(setStreamInfo, delayStart(talkNext.end) * 1000, roomName);
             }

data/_includes/js/map.js

@@ -1,16 +1,16 @@
-window.conference.mapConfig = (() => {
+window.conference.map = (() => {
     let config;
     let lang;
 
     let map;
 
     const setup = (elId) => {
-        map = L.map(elId).setView(config.map.home_coord, config.map.default_zoom);
+        map = L.map(elId).setView(config.home_coord, config.default_zoom);
 
-        L.tileLayer.provider(config.map.map_provider).addTo(map);
+        L.tileLayer.provider(config.map_provider).addTo(map);
 
         L.easyButton('far fa-star', () => {
-            map.flyTo(config.map.home_coord, config.map.default_zoom);
+            map.flyTo(config.home_coord, config.default_zoom);
         }, lang.location.focus_conf).addTo(map);
 
         L.control.locate({

data/_includes/js/program.js

@@ -19,7 +19,8 @@ window.conference.program = (() => {
                 today.setHours(0,0,0,0);
 
                 $('a[data-toggle="tab"]').each(function () {
-                    const d = new Date($(this).data('date'));
+                    let d = new Date($(this).data('date'));
+                    d.setHours(0,0,0,0);
 
                     if (today.getTime() === d.getTime()) {
                         $(this).tab('show');

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 != 7 -%}
+{%- elsif site.data.lang.version != 8 -%}
   {%- 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/get_live_timestamps.html

@@ -1,9 +1,9 @@
-{%- assign min_pause = site.conference.live.time_stop | default: 240 -%}
+{%- assign min_pause = site.conference.live.stop | default: 240 -%}
 {%- assign min_pause = min_pause | times: 60 -%}
 
 {%- if site.conference.live.streaming.enable -%}
-  {%- assign offset_start = site.conference.live.streaming.time_prepend | default: 5 -%}
-  {%- assign offset_end = site.conference.live.streaming.time_extend | default: 5 -%}
+  {%- assign offset_start = site.conference.live.streaming.prepend | default: 5 -%}
+  {%- assign offset_end = site.conference.live.streaming.extend | default: 5 -%}
 {%- else -%}
   {%- assign offset_start = 0 -%}
   {%- assign offset_end = 0 -%}

data/_includes/partials/get_page_title.html

@@ -11,7 +11,7 @@
 
   {%- else -%}
     {%- if page.layout == 'location' -%}
-      {{- site.data.lang[site.conference.lang].location.title | default: "Location" -}}
+      {{- site.data.lang[site.conference.lang].location.rooms | default: "Rooms" -}}
     {%- elsif page.layout == 'program' -%}
       {{- site.data.lang[site.conference.lang].program.title | default: "Program" -}}
     {%- elsif page.layout == 'speaker-overview' -%}

data/_layouts/config.html

@@ -2,9 +2,9 @@
     {%- include partials/get_enable_map.html -%}
     {%- if enable_map %}
     "map": {
-        "map_provider": "{{ site.conference.map.map_provider | default: 'OpenStreetMap.Mapnik' }}",
-        "home_coord": [{{ site.conference.map.home_coord }}],
-        "default_zoom": {{ site.conference.map.default_zoom | default: 17 }}
+        "map_provider": "{{ site.conference.location.map.map_provider | default: 'OpenStreetMap.Mapnik' }}",
+        "home_coord": [{{ site.conference.location.map.home_coord | default: '47.3744489, 47.3744489' }}],
+        "default_zoom": {{ site.conference.location.map.default_zoom | default: 17 }}
     },
     {%- endif %}
 
@@ -31,9 +31,9 @@
 
         "streaming": {
             "enable": {{ site.conference.live.streaming.enable | default: "false" }},
-            "pause": {{ site.conference.live.streaming.time_pause | default: 60 }},
-            "prepend": {{ site.conference.live.streaming.time_prepend | default: 5 }},
-            "extend": {{ site.conference.live.streaming.time_extend | default: 5 }}
+            "pause": {{ site.conference.live.streaming.pause | default: 60 }},
+            "prepend": {{ site.conference.live.streaming.prepend | default: 5 }},
+            "extend": {{ site.conference.live.streaming.extend | default: 5 }}
         },
 
         "demo": {

data/_layouts/data.html

@@ -15,6 +15,14 @@
     {%- assign first_room = true -%}
     {%- for room in site.rooms %}
         {%- if room.live -%}
+            {%- if room.live.absolute_url -%}
+                {%- assign room_live_href = room.live.absolute_url -%}
+            {%- elsif room.live.relative_url -%}
+                {%- assign room_live_href = room.live.relative_url | prepend: site.baseurl -%}
+            {%- else -%}
+                {%- continue -%}
+            {%- endif -%}
+
             {%- unless first_room -%}
                 ,
             {%- else -%}
@@ -23,7 +31,7 @@
         "{{ room.name }}": {
             "id": {{ forloop.index }},
             "name": "{{ room.name }}",
-            "href": "{{ room.live }}"
+            "href": "{{ room_live_href }}"
         }
         {%- endif -%}
     {%- endfor %}

data/_layouts/location.html

@@ -6,7 +6,7 @@
     {% if page.title %}
       {{ page.title }}
     {% else %}
-      {{ site.data.lang[site.conference.lang].location.title | default: "Location" }}
+      {{ site.data.lang[site.conference.lang].location.directions | default: "Directions" }}
     {% endif %}
   </h1>
 

data/_layouts/room.html

@@ -10,7 +10,7 @@
 
   <!-- title shown in browser: -->
   <h1 class="display-5 mb-3 d-print-none">
-    {{ site.data.lang[site.conference.lang].location.title | default: "Location" }}
+    {{ site.data.lang[site.conference.lang].location.rooms | default: "Rooms" }}
   </h1>
 
   {% include partials/navbar_rooms.html %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Lorenz Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-19 00:00:00.000000000 Z
+date: 2022-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -244,9 +244,9 @@ files:
 - _sass/font-awesome/scss/v4-shims.scss
 - _sass/font-awesome/solid.scss
 - _sass/font-awesome/v4-shims.scss
-- _sass/leaflet/leaflet-easybutton.css
-- _sass/leaflet/leaflet-locatecontrol.css
-- _sass/leaflet/leaflet.css
+- _sass/leaflet/leaflet-easybutton.scss
+- _sass/leaflet/leaflet-locatecontrol.scss
+- _sass/leaflet/leaflet.scss
 - assets/css/main.scss
 - assets/icons/live.svg
 - assets/js/config.json
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Jekyll template for a conference website containing program, speaker, talks