jekyll-theme-conference 3.1.5 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12604ff3f3225749dc4902e16e24fbe2eb353e16269c9c86310728ada7472482
-  data.tar.gz: 3f9e820a5168e3770e787fe918472799b6735d39374ccdbc1d5ea04b3a0ce5f4
+  metadata.gz: b2ae0a8593b5af0caa18dddfbb46fc921b089d9f932ba6c3af44d787669c99c0
+  data.tar.gz: de8cf5e47442a94d1f411ad6309cfd3d4ae2f964e341e4f9b1f47e14de7eca1e
 SHA512:
-  metadata.gz: 14222eeccadb40c84523555421c6eed16d8d99efeb12d87fca7a39706dcfed1944330bee9964d47ccc383de3440fd7330c0feb04fd379125569d31a2f7262b0e
-  data.tar.gz: bfa841aba818f649fcd58d46846e2e7f1e0365ec3f2e8f340ba4a76c1ba677c4722c695b232f0b2b4be22773cc04da63e98af35e9b25a995b75bc6abf29faecb
+  metadata.gz: 3d347ca521f8ff60e328e9d6e1b0fa1557d78ac4dfd598f681ca2f3aba9683ea95d31b8d053295d5fd5cbe8c8cc7f56628a25b4eaf1a7149696b1611d6e1d84c
+  data.tar.gz: 6ef6506cb582b1620e4fa78b13b561b129076c208b2ca98993ea20c83faf77f12f2d28706dbac7a2cc944311133d585ce19b95dcd6cebfd44991b6f632de83fd

data/README.md

@@ -32,24 +32,27 @@ The theme was originally created for the yearly Winterkongress conference of the
   * [Collection URLs](#collection-urls)
   * [Language](#language)
   * [Navigation Bar](#navigation-bar)
+  * [Open Graph Link Preview](#open-graph-link-preview)
   * [Main Landing Page](#main-landing-page)
   * [Information Boxes](#information-boxes)
-  * [Live Indications & Streaming](#live-indications---streaming)
+  * [Live Indications & Streaming](#live-indications--streaming)
+  * [Map](#map)
   * [Talk Settings](#talk-settings)
   * [Speaker Settings](#speaker-settings)
   * [Location Settings](#location-settings)
   * [Program Settings](#program-settings)
 - [Content](#content)
-  * [Schedule / Program](#schedule---program)
+  * [Schedule / Program](#schedule--program)
   * [Talks](#talks)
   * [Speakers](#speakers)
   * [Rooms](#rooms)
   * [Links](#links)
 - [Overview Pages](#overview-pages)
-  * [Location / Room Overview](#location---room-overview)
+  * [Location / Room Overview](#location--room-overview)
   * [Live Stream Overview](#live-stream-overview)
   * [Additional Pages](#additional-pages)
 - [Design](#design)
+- [Development](#development)
 - [License](#license)
 
 
@@ -137,9 +140,9 @@ In order to be up and running simply use the default content of this repository
 
 ### 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/):
+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.
 
-1. Copy the file `_tools/create_entries.py` from this repository
+1. Copy the files `_tools/create_entries.py` and `_tools/requirements.txt` from this repository
 
 2. Create a virtual environment and activate it
 
@@ -148,10 +151,10 @@ There exists a Python file in this repository, `_tools/create_entries.py`, which
    source venv/bin/activate
    ```
 
-3. Install PyYAML
+3. Install the requirements
 
    ```bash
-   pip install pyyaml
+   pip install -r _tools/requirements.txt
    ```
 
 4. Execute the script, e.g. to show the help type
@@ -167,7 +170,7 @@ In case you do not want to install the entire Ruby/Jekyll toolchain on your mach
 
 - `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.
+- `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:
 
@@ -281,9 +284,32 @@ conference:
     ...
     logo:
       name: Magic Organisation
+      img: 'logo.svg'  # inside /assets/images/
       url: 'https://github.com'
 ```
 
+### Open Graph Link Preview
+
+The theme automatically includes the necessary `<meta>` tags to ease link previewing when sharing links based on the [Open Graph protocol](https://ogp.me/) and [Twitter Cards](https://developer.twitter.com/en/docs/twitter-for-websites/cards/overview/abouts-cards). These tags control how a link is presented when shared via different platform and apps. In order to disable these `<meta>` tags add the `disable: true` setting (default: `false`) to the `link_preview` property.
+
+In order to generate a meaningful description for each of the links, the preposition for the conference title as given under the `title` property can be defined by using the `preposition` property. For example, if `title` is set to "Conference 2020" the corresponding `preposition` would be "at". The template can then use it to generate descriptions such as "Talk *at* Conference 2020".
+
+Optionally, an image which is shown as preview for all links can be specified. For sharing via Open Graph an image ratio of 1.91:1 and an ideal size of 1200x630 pixel is recommended. For sharing via Twitter an image ratio of 1:1 and a minimal size of 600x600 pixel (better 1200x1200 pixel) is recommended. SVG image files are not supported. It is activate through the `img` property under the `link_preview` property containing an image file shown for Open Graph (`open_graph`) and on the Twitter Cards (`twitter`), whereby the path to the image file relative to the `/assets/images/` folder has to be specified.
+
+```yaml
+title: Conference 2020
+preposition: 'at'
+
+...
+
+conference:
+  link_preview:
+    disable: false
+    img:
+      twitter: 'twitter_preview.png'      # inside /assets/images/
+      open_graph: 'facebook_preview.png'  # inside /assets/images/
+```
+
 ### Main Landing Page
 
 The main landing page is shown at the root of the website to greet new visitors. In order to show it you need to create a `index.md` file in the root of your website's folder and specify its layout as `layout: main`. The remaining customizations are specified in the `_config.yml` file.
@@ -377,6 +403,21 @@ conference:
     demo: false
 ```
 
+### Map
+
+In order to help users finding your venue, an [OpenStreetMap](https://www.openstreetmap.org/) container displaying a map can be shown on any page. The map's initial position is globally defined and thus the same for all map containers. You can define the initial position of the map by setting the default zoom level `default_zoom`, the center coordinates `home_coord`, and the map provider for the tiles `map_provider`. Alternative map providers can be found [here](https://leaflet-extras.github.io/leaflet-providers/preview/).
+The map contains small control buttons to zoom in and out, center the map back to the initial position, and show the visitors current location (has to be manually activated and granted by the visitor).
+
+The map can be added to any page by setting `map: true` in its Front Matter or on the location main page by setting `conference.location.map: true` (see _Location Settings_ section below).
+
+```yaml
+conference:
+  map:
+    default_zoom: 17
+    home_coord: 47.37808, 8.53935
+    map_provider: "OpenStreetMap.Mapnik"
+```
+
 ### Talk Settings
 
 Each talk can have one or multiple categories associated via FrontMatter (see the _Individual Pages: Talks_ section below for more details). Some of these categories can be elevated to so called main categories". These are used to color group the talks across the entire website, particularly in the program. In order to do so add the `main_categories` property under the `talks` property. It consists of a list of all main categories. Each main category consists of:
@@ -429,8 +470,9 @@ In order to hide all rooms add the `hide: true` setting (default: `false`) to th
 
 If your `location` overview file is not located under `/location` you can indicate an alternative path by setting the `url` property (default: `/location`) under the `location` property.
 
-The `location` layout automatically includes an [OpenStreetMap](https://www.openstreetmap.org/) container to point to your venue. If you want to hide it add the `enable: false` setting (default: `true`) to the `map` property under the `location` property. Otherwise, you can define the initial position of the map by setting the default zoom level `default_zoom`, the center coordinates `home_coord`, and the map provider for the tiles `map_provider`. Alternative map providers can be found [here](https://leaflet-extras.github.io/leaflet-providers/preview/).
-The map contains small control buttons to zoom in and out, center the map back to the initial position, and show the visitors current location (has to be manually activated and granted by the visitor).
+The location main page shows a navigation bar listing all the different rooms by name. Due to the quirks of Jekyll, the main page itself cannot be listed by title as defined in its Front Matter. Instead the title of the main landing page for the navigation bar is taken from the language files and defaults to "Directions". In order to change this, you can either change the language files directly (see the _Language_ section above), or you provide an alternative title by setting the `navbar_title` to the desired title under the `location` property.
+
+The `location` layout can include a map to point to your venue by adding the `map: true` setting (default: `true`) to the `location` property. See the _Map_ section above for more information.
 
 Example:
 
@@ -438,11 +480,9 @@ Example:
 conference:
   location:
     hide: false
-    map:
-      enable: true
-      default_zoom: 17
-      home_coord: 47.37808, 8.53935
-      map_provider: "OpenStreetMap.Mapnik"
+    url: '/location'
+    navbar_title: 'Location'
+    map: true
 ```
 
 The map is based on the JavaScript Library [Leaflet](https://leafletjs.com/) and can be customized by editing the `assets/js/main.js` file, e.g. adding additional layers with markers, text, or shapes to the map. To start, copy simply the file from this repository and make use of the initialized global variable `window.conference.map` pointing to the Leaflet container.
@@ -514,7 +554,7 @@ The order of the rooms in the list defines the order of the rooms as shown in th
 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
+- a starting time `time_start` given as `H:M` ([`strftime`](http://www.strfti.me) formated) or `H:M +∆` whereby ∆ is the day offset in relation to the date given for the given day, and
 - an end time `time_end`.
 
 The list of talks should (manually) be ordered by time, i.e. the first occurring talk should be listed first.
@@ -550,7 +590,8 @@ Each talk is represented by a file in the `_talks/` directory. It must begin wit
 - the talk's `name` (used as identifier),
 - one or more existing `speakers` name(s),
 - optionally one or more `categories` of which one should be a main category as defined in the site's configuration,
-- optionally a list of `links` (see the _Links_ subsection below for the available properties per link; links with icons are treated separately and are also included on the talk overview page), and
+- optionally a list of `links` (see the _Links_ subsection below for the available properties per link; links with icons are treated separately and are also included on the talk overview page),
+- optionally a list of `live: links` (see the _Links_ subsection below for the available properties per link) which are shown below the live stream for the given talk in form of buttons, and
 - optionally `hide: true` if the talk's page should not be linked to.
 
 ### Speakers
@@ -563,6 +604,8 @@ Each speaker is represented by a file in the `_speakers/` directory. It must beg
 - optionally a list of `links` (see the _Links_ subsection below for the available properties per link; links with icons are treated separately), and
 - optionally `hide: true` if the speaker's page should not be linked to.
 
+If the speaker's name consists only out of one word, populate the `last_name` property and leave the `first_name` property empty. The last name is generally used for sorting the speakers.
+
 ### Rooms
 
 Each room is represented by a file in the `_rooms/` directory. It must begin with valid [YAML Front Matter](https://jekyllrb.com/docs/frontmatter/) containing
@@ -602,6 +645,29 @@ Example:
       video: https://media.ccc.de/
 ```
 
+There exists a Python file in this repository, `_tools/import_resources.py`, which can be used to import resources such as slides and other documents from [pretalx.com](https://pretalx.com/p/about/)) via its API. It automatically downloads all files, stores them and updates the links of the talks concerned.
+
+1. Copy the files `_tools/import_resources.py` and `_tools/requirements.txt` from this repository
+
+2. Create a virtual environment and activate it
+
+   ```bash
+   python -m venv venv
+   source venv/bin/activate
+   ```
+
+3. Install the requirements
+
+   ```bash
+   pip install -r _tools/requirements.txt
+   ```
+
+4. Execute the script, e.g. to show the help type
+
+   ```bash
+   python _tools/import_resources.py --help
+   ```
+
 
 ## Overview Pages
 
@@ -621,7 +687,7 @@ If you choose a different location for the overview pages you must:
 
 ### Location / Room Overview
 
-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.
+The `location` layout can include a map container (if not disabled, see the _Location Settings_ section above) which can be customized (see the _Map_ section above).
 
 ### Live Stream Overview
 
@@ -631,6 +697,7 @@ The `stream-overview` layout contains all active streams on a single page (see t
 
 Additional static pages can easily be added as files and linked to via navigation bar or main landing page (see above on how to).
 
+Each of these pages can include a map at its end (e.g. to point to your venue) by adding the `map: true` setting to its Front Matter. See the _Map_ section above for more information.
 
 ## Design
 
@@ -653,6 +720,15 @@ Custom Bootstrap themes or simple color schemes such as designed with [Bootstrap
 2. Add your Bootstrap variables in front of the `@import 'conference'` line, e.g. currently the primary color is set internally to green (instead of Bootstrap's default blue): `$primary: #074 !default;`
 3. Add any additional CSS styles after it.
 
+## Development
+
+If you want to modify this theme and see its changes on an existing project, simply indicate in your `Gemfile` that you want to use the local copy of the theme by adding a `path` indication after the gem instantiation:
+
+```ruby
+group :jekyll_plugins do
+  gem "jekyll-theme-conference", path: "../[path to your local theme]"
+end
+```
 
 ## License
 

data/_includes/js/conference-live.js

@@ -15,9 +15,9 @@ window.conference.live = (function() {
 
     let data;
 
-    let confStart = {{ conf_start }};
-    let confEnd = {{ conf_end }};
-    let confDur = confEnd - confStart;
+    const confStart = {{ conf_start }};
+    const confEnd = {{ conf_end }};
+    const confDur = confEnd - confStart;
 
     let freezeTime = false;
     let timeFrozen = 0;
@@ -34,34 +34,34 @@ window.conference.live = (function() {
     let streamVideoTimer;
     let streamInfoTimer;
 
-    let loadData = function () {
+    const loadData = function () {
         // Fetch schedule from external file
         $.getJSON('{{ site.baseurl }}/assets/js/data.json', function(json) {
             data = json;
         });
     };
 
-    let getData = function () {
+    const getData = function () {
         // Return data
         return data;
     };
 
-    let mod = function (n, m) {
+    const mod = function (n, m) {
         // Absolute modulo
         return ((n % m) + m) % m;
     };
 
-    let timeNow = function () {
+    const timeNow = function () {
         // Current timestamp in seconds
         return Math.floor(Date.now() / 1000);
     };
 
-    let timeCont = function () {
+    const timeCont = function () {
         // Continuous time (respecting previous pauses)
         return timeNow() - timeOffset;
     };
 
-    let timeCycle = function () {
+    const timeCycle = function () {
         // Cyclic timestamp in seconds
         let actTime = timeNow();
         let relTime = mod(actTime, durDemo + 2*durPause) / (durDemo + 2*durPause);
@@ -69,7 +69,7 @@ window.conference.live = (function() {
         return cycleTime;
     };
 
-    let time = function () {
+    const time = function () {
         // Return app time
         if (freezeTime) {
             return timeFrozen;
@@ -82,7 +82,7 @@ window.conference.live = (function() {
         }
     };
 
-    let pauseTime = function () {
+    const pauseTime = function () {
         // Pause app time
         if (!freezeTime) {
             timeFrozen = time();
@@ -92,7 +92,7 @@ window.conference.live = (function() {
         }
     };
 
-    let continueTime = function () {
+    const continueTime = function () {
         // Continue app time
         if (freezeTime) {
             freezeTime = false;
@@ -101,7 +101,7 @@ window.conference.live = (function() {
         }
     };
 
-    let resetTime = function () {
+    const resetTime = function () {
         // Reset app time
         timeOffset = 0;
         freezeTime = false;
@@ -109,7 +109,7 @@ window.conference.live = (function() {
         startUpdate();
     };
 
-    let setTime = function (newTime, newDay) {
+    const setTime = function (newTime, newDay) {
         // Set and pause app time
         pauseTime();
 
@@ -137,7 +137,7 @@ window.conference.live = (function() {
         update();
     };
 
-    let getTime = function () {
+    const getTime = function () {
         // Return app time as string
         let tConvert = time();
 
@@ -149,7 +149,7 @@ window.conference.live = (function() {
         return dStr +" "+ h +":"+ (m < 10 ? "0" : "") + m;
     };
 
-    let timeUnit = function () {
+    const timeUnit = function () {
         // App time refresh rate
         if (demo) {
             return 0.1;
@@ -159,7 +159,7 @@ window.conference.live = (function() {
         }
     };
 
-    let delayStart = function (startTime) {
+    const delayStart = function (startTime) {
         // Seconds until given startTime occurs
         let tNow = time();
         let tUnit = timeUnit();
@@ -179,18 +179,17 @@ window.conference.live = (function() {
         }
     };
 
-    let toggleDemo = function () {
-        // Toggle app demo mode
-        demo = !demo;
-        resetTime();
-    };
-
-    let demoOn = function () {
-        // Return app demo status
-        return demo;
+    let model = {
+        set demo(value) {
+            demo = value;
+            resetTime();
+        },
+        get demo() {
+            return demo;
+        }
     };
 
-    let updateLive = function () {
+    const updateLive = function () {
         // Update status all live elements in DOM
         let tNow = time();
         let liveShow = document.getElementsByClassName('live-show');
@@ -322,7 +321,7 @@ window.conference.live = (function() {
         }
     };
 
-    let startUpdateLive = function () {
+    const startUpdateLive = function () {
         // Start update timer to update live elements in DOM
         stopUpdateLive();
         updateLive();
@@ -339,7 +338,7 @@ window.conference.live = (function() {
         }
     };
 
-    let stopUpdateLive = function () {
+    const stopUpdateLive = function () {
         // stopUpdate update timer to update live elements in DOM
         if (typeof liveTimer !== "undefined") {
             clearInterval(liveTimer);
@@ -347,13 +346,13 @@ window.conference.live = (function() {
     };
 
     {% 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
+        const streamPause   = {{ site.conference.live.streaming.time_pause | default: 60 }};  // in minutes
+        const streamPrepend = {{ site.conference.live.streaming.time_prepend | default: 5 }};  // in minutes
+        const streamExtend  = {{ site.conference.live.streaming.time_extend | default: 5 }};  // in minutes
 
         let streamModal;
 
-        let getRoom = function (roomName) {
+        const getRoom = function (roomName) {
             // Return room object for given room name
             if (roomName in data.rooms) {
                 return data.rooms[roomName];
@@ -363,7 +362,7 @@ window.conference.live = (function() {
             }
         };
 
-        let getTalks = function (roomName) {
+        const getTalks = function (roomName) {
             if (roomName in data.talks) {
                 return data.talks[roomName];
             }
@@ -372,7 +371,7 @@ window.conference.live = (function() {
             }
         };
 
-        let getNextTalk = function (roomName) {
+        const getNextTalk = function (roomName) {
             // Get talk object for next talk in given room
             let timeNow = time();
             let talksHere = getTalks(roomName);
@@ -389,7 +388,7 @@ window.conference.live = (function() {
             return false;
         };
 
-        let getNextPause = function (roomName) {
+        const getNextPause = function (roomName) {
             // Get time object for next pause in given room
             let timeNow = time();
             let talksHere = getTalks(roomName);
@@ -409,7 +408,7 @@ window.conference.live = (function() {
             return false;
         };
 
-        let setStreamIframeContent = function (content) {
+        const setStreamIframeContent = function (content) {
             // Set stream modal iframe to show given text
             streamModal.find('iframe').attr('src', '');
             streamModal.find('iframe').addClass('d-none');
@@ -417,14 +416,14 @@ window.conference.live = (function() {
             streamModal.find('#stream-placeholder').addClass('d-flex');
         };
 
-        let setStreamIframeSrc = function (href) {
+        const setStreamIframeSrc = function (href) {
             // Set stream modal iframe to show given URL
             streamModal.find('iframe').attr('src', href);
             streamModal.find('#stream-placeholder').addClass('d-none').removeClass('d-flex');
             streamModal.find('iframe').removeClass('d-none');
         };
 
-        let setStreamVideo = function (roomName) {
+        const setStreamVideo = function (roomName) {
             // Update stream modal iframe:
             // Show stream with start/pause/end message (for given room) and keep updated
             let timeNow = time();
@@ -504,7 +503,7 @@ window.conference.live = (function() {
             }
         };
 
-        let setStreamInfo = function (roomName) {
+        const setStreamInfo = function (roomName) {
             // Update stream modal info bar:
             // Show next talk and speaker (for given room) and keep updated
             let timeNow = time();
@@ -527,7 +526,7 @@ window.conference.live = (function() {
                 streamModal.find('#stream-info-talk').text(talkNext.name).attr('href', talkNext.href);
 
                 let speakerStr = '';
-                for (var i = 0; i < talkNext.speakers.length; i++) {
+                for (let i = 0; i < talkNext.speakers.length; i++) {
                     let speaker = data.speakers[talkNext.speakers[i]];
                     if (speaker.href == '') {
                         speakerStr += speaker.name +', '
@@ -539,6 +538,27 @@ window.conference.live = (function() {
                 speakerStr = speakerStr.slice(0, -2);
                 streamModal.find('#stream-info-speakers').html(speakerStr);
 
+                if (talkNext.live_links) {
+                    let linksStr = '';
+                    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';
+                        }
+                        linksStr += '">';
+                        if (link.icon) {
+                            linksStr += '<i class="fas fa-' + link.icon + '"></i>&nbsp;';
+                        }
+                        linksStr += link.name + '</a>';
+                    }
+                    streamModal.find('#stream-info-links').html(linksStr).removeClass('d-none');
+                }
+                else {
+                    streamModal.find('#stream-info-links').addClass('d-none');
+                }
+
                 streamModal.find('#stream-info').removeClass('d-none');
 
                 if (!freezeTime) {
@@ -562,7 +582,7 @@ window.conference.live = (function() {
             }
         };
 
-        let setStream = function (roomName) {
+        const setStream = function (roomName) {
             // Update stream modal (iframe and info bar) for given room
             streamModal.find('.modal-footer .btn').removeClass('active');
             streamModal.find('#stream-select').val(0);
@@ -578,7 +598,7 @@ window.conference.live = (function() {
             streamModal.find('#stream-select').val(room.id);
         };
 
-        let updateStream = function () {
+        const updateStream = function () {
             // Update stream modal for currently active room button
             if (streamModal.hasClass('show')) {
                 let activeButton = streamModal.find('.modal-footer .btn.active');
@@ -590,7 +610,7 @@ window.conference.live = (function() {
             }
         };
 
-        let stopUpdateStream = function () {
+        const stopUpdateStream = function () {
             // Stop stream modal update timer
             if (typeof streamVideoTimer !== "undefined") {
                 clearInterval(streamVideoTimer);
@@ -600,14 +620,14 @@ window.conference.live = (function() {
             }
         };
 
-        let hideModal = function () {
+        const hideModal = function () {
             // Close stream modal
             streamModal.find('iframe').attr('src', '');
             streamModal.find('.modal-footer .btn').removeClass('active');
             streamModal.find('#stream-select').selectedIndex = -1;
         };
 
-        let setupStream = function () {
+        const setupStream = function () {
             // Setup events when modal opens/closes
             streamModal = $('#stream-modal');
 
@@ -638,43 +658,43 @@ window.conference.live = (function() {
             });
         };
 
-        let setup = function () {
+        const setup = function () {
             loadData();
             startUpdateLive();
             setupStream();
         };
 
-        let update = function () {
+        const update = function () {
             updateLive();
             updateStream();
         };
 
-        let startUpdate = function () {
+        const startUpdate = function () {
             startUpdateLive();
             updateStream();
         };
 
-        let stopUpdate = function () {
+        const stopUpdate = function () {
             stopUpdateLive();
             stopUpdateStream();
         };
 
     {%- else -%}
 
-        let setup = function () {
+        const setup = function () {
             loadData();
             startUpdateLive();
         };
 
-        let update = function () {
+        const update = function () {
             updateLive();
         };
 
-        let startUpdate = function () {
+        const startUpdate = function () {
             startUpdateLive();
         };
 
-        let stopUpdate = function () {
+        const stopUpdate = function () {
             stopUpdateLive();
         };
 
@@ -690,8 +710,7 @@ window.conference.live = (function() {
         setTime: setTime,
         getTime: getTime,
 
-        toggleDemo: toggleDemo,
-        demo: demoOn,
+        demo: model.demo,
         durDemo: durDemo,
         durPause: durPause
     };

data/_includes/js/conference-map.js

@@ -2,9 +2,9 @@ window.conference.mapConfig = (function() {
 
     let map;
 
-    let mapProvider = "{{ site.conference.location.map.map_provider | default: 'OpenStreetMap.Mapnik' }}";
-    let homeCoord = [{{ site.conference.location.map.home_coord }}];
-    let zoomLevel = {{ site.conference.location.map.default_zoom | default: 17 }};
+    let mapProvider = "{{ site.conference.map.map_provider | default: 'OpenStreetMap.Mapnik' }}";
+    let homeCoord = [{{ site.conference.map.home_coord }}];
+    let zoomLevel = {{ site.conference.map.default_zoom | default: 17 }};
 
     let setup = function (elId) {
         map = L.map(elId).setView(homeCoord, zoomLevel);

data/_includes/js/conference.js

@@ -13,7 +13,8 @@ window.conference = {};
 {% include js/conference-program.js %}
 
 // Leaflet (Map Display)
-{% if site.conference.location.hide != true and site.conference.location.map.enable %}
+{% include partials/get_enable_map.html %}
+{% if enable_map %}
     {% include js/leaflet.js %}
     {% include js/leaflet-easybutton.js %}
     {% include js/leaflet-locatecontrol.js %}

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

@@ -2,8 +2,9 @@
   {%- assign t = r.talks | first -%}
   {%- include partials/get_talk_time.html -%}
 
-  {%- if forloop.index == 1 or talk_start_hour < day_start_hour or talk_start_hour == day_start_hour and talk_start_min < day_start_min-%}
+  {%- if forloop.index == 1 or talk_start_day < day_start_day or talk_start_day == day_start_day and talk_start_hour < day_start_hour or talk_start_hour == day_start_hour and talk_start_min < day_start_min-%}
     {%- assign day_start_talk = t -%}
+    {%- assign day_start_day = talk_start_day -%}
     {%- assign day_start_hour = talk_start_hour -%}
     {%- assign day_start_min = talk_start_min -%}
   {%- endif -%}
@@ -11,8 +12,9 @@
   {%- assign t = r.talks | last -%}
   {%- include partials/get_talk_time.html -%}
 
-  {%- if forloop.index == 1 or talk_end_hour > day_end_hour or talk_end_hour == day_end_hour and talk_end_min > day_end_min-%}
+  {%- if forloop.index == 1 or talk_end_day > day_end_day or talk_end_day == day_end_day and talk_end_hour > day_end_hour or talk_end_hour == day_end_hour and talk_end_min > day_end_min-%}
     {%- assign day_end_talk = t -%}
+    {%- assign day_end_day = talk_end_day -%}
     {%- assign day_end_hour = talk_end_hour -%}
     {%- assign day_end_min = talk_end_min -%}
   {%- endif -%}

data/_includes/partials/get_enable_map.html

@@ -0,0 +1,11 @@
+{%- if site.conference.location.map -%}
+  {%- assign enable_map = true -%}
+{%- else -%}
+  {%- assign enable_map = false -%}
+  {%- for page in site.pages -%}
+    {%- if page.map -%}
+      {%- assign enable_map = true -%}
+      {%- break -%}
+    {%- endif -%}
+  {%- endfor -%}
+{%- endif -%}

data/_includes/partials/get_page_description.html

@@ -0,0 +1,23 @@
+{%- unless site.preposition == empty -%}
+  {%- assign preposition = site.preposition -%}
+{%- else -%}
+  {%- assign preposition = '-' -%}
+{%- endunless -%}
+
+{%- capture page_description -%}
+  {%- if page.layout == 'talk' -%}
+    {{ site.data.lang[site.conference.lang].talk.title | default: 'Talk' }} {{ site.data.lang[site.conference.lang].pronoun.by | default: 'by'}} {% include partials/list_speakers.html text_only=true %} {{ preposition }} {{ site.title }}
+  {%- elsif page.layout == 'speaker' -%}
+    {{ site.data.lang[site.conference.lang].speaker.title | default: 'Speaker' }} {{ preposition }} {{ site.title }}
+  {%- elsif site.description -%}
+    {{ site.description }}
+  {%- endif -%}
+{%- endcapture -%}
+
+{%- if page_description.empty and include.default -%}
+  {%- assign page_description = include.default -%}
+{%- endif -%}
+
+{%- if include.replace_quotes -%}
+  {%- assign page_description = page_description | replace: '"', "'" -%}
+{%- endif -%}

data/_includes/partials/get_page_title.html

@@ -0,0 +1,33 @@
+{%- capture page_title -%}
+  {%- if page.layout == 'room' -%}
+    {{- page.name -}}
+  {%- elsif page.layout == 'speaker' -%}
+    {{- page.first_name }} {{ page.last_name -}}
+  {%- elsif page.layout == 'talk' -%}
+    {{- page.name -}}
+
+  {%- elsif page.title -%}
+    {{- page.title -}}
+
+  {%- else -%}
+    {%- if page.layout == 'location' -%}
+      {{- site.data.lang[site.conference.lang].location.title | default: "Location" -}}
+    {%- elsif page.layout == 'program' -%}
+      {{- site.data.lang[site.conference.lang].program.title | default: "Program" -}}
+    {%- elsif page.layout == 'speaker-overview' -%}
+      {{- site.data.lang[site.conference.lang].speaker.overview | default: "Speakers" -}}
+    {%- elsif page.layout == 'stream-overview' -%}
+      {{ site.data.lang[site.conference.lang].live.stream | default: "Live Streams" }}
+    {%- elsif page.layout == 'talk-overview' -%}
+      {{- site.data.lang[site.conference.lang].talk.overview | default: "Talks" -}}
+    {%- endif -%}
+  {%- endif -%}
+{%- endcapture -%}
+
+{%- if page_title == empty and include.default -%}
+  {%- assign page_title = include.default -%}
+{%- endif -%}
+
+{%- if include.replace_quotes -%}
+  {%- assign page_title = page_title | replace: '"', "'" -%}
+{%- endif -%}

data/_includes/partials/get_talk_time.html

@@ -1,9 +1,24 @@
 {%- assign talk_start = t.time_start -%}
 {%- assign talk_end = t.time_end -%}
 
-{%- assign talk_start_hour = talk_start | split: ':' | first -%}
+{%- if talk_start contains ' +' -%}
+  {%- assign talk_start_day = talk_start | split: ' +' | last | plus: 0 -%}
+  {%- assign talk_start = talk_start | split: ' +' | first -%}
+{%- else -%}
+  {%- assign talk_start_day = 0 -%}
+{%- endif -%}
+{%- if talk_end contains ' +' -%}
+  {%- assign talk_end_day = talk_end | split: ' +' | last | plus: 0 -%}
+  {%- assign talk_end = talk_end | split: ' +' | first -%}
+{%- else -%}
+  {%- assign talk_end_day = 0 -%}
+{%- endif -%}
+
+{%- assign talk_start_hour = talk_start | split: ':' | first | plus: 0 -%}
 {%- assign talk_start_min = talk_start | split: ':' | last | divided_by: site.conference.program.time_steps | floor | times: site.conference.program.time_steps -%}
-{%- assign talk_end_hour = talk_end | split: ':' | first -%}
+{%- assign talk_end_hour = talk_end | split: ':' | first | plus: 0 -%}
 {%- assign talk_end_min = talk_end | split: ':' | last | divided_by: site.conference.program.time_steps | ceil | times: site.conference.program.time_steps -%}
 
-{%- assign talk_duration_min = talk_end_hour | minus: talk_start_hour | times: 60 | minus: talk_start_min | plus: talk_end_min -%}
+{%- assign talk_start_hour_24h = talk_start_day | times: 24 | plus: talk_start_hour -%}
+{%- assign talk_end_hour_24h = talk_end_day | times: 24 | plus: talk_end_hour -%}
+{%- assign talk_duration_min = talk_end_hour_24h | minus: talk_start_hour_24h | times: 60 | minus: talk_start_min | plus: talk_end_min -%}

data/_includes/partials/get_talk_timestamp.html

@@ -1,4 +1,9 @@
-{%- assign datetime_start = d.date | append: " " | append: t.time_start -%}
-{%- assign timestamp_start = datetime_start | date: "%s" -%}
-{%- assign datetime_end = d.date | append: " " | append: t.time_end -%}
-{%- assign timestamp_end = datetime_end | date: "%s" -%}
+{%- include partials/get_talk_time.html -%}
+
+{%- assign datetime_start = d.date | append: " " | append: talk_start -%}
+{%- assign add_days_start = talk_start_day | times: 24 | times: 60 | times: 60 -%}
+{%- assign timestamp_start = datetime_start | date: "%s" | plus: add_days_start | date: "%s" -%}
+
+{%- assign datetime_end = d.date | append: " " | append: talk_end -%}
+{%- assign add_days_end = talk_end_day | times: 24 | times: 60 | times: 60 -%}
+{%- assign timestamp_end = datetime_end | date: "%s" | plus: add_days_end | date: "%s" -%}

data/_includes/partials/header.html

@@ -5,16 +5,19 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+  {% include partials/get_page_title.html -%}
   <title>
-    {% unless page.name contains '.' %}{{ page.name }} - {% else %}{% if page.title %}{{ page.title }} - {% endif %}{% endunless %}{{ site.title }}
+    {{- page_title -}}
+    {%- unless page_title == empty %} - {% endunless -%}
+    {{- site.title -}}
   </title>
-  <meta name="description" content="{{ site.description }}" />
+  {% include partials/list_page_meta.html %}
 
   <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/main.css?t={{ site.time | date: "%s" }}" />
 
   <link rel="preload" as="font" href="{{ site.baseurl }}/assets/webfonts/fa-regular-400.woff2" type="font/woff2" crossorigin="anonymous" />
   <link rel="preload" as="font" href="{{ site.baseurl }}/assets/webfonts/fa-solid-900.woff2" type="font/woff2" crossorigin="anonymous" />
-  {% if site.conference.live -%}
+  {%- if site.conference.live %}
   <link rel="prefetch" as="image" href="{{ site.baseurl }}/assets/icons/live.svg" type="image/svg+xml" crossorigin="anonymous" />
   <link rel="prefetch" as="fetch" href="{{ site.baseurl }}/assets/js/data.json" type="application/json" crossorigin="anonymous" />
   {%- endif %}

data/_includes/partials/list_page_meta.html

@@ -0,0 +1,23 @@
+{% unless site.conference.link_preview.disable -%}
+  {%- include partials/get_page_title.html default=site.title replace_quotes=true -%}
+  {%- include partials/get_page_description.html default=site.title replace_quotes=true -%}
+
+  <meta name="description" content="{{ page_description }}" />
+
+  <meta name="twitter:card" content="summary" />
+  {%- if site.conference.link_preview.img and site.conference.link_preview.img.twitter %}
+  <meta name="twitter:image" content="{{ site.conference.link_preview.img.twitter | prepend: '/assets/images/' | prepend: site.baseurl | prepend: site.url }}" />
+  {%- endif %}
+  <meta name="twitter:title" content="{{ page_title }}" />
+  <meta name="twitter:description" content="{{ page_description }}" />
+
+  <meta property="og:site_name" content="{{ site.title }}" />
+  {%- if site.conference.link_preview.img and site.conference.link_preview.img.open_graph %}
+  <meta property="og:image" content="{{ site.conference.link_preview.img.open_graph | prepend: '/assets/images/' | prepend: site.baseurl | prepend: site.url }}" />
+  {%- endif %}
+  <meta property="og:url" content="{{ page.url | prepend: site.baseurl | prepend: site.url }}" />
+  <meta property="og:title" content="{{ page_title }}" />
+  <meta property="og:description" content="{{ page_description }}" />
+  <meta property="og:type" content="website" />
+
+{%- endunless %}

data/_includes/partials/list_speakers.html

@@ -1,4 +1,4 @@
-{%- for speaker_name in talk.speakers -%}
+{% for speaker_name in talk.speakers -%}
   {%- assign speaker = site.speakers | where: 'name', speaker_name | first -%}
   {%- if site.conference.speakers.show_firstname -%}
     {%- assign speaker_short = speaker.first_name | append: ' ' | append: speaker.last_name -%}
@@ -6,11 +6,17 @@
     {%- assign speaker_short = speaker.first_name | slice: 0 | append : '. ' | append: speaker.last_name -%}
   {%- endif -%}
 
-  {%- if speaker.hide -%}
-    {{ speaker_short }}
+  {%- if speaker.hide or include.text_only -%}
+    {{- speaker_short -}}
   {%- else -%}
-    <a class="text-reset" href="{{ speaker.url | prepend: site.baseurl }}">{{ speaker_short }}</a>
+    <a class="text-reset" href="{{ speaker.url | prepend: site.baseurl }}">
+      {{- speaker_short -}}
+    </a>
   {%- endif -%}
-  {%- if forloop.last != true %}, {% endif -%}
+
+  {%- unless forloop.last %}
+    {%- assign forloop_index_before_last = talk.speakers.size | minus: 1 -%}
+    {% if forloop.index == forloop_index_before_last and include.text_only %} {{ site.data.lang[site.conference.lang].pronoun.and | default: 'and' }} {% else %}, {% endif -%}
+  {%- endunless -%}
 
 {%- endfor -%}

data/_includes/partials/modal_live.html

@@ -26,17 +26,18 @@
           </p>
           <p class="font-weight-light mb-0" id="stream-info-speakers"></p>
         </div>
+        <div class="align-self-center m-0 mt-1" id="stream-info-links"></div>
       </div>
 
       <div class="modal-footer justify-content-around">
-        {%- for room in site.rooms -%}
+        {% for room in site.rooms -%}
           <a id="stream-button{{ forloop.index }}" href="#" class="btn btn-outline-primary d-none d-sm-inline {% unless room.live %}disabled{% endunless %}" role="button" data-room="{{ room.name }}">
             {{ room.name }}
           </a>
         {%- endfor %}
         <div class="form-group w-100 d-block d-sm-none">
           <select class="form-control" id="stream-select">
-            {%- for room in site.rooms -%}
+            {% for room in site.rooms -%}
               <option value="{{ forloop.index }}" {% unless room.live %}disabled{% endunless %}>{{ room.name }}</option>
             {%- endfor %}
           </select>

data/_includes/partials/navbar_rooms.html

@@ -1,7 +1,11 @@
 <ul class="nav nav-pills d-print-none mb-3">
   <li class="nav-item">
     <a class="nav-link {% if page.name contains 'index' %}active{% endif %}" href="{{ site.conference.location.url | prepend: site.baseurl }}">
-      {{ site.data.lang[site.conference.lang].location.directions | default: "Directions" }}
+      {% if site.conference.location.navbar_title -%}
+        {{- site.conference.location.navbar_title -}}
+      {%- else -%}
+        {{- site.data.lang[site.conference.lang].location.directions | default: "Directions" -}}
+      {%- endif %}
     </a>
   </li>
   {%- for room in site.rooms -%}

data/_layouts/data.html

@@ -88,6 +88,23 @@
                         {%- include partials/get_talk_timestamp.html %}
                 "start": {{ timestamp_start }},
                 "end": {{ timestamp_end }}
+
+                        {%- if talk.live.links -%},
+                "live_links": [
+                            {%- for link in talk.live.links %}
+                    {
+                        "name": "{{ link.name | replace: '"', '\"' }}",
+                        "href": "{{ link.absolute_url | replace: '"', '%22' }}"
+                                {%- if link.icon -%},
+                        "icon": "{{ link.icon | replace: '"', '\"' }}"
+                                {%- endif %}
+                                {%- if link.disabled -%},
+                        "disabled": true
+                                {%- endif %}
+                    }{%- unless forloop.last -%},{%- endunless -%}
+                            {%- endfor %}
+                ]
+                        {%- endif %}
             }{%- unless forloop.last -%},{%- endunless -%}
                     {%- endfor -%}
                 {%- endif -%}

data/_layouts/location.html

@@ -18,7 +18,7 @@
 
   {{ content }}
 
-  {% if site.conference.location.map.enable %}
+  {% if site.conference.location.map %}
     <div id="map" class="mt-4 mb-3"></div>
   {% endif %}
 

data/_layouts/page.html

@@ -6,4 +6,8 @@
 
 {{ content }}
 
+{% if page.map %}
+  <div id="map" class="mt-4 mb-3"></div>
+{% endif %}
+
 {% include partials/footer.html %}

data/_layouts/program.html

@@ -61,6 +61,10 @@
         <tbody>
           {%- include partials/get_day_time.html -%}
 
+          {%- if day_end_day > day_start_day -%}
+            {%- assign day_end_hour = day_end_day | minus: day_start_day | times: 24 | plus: day_end_hour -%}
+          {%- endif -%}
+
           {%- assign day_duration_min = day_end_hour | minus: day_start_hour | times: 60 | minus: day_start_min | plus: day_end_min -%}
           {%- assign nbr_steps = day_duration_min | divided_by: site.conference.program.time_steps -%}
 
@@ -74,7 +78,12 @@
           {%- assign z-index-max = 999 -%}
 
           {%- for i in (1..nbr_steps) -%}
-            {%- assign current_hour = i | minus: 1 | times: site.conference.program.time_steps | plus: day_start_min | divided_by: 60 | floor | plus: day_start_hour | modulo: 24 -%}
+            {%- assign current_day = 0 -%}
+            {%- assign current_hour = i | minus: 1 | times: site.conference.program.time_steps | plus: day_start_min | divided_by: 60 | floor | plus: day_start_hour -%}
+            {%- if current_hour >= 24 -%}
+              {%- assign current_day = current_hour | divided_by: 24 | floor -%}
+              {%- assign current_hour = current_hour | modulo: 24 -%}
+            {%- endif -%}
             {%- assign current_min = i | minus: 1 | times: site.conference.program.time_steps | plus: day_start_min | modulo: 60 -%}
             {%- if current_min < 10 -%}
               {%- assign current_time = current_hour | append: ':0' | append: current_min -%}
@@ -106,9 +115,9 @@
 
                   {%- include partials/get_talk_time.html -%}
 
-                  {%- assign d_start_hour = current_hour | minus: talk_start_hour -%}
+                  {%- assign d_start_hour = current_day | minus: talk_start_day | times: 24 | plus: current_hour | minus: talk_start_hour -%}
                   {%- assign d_start_min = current_min | minus: talk_start_min -%}
-                  {%- assign d_end_hour = current_hour | minus: talk_end_hour -%}
+                  {%- assign d_end_hour = current_day | minus: talk_end_day | times: 24 | plus: current_hour | minus: talk_end_hour -%}
                   {%- assign d_end_min = current_min | minus: talk_end_min -%}
 
                   {%- assign has_started = false -%}
@@ -127,7 +136,7 @@
                     {%- assign has_ended = true -%}
                   {%- endif -%}
 
-                  {%- if has_started and has_ended == false -%}
+                  {%- if has_started == true and has_ended == false -%}
                     {%- assign active_talk = true -%}
                   {%- endif -%}
 
@@ -156,7 +165,7 @@
 
                 {%- endfor %}
 
-                {%- unless active_talk %}
+                {%- unless active_talk == true %}
                   <td class="p-0"></td>
                 {%- endunless -%}
 

data/_layouts/stream-overview.html

@@ -18,7 +18,7 @@
   <div class="row">
       {%- endif %}
 
-    <div class="col-md">
+    <div class="col-md mb-4">
       <h3>{{ room.name }}</h3>
       <div class="embed-responsive embed-responsive-16by9">
         <iframe class="embed-responsive-item" src="{{ room.live }}" allowfullscreen></iframe>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.4.1
 platform: ruby
 authors:
 - Lorenz Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.32
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.32
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,16 +78,20 @@ files:
 - _includes/partials/footer.html
 - _includes/partials/get_day_hash.html
 - _includes/partials/get_day_time.html
+- _includes/partials/get_enable_map.html
 - _includes/partials/get_link.html
 - _includes/partials/get_link_types.html
 - _includes/partials/get_live_timestamps.html
 - _includes/partials/get_main_category.html
+- _includes/partials/get_page_description.html
+- _includes/partials/get_page_title.html
 - _includes/partials/get_talk_time.html
 - _includes/partials/get_talk_timestamp.html
 - _includes/partials/get_time_pronoun.html
 - _includes/partials/header.html
 - _includes/partials/info_bar.html
 - _includes/partials/list_categories.html
+- _includes/partials/list_page_meta.html
 - _includes/partials/list_speakers.html
 - _includes/partials/list_sub_categories.html
 - _includes/partials/modal_link.html
@@ -279,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Jekyll template for a conference website containing program, speaker, talks