jekyll-theme-conference 3.0.4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6b3c4e4f2dd3a6f1d5964ff2dfccad58d737a96c58a4d34c7ee506d8ed50a07
-  data.tar.gz: a2f1f59ff4abbe070bc95702001270fc56e6abdb3e3e8fc274705d1bf9a4661c
+  metadata.gz: e8d4fe78f7da2eba1de22ca1b58a6cd57fefd89729aae6efc5ec6e34bc61bf85
+  data.tar.gz: 14da05b22aec27e04c3827682c686fc07444ab42f0b38c99c0158f818f363dce
 SHA512:
-  metadata.gz: b3424868268f6ff9003ae4a913f4d7985413db330bc2b8b4a4d94a15d39d496d5c21083e94e29d3242c56ae4f536d366b306cb7a2d80e5aedc3376c84b8332f6
-  data.tar.gz: 387fa9c0e9a183949314c800397a56c1e41f231301dfed0396751257f036ab4e2be319f98f67f06ea56897b0f72b54facb590664775822a6c280632008d48081
+  metadata.gz: 58c2b9524a42cc13bcc1cb91075bc35cdc223418b23bd926bd21cc849688d60f543d13fadaf4ad46ac21ff8091a798478fad9daf331ae49db1b88d6ae6b56f7f
+  data.tar.gz: abe66bdd148005dc8293d4604070c00bfb41203b33767ab4f05341da278b67527738800ad20880f8c39af85825549f91ae47069a6f6f029716ccae065e25a648

data/README.md

@@ -319,15 +319,16 @@ conference:
 
 In order to help users navigating the program during the congress, a _Live_ indication can be shown next to talks which are currently taking place. A small JavaScript functions keeps the site automatically up-to-date (without the need to refresh) showing the indication as soon as the talk has started and hiding it once it is over (according to the timetable indicated in the `_data/program.yml` file).
 
-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).
+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). Instead of opening the modal an external link can also be used.
 
 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
 
 - 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`),
+  + 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
+  + optionally an external (absolute) link to which the user will be redirected instead of opening the modal (`external`),
 - 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
@@ -587,6 +588,10 @@ If you choose a different location for the overview pages you must:
 
 The `location` layout contains a map container (if not disabled, see section _Location Settings_ above) which can be customized. See the section above for further details.
 
+### Live Stream Overview
+
+The `stream-overview` layout contains all active streams on a single page (see the section _Live Indications & Streaming_ above).
+
 ### Additional Pages
 
 Additional static pages can easily be added as files and linked to via navigation bar or main landing page (see above on how to).

data/_includes/js/conference-live.js

@@ -58,7 +58,7 @@ window.conference.live = (function() {
 
     let timeCycle = function () {
         let actTime = timeNow();
-        let relTime = mod(actTime, durDemo + 2*durPause) / durDemo;
+        let relTime = mod(actTime, durDemo + 2*durPause) / (durDemo + 2*durPause);
         let cycleTime = mod((demoEnd - demoStart) * relTime - timeOffset, (demoEnd - demoStart)) + demoStart;
         return cycleTime;
     };

data/_includes/partials/modal_live.html

@@ -4,7 +4,7 @@
 
       <div class="modal-header">
         <h5 class="modal-title">
-          {{ site.data.lang[site.conference.lang].live.streaming | default: "Live Stream" }}
+          {{ site.data.lang[site.conference.lang].live.stream | default: "Live Stream" }}
         </h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>

data/_includes/partials/navbar.html

@@ -41,7 +41,18 @@
 
             <li class="nav-item live-show d-none" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
               {%- if site.conference.live.streaming %}
-                <a class="nav-link" title="{% if link.name %}{{ link.name }}{% else %}{{ site.data.lang[site.conference.lang].live.streaming | default: "Live Stream" }}{% endif %}" data-toggle="modal" data-target="#stream-modal" data-room="" href="#">
+                <a class="nav-link" title="
+                  {%- if link.name -%}
+                    {{- link.name -}}
+                  {%- else -%}
+                    {{- site.data.lang[site.conference.lang].live.stream | default: "Live Stream" -}}
+                  {%- endif -%}
+                  " {% if site.conference.live.streaming.external -%}
+                    href="{{ site.conference.live.streaming.external }}"
+                  {%- else -%}
+                    data-toggle="modal" data-target="#stream-modal" data-room="{{ r.name }}" href="#"
+                  {%- endif -%}
+                  >
               {%- else %}
                 {%- assign link_styleclass = "nav-link" -%}
                 {%- include partials/get_link.html %}

data/_includes/partials/show_live_button.html

@@ -2,7 +2,11 @@
   {%- include partials/get_talk_timestamp.html -%}
 
   {%- if site.conference.live.streaming -%}
-    <a title="{{ link.name }}" data-toggle="modal" data-target="#stream-modal" data-room="{{ r.name }}" href="#"
+    <a title="{{ link.name }}" {% if site.conference.live.streaming.external -%}
+      href="{{ site.conference.live.streaming.external }}"
+    {%- else -%}
+      data-toggle="modal" data-target="#stream-modal" data-room="{{ r.name }}" href="#"
+    {%- endif -%}
   {%- else -%}
     <span
   {%- endif %} class="live-show live-button badge badge-dark font-weight-normal text-center d-none {{ live_button_styleclass }}" data-start="{{ timestamp_start }}" data-end="{{ timestamp_end }}">

data/_layouts/home.html

@@ -49,7 +49,7 @@
           {%- if link.name -%}
             {%- assign link_name = link.name -%}
           {%- else -%}
-            {%- assign link_name =  site.data.lang[site.conference.lang].live.streaming | default: "Live Stream" -%}
+            {%- assign link_name =  site.data.lang[site.conference.lang].live.stream | default: "Live Stream" -%}
           {%- endif -%}
 
           {%- if link.name_inactive -%}

data/_layouts/stream-overview.html

@@ -0,0 +1,42 @@
+{% include partials/header.html %}
+
+  <h1 class="display-5 mb-4">
+    {% if page.title %}
+      {{ page.title }}
+    {% else %}
+      {{ site.data.lang[site.conference.lang].live.stream | default: "Live Streams" }}
+    {% endif %}
+  </h1>
+
+  {{ content }}
+
+  {%- assign nbr_streams = 0 -%}
+  {%- for room in site.rooms -%}
+    {%- if room.live -%}
+      {%- assign mod_nbr_streams = nbr_streams | modulo: 2 -%}
+      {%- if mod_nbr_streams == 0 %}
+  <div class="row">
+      {%- endif %}
+
+    <div class="col-md">
+      <h3>{{ room.name }}</h3>
+      <div class="embed-responsive embed-responsive-16by9">
+        <iframe class="embed-responsive-item" src="{{ room.live }}" allowfullscreen></iframe>
+      </div>
+    </div>
+
+      {%- if mod_nbr_streams == 1 %}
+  </div>
+      {%- endif -%}
+
+      {%- assign nbr_streams = nbr_streams | plus: 1 -%}
+    {%- endif -%}
+  {%- endfor %}
+
+  {% assign mod_nbr_streams = nbr_streams | modulo: 2 %}
+  {%- if mod_nbr_streams == 1 %}
+    <div class="col-md"></div>
+  </div>
+  {%- endif %}
+
+{% include partials/footer.html %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.0
 platform: ruby
 authors:
 - Lorenz Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -108,6 +108,7 @@ files:
 - _layouts/room.html
 - _layouts/speaker-overview.html
 - _layouts/speaker.html
+- _layouts/stream-overview.html
 - _layouts/talk-overview.html
 - _layouts/talk.html
 - _sass/bootstrap/_alert.scss