jekyll-theme-conference 3.6.2 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8a764ea9cd83ec595e33843bfc153ed9771d50fc7913b27be142c48ec911ad
-  data.tar.gz: ed274c9834c5a2f832300d78260ddbd740471f59d53767ba34667fd4a7f2b762
+  metadata.gz: d1d770839517e574b06fdd019f0a69e4378e73984327e6c6c3f93f56eb4a1ff2
+  data.tar.gz: 9d9c91ce29f897523aef59eecfffe177f71972befc684f4982edd2c1530dc62f
 SHA512:
-  metadata.gz: 73c23afdd2af6befe4d2986ba6c8d00f6c10173a5e6ed65da2440480b8664cbfb9986457d120dc91e6386fec3f41fac4ff548d634b2f3f54186cf90385894680
-  data.tar.gz: dddb4b961103052da89c38d721411a9e853ee317ebf0c5c30bc163f307e6bfac1e1b2b65a2f966b5c349ffce42805f3ff44251930f5b8002abb1632b8ba8e482
+  metadata.gz: 3c90d5c431811772cae69566e296659c8f08d15e84fdc8fd94c11a5e28247ced8d4c6811e1e687d5ec7f7aa5a79627d6d8fc88302089bc9140a0d7c5b483c910
+  data.tar.gz: cb851debdc7ac29a89e4ea2821f5706d5dbcdf9587268fd54dd8a735fb0666fb06588ab692eefd8a9211cfdf442f6ee9563511bbdeb4a8f16b2ac9c7f346affd

data/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright 2017-2020 Lorenz Schmid
+Copyright 2017-2024 Lorenz Schmid
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -176,6 +176,8 @@ To get started, simply copy the desired workflow file to your repository and ada
 
 - `_tools/build.yml` -> `.github/workflows/build.yml`
 
+Please note that the `Gemfile.lock` of your project must be adapted to include specific versions required by Github's workflow server, i.e. run `bundle lock --add-platform x86_64-linux` to add support for them.
+
 
 ## Configuration
 
@@ -288,6 +290,8 @@ conference:
       url: 'https://github.com'
 ```
 
+The navigation bar automatically collapses when the available space is too small (e.g. on a smaller screen). The breakpoints are given by [Bootstrap](https://getbootstrap.com/docs/4.6/layout/overview/#responsive-breakpoints). The default breakpoint is `md` (collapsing if the screen width is smaller than 992px). It can be adapted by setting the `breakpoint` property under the `navigation` property to either `sm`, `md`, `lg`, or `xl`.
+
 ### 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.

data/_includes/js/live.js

@@ -2,7 +2,7 @@ window.conference.live = (() => {
     let config;
     let lang;
 
-    let data;
+    let data = {};
 
     let confStart;
     let confEnd;
@@ -117,6 +117,11 @@ window.conference.live = (() => {
         // Set and pause app time
         pauseTime();
 
+        if (!('days' in data)) {
+            console.log('Data is not loaded yet!')
+            return
+        }
+
         let dayIdx;
         if (!newDay) {
             dayIdx = 0;
@@ -359,17 +364,34 @@ window.conference.live = (() => {
     };
 
     const getRoom = (roomName) => {
-        // Return room object for given room name
-        if (roomName in data.rooms) {
-            return data.rooms[roomName];
+        // Verify if data is already loaded and object populated
+        if ('rooms' in data && Object.keys(data.rooms).length > 0) {
+            // Return room object for given room name
+            if (roomName in data.rooms) {
+                return data.rooms[roomName];
+            }
+            else {
+                return data.rooms[Object.keys(data.rooms)[0]];
+            }
         }
         else {
-            return data.rooms[Object.keys(data.rooms)[0]];
+            console.log('Cannot read rooms as data is not loaded yet!')
+            return {}
+        }
+    };
+
+    const getAllTalks = () => {
+        if ('talks' in data && Object.keys(data.talks).length > 0) {
+            return data.talks
+        }
+        else {
+            console.log('Cannot read talks as data is not loaded yet!')
+            return {}
         }
     };
 
     const getTalks = (roomName) => {
-        if (roomName in data.talks) {
+        if (roomName in getAllTalks()) {
             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
@@ -380,7 +402,7 @@ window.conference.live = (() => {
             });
         }
         else {
-            return false;
+            return [];
         }
     };
 
@@ -389,7 +411,7 @@ window.conference.live = (() => {
         const timeNow = time();
         const talksHere = getTalks(roomName);
 
-        if (talksHere) {
+        if (talksHere.length > 0) {
             if (timeNow < talksHere[talksHere.length-1].end) {
                 for (let i = 0; i < talksHere.length; i++) {
                     if (timeNow < talksHere[i].end) {
@@ -398,7 +420,18 @@ window.conference.live = (() => {
                 }
             }
         }
-        return false;
+        return {};
+    };
+
+    const getSpeaker = (speakerName) => {
+        if ('speakers' in data && Object.keys(data.speakers).length > 0) {
+            if (speakerName in data.speakers) {
+                return data.speakers[speakerName]
+            }
+        }
+
+        console.log('Cannot read speakers as data is not loaded yet!')
+        return {}
     };
 
     const getNextPause = (roomName) => {
@@ -406,7 +439,7 @@ window.conference.live = (() => {
         const timeNow = time();
         const talksHere = getTalks(roomName);
 
-        if (talksHere) {
+        if (talksHere.length > 0) {
             if (timeNow < talksHere[talksHere.length-1].end) {
                 for (let i = 1; i < talksHere.length; i++) {
                     if (timeNow < talksHere[i].start && streamPause*60 <= talksHere[i].start - talksHere[i-1].end) {
@@ -440,10 +473,10 @@ window.conference.live = (() => {
         // Update stream modal iframe:
         // Show stream with start/pause/end message (for given room) and keep updated
         const timeNow = time();
-
-        const talksHere = getTalks(roomName);
         let roomStart, roomEnd;
-        if (talksHere) {
+
+        let talksHere = getTalks(roomName);
+        if (talksHere.length > 0) {
             roomStart = talksHere[0].start;
             roomEnd = talksHere[talksHere.length-1].end;
         }
@@ -451,16 +484,19 @@ window.conference.live = (() => {
             // If no program for given room, take overall first and last talk
             roomStart = 0;
             roomEnd = 0;
-            for (let roomNameTalk in data.talks) {
+            for (let roomNameTalk in getAllTalks()) {
                 talksHere = getTalks(roomNameTalk);
-                const crntRoomStart = talksHere[0].start;
-                const crntRoomEnd = talksHere[talksHere.length-1].end;
 
-                if (roomStart == 0 || roomStart > crntRoomStart) {
-                    roomStart = crntRoomStart;
-                }
-                if (roomEnd == 0 || roomEnd < crntRoomEnd) {
-                    roomEnd = crntRoomEnd;
+                if (talksHere.length > 0) {
+                    const crntRoomStart = talksHere[0].start;
+                    const crntRoomEnd = talksHere[talksHere.length-1].end;
+
+                    if (roomStart == 0 || roomStart > crntRoomStart) {
+                        roomStart = crntRoomStart;
+                    }
+                    if (roomEnd == 0 || roomEnd < crntRoomEnd) {
+                        roomEnd = crntRoomEnd;
+                    }
                 }
             }
         }
@@ -502,14 +538,16 @@ window.conference.live = (() => {
             // Currently a talk is active
             else {
                 const room = getRoom(roomName);
-                setStreamIframeSrc(room.href);
-
-                if (!freezeTime) {
-                    if (pauseNext) {
-                        streamVideoTimer = setTimeout(setStreamVideo, delayStart(pauseNext.start + streamExtend*60) * 1000, roomName);
-                    }
-                    else {
-                        streamVideoTimer = setTimeout(setStreamVideo, delayStart(roomEnd + streamExtend*60) * 1000, roomName);
+                if (room !== {}) {
+                    setStreamIframeSrc(room.href);
+
+                    if (!freezeTime) {
+                        if (pauseNext) {
+                            streamVideoTimer = setTimeout(setStreamVideo, delayStart(pauseNext.start + streamExtend*60) * 1000, roomName);
+                        }
+                        else {
+                            streamVideoTimer = setTimeout(setStreamVideo, delayStart(roomEnd + streamExtend*60) * 1000, roomName);
+                        }
                     }
                 }
             }
@@ -526,7 +564,7 @@ window.conference.live = (() => {
             clearInterval(streamInfoTimer);
         }
 
-        if (talkNext && timeNow >= talkNext.start - streamPause*60) {
+        if (talkNext !== {} && timeNow >= talkNext.start - streamPause*60) {
             document.getElementById('stream-info').dataset.time = talkNext.start;
             document.getElementById('stream-info-time').dataset.time = talkNext.start;
 
@@ -539,8 +577,12 @@ window.conference.live = (() => {
 
             let speakerStr = '';
             for (let i = 0; i < talkNext.speakers.length; i++) {
-                let speaker = data.speakers[talkNext.speakers[i]];
-                if (speaker.href == '') {
+                let speaker = getSpeaker(talkNext.speakers[i]);
+
+                if (speaker == {}) {
+                    speakerStr += talkNext.speakers[i] +', '
+                }
+                else if (speaker.href == '') {
                     speakerStr += speaker.name +', '
                 }
                 else {
@@ -588,7 +630,7 @@ window.conference.live = (() => {
                 }
                 else if (demo) {
                     let talksHere = getTalks(roomName);
-                    if (talksHere) {
+                    if (talksHere.length > 0) {
                         streamInfoTimer = setTimeout(setStreamInfo, delayStart(talksHere[0].start - streamPrepend*60) * 1000, roomName);
                     }
                 }
@@ -603,13 +645,15 @@ window.conference.live = (() => {
 
         // Recover room name in case of empty default
         const room = getRoom(roomName);
-        roomName = room.name;
+        if (room !== {}) {
+            roomName = room.name;
 
-        setStreamVideo(roomName);
-        setStreamInfo(roomName);
+            setStreamVideo(roomName);
+            setStreamInfo(roomName);
 
-        streamModal.find('#stream-button' + room.id).addClass('active');
-        streamModal.find('#stream-select').val(room.id);
+            streamModal.find('#stream-button' + room.id).addClass('active');
+            streamModal.find('#stream-select').val(room.id);
+        }
     };
 
     const updateStream = () => {

data/_includes/partials/get_room_live_href.html

@@ -0,0 +1,8 @@
+{% assign room_live_href = '' -%}
+{%- 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 -%}
+    {%- endif -%}
+{%- endif -%}

data/_includes/partials/header.html

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

data/_includes/partials/navbar.html

@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-md navbar-light bg-light mb-3">
+<nav class="navbar navbar-expand-{{ site.conference.navigation.breakpoint | default: 'md' }} navbar-light bg-light mb-3">
   <div class="container">
 
     <a class="navbar-brand" href="{{ site.baseurl }}/">{{ site.title }}</a>
@@ -82,7 +82,7 @@
     </div>
 
     {%- if site.conference.navigation.logo %}
-      <div class="navbar-brand navbar-logo mr-0 w-25 text-right overflow-hidden">
+      <div class="navbar-brand navbar-logo mr-0 ml-1 text-right overflow-hidden">
         <a href="{{ site.conference.navigation.logo.url }}">
           {%- if site.conference.navigation.logo.img %}
             <img src="{{ site.conference.navigation.logo.img | prepend: '/assets/images/' | prepend: site.baseurl }}" class="align-middle" alt="{{ site.conference.navigation.logo.name }}" />

data/_includes/partials/navbar_rooms.html

@@ -1,48 +1,36 @@
-<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 }}">
-      {% 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 -%}
+{% assign all_hidden = true -%}
+{% unless site.conference.location.hide %}
+  {% for room in site.rooms %}
+    {% unless room.hide %}
+      {% assign all_hidden = false %}
+      {% break %}
+    {% endunless %}
+  {% endfor %}
+{% endunless %}
+
+{% unless all_hidden %}
+  <ul class="nav nav-pills d-print-none mb-3">
     <li class="nav-item">
-      {%- if room.hide %}
-        <span class="nav-item nav-link disabled">
-          {{ room.name }}
-        </span>
-      {%- else %}
-        <a class="nav-link {% if this_room.name == room.name %}active{% endif %}" href="{{ room.url | prepend: site.baseurl }}">
-          {{ room.name }}
-        </a>
-      {%- endif %}
+      <a class="nav-link {% if page.name contains 'index' %}active{% endif %}" href="{{ site.conference.location.url | prepend: site.baseurl }}">
+        {% 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>
-  {%- endfor -%}
-  {%- for room in site.rooms -%}
-    {%- assign room_displayed = false -%}
-    {%- for d in site.data.program.days -%}
-      {%- for r in d.rooms -%}
-        {%- if room.name == r.name -%}
-          {%- assign room_displayed = true -%}
-          {%- break -%}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endfor -%}
-    {%- unless room_displayed %}
+    {% for room in site.rooms or site.conference.location.hide -%}
       <li class="nav-item">
-        {%- if room.hide or site.conference.location.hide %}
+        {% if room.hide -%}
           <span class="nav-item nav-link disabled">
             {{ room.name }}
           </span>
-        {%- else %}
+        {%- else -%}
           <a class="nav-link {% if this_room.name == room.name %}active{% endif %}" href="{{ room.url | prepend: site.baseurl }}">
             {{ room.name }}
           </a>
         {%- endif %}
       </li>
-    {%- endunless -%}
-  {%- endfor %}
-</ul>
+    {%- endfor %}
+  </ul>
+{% endunless %}

data/_includes/partials/show_talk_time.html

@@ -11,7 +11,7 @@
     {%- unless talk_day_hide -%} {{ day_abbr }}, {% endunless -%}
     {%- assign talk_day_hide = false -%}
   {% endif -%}
-  {{- talk_start_hour -}}:{%- if talk_start_min == 0 -%}0{%- endif -%}{{- talk_start_min -}}
+  {{- talk_start_hour -}}:{%- if talk_start_min < 10 -%}0{%- endif -%}{{- talk_start_min -}}
 </a>
 
 {%- assign talk_time_styleclass = "" -%}

data/_layouts/data.html

@@ -15,13 +15,10 @@
     {%- 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 -%}
+            {%- include partials/get_room_live_href.html -%}
+            {%- unless room_live_href -%}
                 {%- continue -%}
-            {%- endif -%}
+            {%- endunless -%}
 
             {%- unless first_room -%}
                 ,

data/_layouts/page.html

@@ -1,7 +1,7 @@
 {% include partials/header.html %}
 
 {% if page.title -%}
-  <h1 class="font-weight-light mb-2">{{ page.title }}</h1>
+  <h1 class="display-5 mb-3">{{ page.title }}</h1>
 {%- endif %}
 
 {{ content }}

data/_layouts/stream-overview.html

@@ -21,7 +21,8 @@
     <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>
+        {%- include partials/get_room_live_href.html %}
+        <iframe class="embed-responsive-item" src="{{ room_live_href }}" allowfullscreen></iframe>
       </div>
     </div>
 

data/_sass/conference.scss

@@ -79,6 +79,11 @@ ul.btn-group {
 
 // General
 
+//   Extend logo when collapsed navbar is shown
+.navbar-collapse.show + .navbar-logo {
+  width: 100%;
+}
+
 //   Keep images in container
 main.container img {
   max-width: 100%;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.4
 platform: ruby
 authors:
 - Lorenz Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.32
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.32
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,7 @@ files:
 - _includes/partials/get_main_category.html
 - _includes/partials/get_page_description.html
 - _includes/partials/get_page_title.html
+- _includes/partials/get_room_live_href.html
 - _includes/partials/get_talk_time.html
 - _includes/partials/get_talk_timestamp.html
 - _includes/partials/get_time_pronoun.html