jekyll-theme-conference 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2ae0a8593b5af0caa18dddfbb46fc921b089d9f932ba6c3af44d787669c99c0
-  data.tar.gz: de8cf5e47442a94d1f411ad6309cfd3d4ae2f964e341e4f9b1f47e14de7eca1e
+  metadata.gz: b3463207643540289c9e9bc5f6c7bf57a63d0b1f48f3dc72e4a0dac3f98d2034
+  data.tar.gz: 1c475f305b05cea1a9866f025e2d215320b1b20a7c8ce8a79769d3e310732d3e
 SHA512:
-  metadata.gz: 3d347ca521f8ff60e328e9d6e1b0fa1557d78ac4dfd598f681ca2f3aba9683ea95d31b8d053295d5fd5cbe8c8cc7f56628a25b4eaf1a7149696b1611d6e1d84c
-  data.tar.gz: 6ef6506cb582b1620e4fa78b13b561b129076c208b2ca98993ea20c83faf77f12f2d28706dbac7a2cc944311133d585ce19b95dcd6cebfd44991b6f632de83fd
+  metadata.gz: a250438190ceec15cfc5bebf1d73dffa1a07c0f3c5056b39ff180273abdd37dc16c0b8e2a69e16f7493730ac4cb017b86a08c6890933f714fc91010742a15e12
+  data.tar.gz: d1fec1808da818d9d241ecd3dede1253f60f4e4d2fde4b260433b32d57b8e0bc4714c1afa00a0746e7317fadb0de61f323f48ca7443b9d80610d5781bfd635d3

data/README.md

@@ -380,27 +380,35 @@ 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). Instead of opening the modal an external link can also be used.
+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 embedded live stream. 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
+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`),
-- optionally if streaming is enabled (`streaming`) with indications
+- 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
   + 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`).
+- 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
+  + how long the demonstration should take (`duration`), and
+  + how long the pause between two demonstration cycle should be (`pause`).
 
 ```yaml
 conference:
   live:
     time_stop: 240      # in minutes
     streaming:
+      enable: true
       time_pause:   60  # in minutes
       time_prepend:  5  # in minutes
       time_extend:   5  # in minutes
-    demo: false
+    demo:
+      enable: false
+      duration: 300  # in seconds
+      pause:     10  # in seconds
 ```
 
 ### Map
@@ -495,11 +503,11 @@ Example:
 
 {% include js/conference.js %}
 
-(function() {
-    let map = window.conference.map;
+(() => {
+    const map = window.conference.map;
 
     if (typeof map !== 'undefined') {
-        var main_station = L.marker([47.37785, 8.54035], {
+        let main_station = L.marker([47.37785, 8.54035], {
             icon: L.divIcon({
                 className: '',
                 html: '<span class="fas fa-train"></span> Main Station',

data/_includes/js/conference.js

@@ -1,32 +1,42 @@
-// Global app variable
-window.conference = {};
+// Libraries
+//   Bootstrap (Style Framework)
+{% include js/lib/jquery-3.5.1.min.js %}
+{% include js/lib/popper.min.js %}
+{% include js/lib/bootstrap.js %}
 
-// Bootstrap (Style Framework)
-{% include js/jquery-3.5.1.min.js %}
-{% include js/popper.min.js %}
-{% include js/bootstrap.js %}
+//   FontAwesome (Icons)
+//     Imported via CSS and webfonts
+
+// Conference
+window.conference = {
+    config: {
+        baseurl: '{{ site.baseurl }}'
+    }
+};
 
-// FontAwesome (Icons)
-//   Imported via CSS and webfonts
 
 // Program
-{% include js/conference-program.js %}
+{% include js/lib/syncscroll.js %}
+{% include js/program.js %}
 
 // Leaflet (Map Display)
 {% include partials/get_enable_map.html %}
 {% if enable_map %}
-    {% include js/leaflet.js %}
-    {% include js/leaflet-easybutton.js %}
-    {% include js/leaflet-locatecontrol.js %}
-    {% include js/leaflet-providers.js %}
+    {% include js/lib/leaflet.js %}
+    {% include js/lib/leaflet-easybutton.js %}
+    {% include js/lib/leaflet-locatecontrol.js %}
+    {% include js/lib/leaflet-providers.js %}
 
-    {% include js/conference-map.js %}
+    {% include js/map.js %}
 {% endif %}
 
 // Modals ("Popups")
-{% include js/conference-modal.js %}
+{% include js/modal.js %}
 
 // Live and Streaming
 {% if site.conference.live %}
-    {% include js/conference-live.js %}
+    {% include js/live.js %}
 {% endif %}
+
+// Load configuration and start initialization
+{% include js/init.js %}

data/_includes/js/init.js

@@ -0,0 +1,37 @@
+const init = () => {
+    // Load configuration
+    const request = new Request(window.conference.config.baseurl + '/assets/js/config.json');
+
+    fetch(request)
+    .then(response =>
+        response.json()
+    )
+    .then(config => {
+        // Add configuration to global scope
+        window.conference.config = Object.assign(window.conference.config, config);
+
+        // Execute initialization functions
+        for (const [name, module] of Object.entries(window.conference)) {
+            if (name == 'config') {
+                continue;
+            }
+
+            let c;
+            if (name in config) {
+                c = config[name];
+            }
+            let l;
+            if (name in config.lang) {
+                l = config.lang[name];
+            }
+
+            module.init(c, l)
+        }
+
+    })
+    .catch((error) => {
+        console.log(error);
+    });
+};
+
+init();