jekyll-theme-conference 3.4.0 → 3.6.0

data/_includes/js/map.js

@@ -0,0 +1,38 @@
+window.conference.mapConfig = (() => {
+    let config;
+    let lang;
+
+    let map;
+
+    const setup = (elId) => {
+        map = L.map(elId).setView(config.map.home_coord, config.map.default_zoom);
+
+        L.tileLayer.provider(config.map.map_provider).addTo(map);
+
+        L.easyButton('far fa-star', () => {
+            map.flyTo(config.map.home_coord, config.map.default_zoom);
+        }, lang.location.focus_conf).addTo(map);
+
+        L.control.locate({
+            flyTo: true,
+            strings: {
+                title: lang.location.focus_me
+            }
+        }).addTo(map);
+    };
+
+    const init = (c, l) => {
+        config = c;
+        lang = l;
+
+        const elId = 'map';
+
+        if (document.getElementById(elId)) {
+            setup(elId);
+        }
+    };
+
+    return {
+        init: init
+    };
+})();

data/_includes/js/{conference-modal.js → modal.js}

@@ -1,15 +1,15 @@
-window.conference.modal = (function () {
+window.conference.modal = (() => {
 
-    let show = function (el, event) {
-        let button = $(event.relatedTarget);
+    const show = (el, event) => {
+        const button = $(event.relatedTarget);
 
-        let href = button.data('href');
-        let format = button.data('format');
-        let title = button.data('title');
-        let subtitle = button.data('subtitle');
-        let footer = button.data('footer');
+        const href = button.data('href');
+        const format = button.data('format');
+        const title = button.data('title');
+        const subtitle = button.data('subtitle');
+        const footer = button.data('footer');
 
-        let modal = $(el);
+        const modal = $(el);
         modal.find('iframe').attr('src', href);
 
         if (title) {
@@ -51,8 +51,8 @@ window.conference.modal = (function () {
         }
     };
 
-    let hide = function (el) {
-        let modal = $(el);
+    const hide = (el) => {
+        const modal = $(el);
 
         modal.find('.modal-title h3').text('');
         modal.find('.modal-title h5').text('').addClass('d-none');
@@ -60,8 +60,8 @@ window.conference.modal = (function () {
         modal.find('.modal-footer p').html('');
     };
 
-    let init = function() {
-        let elSel = '#link-modal';
+    const init = () => {
+        const elSel = '#link-modal';
 
         $(elSel).on('show.bs.modal', function (event) {
             show(this, event);
@@ -76,5 +76,3 @@ window.conference.modal = (function () {
     };
 
 })();
-
-window.conference.modal.init();

data/_includes/js/{conference-program.js → program.js}

@@ -1,30 +1,26 @@
-// Vertical Scroll Sync
-{% include js/syncscroll.js %}
-
-window.conference.program = (function() {
-    let updateHash = function (hash) {
-        let scrollPosition = $('body').scrollTop() || $('html').scrollTop();
+window.conference.program = (() => {
+    const updateHash = (hash) => {
+        const scrollPosition = document.documentElement.scrollTop;
         window.location.hash = hash;
-        $('html,body').scrollTop(scrollPosition);
+        document.documentElement.scrollTop = scrollPosition;
     };
 
-    let init = function () {
+    const init = () => {
         if ($('#day-list')) {
             // Switch to day if page load with hash
-            var hash = window.location.hash;
+            const hash = window.location.hash;
             if (hash) {
                 $('#day-list a[href="' + hash + '"]').tab('show');
             }
+
             // Switch to day if today
             else {
-                let d = new Date();
-                let dStr = d.getFullYear() +"-"+ (d.getMonth()+1) +"-"+ d.getDate()
-                // since a timezone compensation is added when passed as string, today's date has also
-                // to be passed as string (as it is done below)
-                let today = new Date(dStr);
+                let today = new Date();
+                today.setHours(0,0,0,0);
 
                 $('a[data-toggle="tab"]').each(function () {
                     let d = new Date($(this).data('date'));
+                    d.setHours(0,0,0,0);
 
                     if (today.getTime() === d.getTime()) {
                         $(this).tab('show');
@@ -44,5 +40,3 @@ window.conference.program = (function() {
         init: init
     };
 })();
-
-window.conference.program.init();

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/footer.html

@@ -4,7 +4,7 @@
 
   {%- include partials/modal_link.html -%}
 
-  {%- if site.conference.live.streaming -%}
+  {%- if site.conference.live.streaming.enable -%}
     {%- include partials/modal_live.html -%}
   {%- endif -%}
 

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 -%}
-  {%- assign offset_start = site.conference.live.streaming.time_prepend | default: 5 -%}
-  {%- assign offset_end = site.conference.live.streaming.time_extend | default: 5 -%}
+{%- if site.conference.live.streaming.enable -%}
+  {%- 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/_includes/partials/get_talk_timestamp.html

@@ -1,9 +1,9 @@
 {%- include partials/get_talk_time.html -%}
 
-{%- assign datetime_start = d.date | append: " " | append: time_start -%}
+{%- 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: time_end -%}
+{%- 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

@@ -22,7 +22,7 @@
   <link rel="prefetch" as="fetch" href="{{ site.baseurl }}/assets/js/data.json" type="application/json" crossorigin="anonymous" />
   {%- endif %}
 
-  {%- if site.conference.live.streaming -%}
+  {%- if site.conference.live.streaming.enable -%}
     {%- for room in site.rooms -%}
       {%- if room.live %}
   <link rel="preconnect" href="{{ room.live }}" />

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.html

@@ -40,7 +40,7 @@
             {%- endif -%}
 
             <li class="nav-item live-show d-none" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
-              {%- if site.conference.live.streaming %}
+              {%- if site.conference.live.streaming.enable %}
                 <a class="nav-link" title="
                   {%- if link.name -%}
                     {{- link.name -}}

data/_includes/partials/show_live_button.html

@@ -1,7 +1,7 @@
 {%- if site.conference.live -%}
   {%- include partials/get_talk_timestamp.html -%}
 
-  {%- if site.conference.live.streaming -%}
+  {%- if site.conference.live.streaming.enable -%}
     <a title="{{ link.name }}" {% if site.conference.live.streaming.external -%}
       href="{{ site.conference.live.streaming.external }}"
     {%- else -%}
@@ -12,7 +12,7 @@
   {%- 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 }}">
     <object data="{{ site.baseurl }}/assets/icons/live.svg" type="image/svg+xml">!</object>
     {{ site.data.lang[site.conference.lang].live.live | default: "Live" }}
-  {%- if site.conference.live.streaming -%}
+  {%- if site.conference.live.streaming.enable -%}
     </a>
   {%- else -%}
     </span>

data/_layouts/config.html

@@ -0,0 +1,78 @@
+{
+    {%- 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 }}
+    },
+    {%- endif %}
+
+    {% if site.conference.live -%}
+    "live": {
+        "time": {
+            {% assign d = site.data.program.days | first -%}
+            {%- include partials/get_day_time.html -%}
+            {%- assign t = day_start_talk -%}
+
+            {%- 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 -%}
+
+            "start": {{ conf_start }},
+            "end": {{ conf_end }}
+        },
+
+        "streaming": {
+            "enable": {{ site.conference.live.streaming.enable | default: "false" }},
+            "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": {
+            "enable": {{ site.conference.live.demo.enable | default: "false" }},
+            "duration": {{ site.conference.live.demo.duration | default: 300 }},
+            "pause": {{ site.conference.live.demo.pause | default: 10 }}
+        }
+    },
+    {%- endif %}
+
+    "lang": {
+        {%- if enable_map %}
+        "map": {
+            "focus_conf": "{{ site.data.lang[site.conference.lang].location.focus_conf | default: "Center map on conference location" }}",
+            "focus_me": "{{ site.data.lang[site.conference.lang].location.focus_me | default: "Show me where I am" }}"
+        }
+        {%- endif -%}
+
+        {%- if site.conference.live and site.conference.live.streaming.enable -%}
+            {%- if enable_map %},{% endif %}
+        "live": {
+            "pre_stream": "{{ site.data.lang[site.conference.lang].live.pre_stream | default: "Live stream has not started yet." }}",
+            "post_stream": "{{ site.data.lang[site.conference.lang].live.post_stream | default: "Live stream has ended." }}",
+            "pause_stream": "{{ site.data.lang[site.conference.lang].live.pause_stream | default: "Live stream is currently paused." }}",
+            "time": {
+                "soon": "{{ site.data.lang[site.conference.lang].live.time.soon | default: "soon" }}",
+                "now": "{{ site.data.lang[site.conference.lang].live.time.now | default: "now" }}",
+                "in": "{{ site.data.lang[site.conference.lang].live.time.in | default: "in" }} ",
+                "since": "{{ site.data.lang[site.conference.lang].live.time.since | default: "since" }} ",
+                "weeks": "{{ site.data.lang[site.conference.lang].live.time.weeks | default: "weeks" }}",
+                "week": "{{ site.data.lang[site.conference.lang].live.time.week | default: "week" }}",
+                "days": "{{ site.data.lang[site.conference.lang].live.time.days | default: "days" }}",
+                "day": "{{ site.data.lang[site.conference.lang].live.time.day | default: "day" }}",
+                "hours": "{{ site.data.lang[site.conference.lang].live.time.hours | default: "hours" }}",
+                "hour": "{{ site.data.lang[site.conference.lang].live.time.hour | default: "hour" }}",
+                "minutes": "{{ site.data.lang[site.conference.lang].live.time.minutes | default: "minutes" }}",
+                "minute": "{{ site.data.lang[site.conference.lang].live.time.minute | default: "minute" }}"
+            }
+        }
+        {%- endif %}
+    }
+}

data/_layouts/data.html

@@ -1,5 +1,5 @@
-{% if site.conference.live and site.conference.live.streaming -%}
 {
+    {% if site.conference.live and site.conference.live.streaming.enable -%}
     "days": [
         {%- for d in site.data.program.days %}
         {
@@ -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 %}
@@ -88,6 +96,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 -%}
@@ -99,5 +124,6 @@
         {%- endunless -%}
     {%- endfor %}
     }
+
+    {%- endif %}
 }
-{%- endif -%}

data/_layouts/home.html

@@ -59,7 +59,7 @@
           {%- endif -%}
 
           <span class="live-show d-none" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
-            {% if site.conference.live.streaming %}
+            {% if site.conference.live.streaming.enable %}
               <a class="{{ btn_default }}" title="{{ link_name }}" data-toggle="modal" data-target="#stream-modal" data-room="" href="#">
             {% else %}
               {% assign link_styleclass = "{{ btn_default }}" %}

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 %}

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>

data/assets/js/config.json

@@ -0,0 +1,3 @@
+---
+layout: config
+---

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Lorenz Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -61,19 +61,20 @@ extra_rdoc_files: []
 files:
 - LICENSE.md
 - README.md
-- _includes/js/bootstrap.js
-- _includes/js/conference-live.js
-- _includes/js/conference-map.js
-- _includes/js/conference-modal.js
-- _includes/js/conference-program.js
 - _includes/js/conference.js
-- _includes/js/jquery-3.5.1.min.js
-- _includes/js/leaflet-easybutton.js
-- _includes/js/leaflet-locatecontrol.js
-- _includes/js/leaflet-providers.js
-- _includes/js/leaflet.js
-- _includes/js/popper.min.js
-- _includes/js/syncscroll.js
+- _includes/js/init.js
+- _includes/js/lib/bootstrap.js
+- _includes/js/lib/jquery-3.5.1.min.js
+- _includes/js/lib/leaflet-easybutton.js
+- _includes/js/lib/leaflet-locatecontrol.js
+- _includes/js/lib/leaflet-providers.js
+- _includes/js/lib/leaflet.js
+- _includes/js/lib/popper.min.js
+- _includes/js/lib/syncscroll.js
+- _includes/js/live.js
+- _includes/js/map.js
+- _includes/js/modal.js
+- _includes/js/program.js
 - _includes/partials/checks.html
 - _includes/partials/footer.html
 - _includes/partials/get_day_hash.html
@@ -103,6 +104,7 @@ files:
 - _includes/partials/show_talk.html
 - _includes/partials/show_talk_duration.html
 - _includes/partials/show_talk_time.html
+- _layouts/config.html
 - _layouts/data.html
 - _layouts/default.html
 - _layouts/home.html
@@ -247,6 +249,7 @@ files:
 - _sass/leaflet/leaflet.css
 - assets/css/main.scss
 - assets/icons/live.svg
+- assets/js/config.json
 - assets/js/data.json
 - assets/js/main.js
 - assets/webfonts/fa-brands-400.eot