jekyll-theme-conference 2.2.0 → 2.5.0

data/_includes/partials/show_room.html

@@ -1,5 +1,5 @@
 {% if room.hide or site.conference.location.hide %}
-  <span class="badge badge-light font-weight-normal"><i class="far fa-square"></i> {{ room.name }}</span><!--
+  <span class="badge badge-light font-weight-normal text-left"><i class="far fa-square"></i> {{ room.name }}</span><!--
 {% else %}
   <a href="{{ room.url | prepend: site.baseurl }}" class="badge badge-light font-weight-normal"><i class="far fa-square"></i> {{ room.name }}</a><!--
 {% endif %}-->

data/_includes/partials/show_talk_duration.html

@@ -1,3 +1,3 @@
-<span class="badge badge-light font-weight-normal">
+<span class="badge badge-light font-weight-normal text-left">
   <i class="fas fa-stopwatch"></i> {{ talk_duration_min }}min
 </span>

data/_includes/partials/show_talk_time.html

@@ -1,3 +1,3 @@
-<a href="{{ site.conference.program.url | prepend: site.baseurl }}" class="badge badge-light font-weight-normal">
+<a href="{{ site.conference.program.url | prepend: site.baseurl }}" class="badge badge-light font-weight-normal text-left">
   <i class="far fa-clock"></i> {{ talk_start_hour }}:{% if talk_start_min == 0 %}0{%endif %}{{ talk_start_min }}
 </a>

data/_layouts/location.html

@@ -6,7 +6,7 @@
     {% if page.title %}
       {{ page.title }}
     {% else %}
-      {{ site.data.lang[site.conference.lang].location.title }}
+      {{ site.data.lang[site.conference.lang].location.title | default: "Location" }}
     {% endif %}
   </h1>
 

data/_layouts/program.html

@@ -1,63 +1,20 @@
 {% include partials/header.html %}
 
-  {% for room in site.data.program %}
-    {% assign t = room.talks | first %}
-      {% include partials/get_talk_time.html %}
-
-    {% assign update_var = false %}
-
-    {% unless start_hour %}
-        {% assign update_var = true %}
-        {% else %}
-        {% if talk_start_hour < start_hour %}
-            {% assign update_var = true %}
-            {% elsif talk_start_hour == start_hour and talk_start_min < start_min %}
-            {% assign update_var = true %}
-            {% endif %}
-        {% endunless %}
-
-    {% if update_var %}
-        {% assign start_hour = talk_start_hour %}
-          {% assign start_min = talk_start_min %}
-        {% endif %}
-
-    {% assign t = room.talks | last %}
-      {% include partials/get_talk_time.html %}
-
-    {% assign update_var = false %}
-
-    {% unless end_hour %}
-        {% assign update_var = true %}
-        {% else %}
-        {% if talk_end_hour > end_hour %}
-            {% assign update_var = true %}
-            {% elsif talk_end_hour == end_hour and talk_end_min > end_min %}
-            {% assign update_var = true %}
-            {% endif %}
-        {% endunless %}
-
-    {% if update_var %}
-        {% assign end_hour = talk_end_hour %}
-          {% assign end_min = talk_end_min %}
-        {% endif %}
-        {% endfor %}
-
-  {% assign total_duration_min = end_hour | minus: start_hour | times: 60 | minus: start_min | plus: end_min %}
-  {% assign nbr_steps = total_duration_min | divided_by: site.conference.program.time_steps %}
-
+  {% include partials/get_conf_time.html %}
+  {% assign nbr_steps = conf_duration_min | divided_by: site.conference.program.time_steps %}
 
   <h1 class="display-5 mb-4">
     {% if page.title %}
       {{ page.title }}
     {% else %}
-      {{ site.data.lang[site.conference.lang].program.title }}
+      {{ site.data.lang[site.conference.lang].program.title | default: "Program" }}
     {% endif %}
   </h1>
 
   {{ content }}
 
   <div class="sticky-top syncscroll overflow-hidden" name="sync-table">
-    <table class="table">
+    <table class="table mb-0">
       <thead>
         <tr>
           <th scope="col" class="text-center">#</th>
@@ -94,8 +51,8 @@
         {% assign z-index-max = 999 %}
 
         {% for i in (1..nbr_steps) %}
-          {% assign current_hour = i | minus: 1 | times: site.conference.program.time_steps | plus: start_min | divided_by: 60 | floor | plus: start_hour | modulo: 24  %}
-          {% assign current_min = i | minus: 1 | times: site.conference.program.time_steps | plus: start_min | modulo: 60 %}
+          {% assign current_hour = i | minus: 1 | times: site.conference.program.time_steps | plus: conf_start_min | divided_by: 60 | floor | plus: conf_start_hour | modulo: 24  %}
+          {% assign current_min = i | minus: 1 | times: site.conference.program.time_steps | plus: conf_start_min | modulo: 60 %}
           {% if current_min < 10 %}
             {% assign current_time = current_hour | append: ':0' | append: current_min %}
           {% else %}
@@ -157,6 +114,9 @@
                   {% include partials/get_main_category.html %}
                   <td rowspan="{{ talk_nbr_steps }}" class="alert alert-{{ main_cat_color }} shadow-sm" style="z-index: {{ z-index-max | minus: i }}">
 
+                    {% assign live_button_styleclass = "mb-2" %}
+                    {% include partials/live_button.html %}
+
                     <p class="mb-2">
                       {% include partials/show_talk.html %}
                     </p>
@@ -190,7 +150,7 @@
   </div>
 
   {% if site.conference.talks.main_categories %}
-    <h5 class="mt-4">{{ site.data.lang[site.conference.lang].talks.legend }}</h5>
+    <h5 class="mt-4">{{ site.data.lang[site.conference.lang].program.legend | default: "Caption" }}</h5>
       {% for main_cat in site.conference.talks.main_categories %}
         <div class="d-block d-sm-inline-block m-1 p-1 pl-2 pr-2 border-soft-{{ main_cat.color }} bg-soft-{{ main_cat.color }} font-weight-normal">
           {{ main_cat.name }}

data/_layouts/room.html

@@ -7,7 +7,7 @@
 
   <!-- title shown in browser: -->
   <h1 class="display-5 mb-3 d-print-none">
-    {{ site.data.lang[site.conference.lang].location.title }}
+    {{ site.data.lang[site.conference.lang].location.title | default: "Location" }}
   </h1>
 
   {% assign this_room = page %}
@@ -16,7 +16,7 @@
   {{ content }}
 
   <h5 class="mt-4 mb-2">
-    {{ site.data.lang[site.conference.lang].location.talks }}:
+    {{ site.data.lang[site.conference.lang].location.talks | default: "Talks in this room" }}:
   </h5>
   <ul class="list-program list-unstyled">
     {% for r in site.data.program %}
@@ -31,6 +31,9 @@
               <div class="flex-column">
                 {% include partials/get_talk_time.html %}
                 {% include partials/show_talk_time.html %}
+
+                {% assign live_button_styleclass = "mb-1" %}
+                {% include partials/live_button.html %}
               </div>
               <div class="flex-column ml-2 pl-2 mb-2 border-soft-{{ main_cat_color }}">
                 <p class="mb-0">
@@ -51,7 +54,7 @@
     {% endfor %}
     {% unless room_talks %}
       <li>
-        <em>{{ site.data.lang[site.conference.lang].location.no_talks }}</em>
+        <em>{{ site.data.lang[site.conference.lang].location.no_talks | default: "no talks planned" }}</em>
       </li>
     {% endunless %}
 

data/_layouts/speaker-overview.html

@@ -4,7 +4,7 @@
     {% if page.title %}
       {{ page.title }}
     {% else %}
-      {{ site.data.lang[site.conference.lang].speaker.overview }}
+      {{ site.data.lang[site.conference.lang].speaker.overview | default: "Speakers" }}
     {% endif %}
   </h1>
 

data/_layouts/speaker.html

@@ -3,7 +3,7 @@
   {% assign speaker = page %}
 
   <p class="h6">
-    {{ site.data.lang[site.conference.lang].speaker.title }}
+    {{ site.data.lang[site.conference.lang].speaker.title | default: "Speaker" }}
   </p>
 
   <h1 class="font-weight-light mb-3">
@@ -17,7 +17,6 @@
   {% if has_icon_links %}
     <ul class="list-unstyled">
       {% for link in speaker.links %}
-        {% assign link_styleclass = "" %}
         {% include partials/get_link.html %}
 
         {% if link_icon %}
@@ -33,7 +32,7 @@
   {% endif %}
 
   {% if has_regular_links %}
-    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].more_information }}:</h5>
+    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].more_information | default: "More Information" }}:</h5>
 
     <ul class="list-unstyled">
       {% for link in speaker.links %}
@@ -62,7 +61,7 @@
   {% endfor %}
 
   {% if active_speaker %}
-    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].speaker.talks }}:</h5>
+    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].speaker.talks | default: "Talks at this conference" }}:</h5>
 
     <ul class="list-program list-unstyled">
       {% for r in site.data.program %}
@@ -83,6 +82,9 @@
                   <div class="flex-column ml-2 pl-2 mb-2 border-soft-{{ main_cat_color }}">
                     <p class="mb-0">
                       {% include partials/show_talk.html %}
+
+                      {% assign live_button_styleclass = "ml-2" %}
+                      {% include partials/live_button.html %}
                     </p>
                   </div>
                 </li>
@@ -98,7 +100,7 @@
   <p class="d-print-none mt-5">
     <a href="{{ page.collection | prepend: '/' | prepend: site.baseurl }}" class="btn btn-light">
       <i class="fas fa-users"></i>
-      {{ site.data.lang[site.conference.lang].overview }}
+      {{ site.data.lang[site.conference.lang].overview | default: "Overview" }}
     </a>
   </p>
 

data/_layouts/talk-overview.html

@@ -4,7 +4,7 @@
     {% if page.title %}
       {{ page.title }}
     {% else %}
-      {{ site.data.lang[site.conference.lang].talk.overview }}
+      {{ site.data.lang[site.conference.lang].talk.overview | default: "Talks" }}
     {% endif %}
   </h1>
 
@@ -29,13 +29,20 @@
                 {% include partials/list_speakers.html %}
               </p>
               <p class="mb-0">
+                {% for r in site.data.program %}
+                  {% for t in r.talks %}
+                    {% if talk.name == t.name %}
+                      {% include partials/live_button.html %}
+                    {% endif %}
+                  {% endfor %}
+                {% endfor %}
                 {% include partials/list_sub_categories.html %}
 
                 {% include partials/get_link_types.html %}
                 {% if has_icon_links and site.conference.talks.hide_icons != true %}
-                  <span class="{% if has_sub_categories %}ml-1{% endif %}">
+                  <span class="ml-1">
                     {% for link in talk.links %}
-                      {% assign link_styleclass = "" %}
+                      {% assign link_styleclass = "text-secondary" %}
                       {% include partials/get_link.html %}
                       {% if link_icon %}
                         {{ link_tag -}}
@@ -58,9 +65,9 @@
                     {% endfor %}
                   {% endfor %}
 
-                  {{ site.data.lang[site.conference.lang].pronoun.at }} {% include partials/show_talk_time.html %}
+                  {{ site.data.lang[site.conference.lang].pronoun.at | default: "at" }} {% include partials/show_talk_time.html %}
 
-                  {{ site.data.lang[site.conference.lang].pronoun.in }} {% include partials/show_room.html %}
+                  {{ site.data.lang[site.conference.lang].pronoun.in | default: "in"  }} {% include partials/show_room.html %}
                 </p>
               {% endif %}
 

data/_layouts/talk.html

@@ -32,20 +32,32 @@
       {% for t in r.talks %}
         {% if talk.name == t.name %}
 
+          {% if site.conference.live %}
+            {% assign time_start = t.time_start %}
+            {% assign time_end = t.time_end %}
+            {% include partials/get_timestamp.html %}
+            <span class="live-hide" data-start="{{ timestamp_start }}" data-end="{{ timestamp_end }}">
+          {% endif %}
+
           {% include partials/get_talk_time.html %}
           <span class="d-none d-sm-inline">
-            {{ site.data.lang[site.conference.lang].pronoun.at }}
+            {{ site.data.lang[site.conference.lang].pronoun.at | default: "at" }}
           </span>
           {% include partials/show_talk_time.html %}
 
+          {% if site.conference.live %}
+            </span>
+            {% include partials/live_button.html %}
+          {% endif %}
+
           {% assign room = site.rooms | where: 'name', r.room | first %}
           <span class="d-none d-sm-inline ml-1">
-            {{ site.data.lang[site.conference.lang].pronoun.in }}
+            {{ site.data.lang[site.conference.lang].pronoun.in | default: "in" }}
           </span>
           {% include partials/show_room.html %}
 
           <span class="d-none d-sm-inline ml-1">
-            {{ site.data.lang[site.conference.lang].pronoun.for }}
+            {{ site.data.lang[site.conference.lang].pronoun.for | default: "for" }}
           </span>
           {% include partials/show_talk_duration.html %}
 
@@ -61,13 +73,13 @@
   {% if has_icon_links %}
     <ul class="list-unstyled">
       {% for link in talk.links %}
-        {% assign link_styleclass = "" %}
+        {% assign link_styleclass = "text-reset" %}
         {% include partials/get_link.html %}
 
         {% if link_icon %}
           <li class="mb-1 ml-2">
             {{ link_tag }}
-              <i class="fas fa-{{ link_icon }} pr-1"></i>
+              <i class="fas fa-{{ link_icon }} pr-1 text-{{ main_cat_color }}"></i>
               {{ link.name }}
             </a>
           </li>
@@ -77,7 +89,7 @@
   {% endif %}
 
   {% if has_regular_links %}
-    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].more_information }}:</h5>
+    <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].more_information | default: "More information" }}:</h5>
 
     <ul class="list-unstyled">
       {% for link in talk.links %}
@@ -85,7 +97,7 @@
         {% include partials/get_link.html %}
 
         {% unless link_icon %}
-          <li class="mb-1 ml-2 pl-2 border-soft-primary">
+          <li class="mb-1 ml-2 pl-2 border-soft-{{ main_cat_color }}">
             {{ link_tag }}
               {{ link.name }}
             </a>
@@ -98,12 +110,12 @@
   <p class="d-print-none mt-5">
     <a href="{{ page.collection | prepend: '/' | prepend: site.baseurl }}" class="btn btn-light">
       <i class="fas fa-bullhorn"></i>
-      {{ site.data.lang[site.conference.lang].overview }}
+      {{ site.data.lang[site.conference.lang].overview | default: "Overview" }}
     </a>
 
     <a href="{{ site.conference.program.url | prepend: site.baseurl }}" class="btn btn-light">
       <i class="far fa-calendar-alt"></i>
-      {{ site.data.lang[site.conference.lang].program.title }}
+      {{ site.data.lang[site.conference.lang].program.title | default: "Program" }}
     </a>
   </p>
 

data/_sass/conference.scss

@@ -67,11 +67,27 @@ $fa-font-path: '/assets/webfonts' !default;
 
 // General
 
+//   Show pointer cursor on links opening modals
+.cursor-pointer {
+  cursor: pointer;
+}
+
 //   No bottom margin on info-bar
 .alert > p:last-of-type {
   margin-bottom: 0;
 }
 
+//   Live button icon
+.live-button > object {
+  width: 0.85em;
+  height: 0.85em;
+  color: white;
+}
+//   Live button font size in navigation bar
+.nav-link .live-button {
+  font-size: 1em;
+}
+
 // Program
 
 //   Sticky header and first column
@@ -140,6 +156,10 @@ $fa-font-path: '/assets/webfonts' !default;
 //   Program per Room
 .list-program li > div.flex-column:first-of-type {
   width: 4em;
+
+  & > * {
+    width: 4.6em;
+  }
 }
 
 // Speaker
@@ -163,28 +183,6 @@ $fa-font-path: '/assets/webfonts' !default;
   }
 }
 
-// Modal Iframe
-//   Adapt iframe size to window while preserving video ratio
-.modal-body {
-  position: relative;
-  width: 100%;
-  height: 0;
-  padding-bottom: 56.25%;
-
-  iframe {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    left: 0;
-    top: 0;
-  }
-}
-
-//   Add pointer cursor to links opening modals
-.cursor-pointer {
-  cursor: pointer;
-}
-
 
 // Print
 @media print {
@@ -214,4 +212,12 @@ $fa-font-path: '/assets/webfonts' !default;
   .table  th {
     position: inherit;
   }
+
+  // Remove live buttons
+  .live-show {
+    display: none;
+  }
+  .live-hide {
+    display: inline-block !important;
+  }
 }

data/assets/icons/live.svg

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  Original source of icon:
+    Font Awesome Free 5.15.1 by @fontawesome
+    https://fontawesome.com/license/free
+    CC BY 4.0 https://creativecommons.org/licenses/by/4.0/
+
+  Modified as following:
+    - Original path split from one into three separate paths (for each of the visual distinctive shapes)
+    - Animation of each path
+    - Removed attributes from SVG element to pass W3 validator
+-->
+<svg
+   focusable="false"
+   role="img"
+   viewBox="0 0 448 512"
+   xmlns="http://www.w3.org/2000/svg">
+  <path
+     id="dot"
+     fill="white"
+     d="M 128.081,415.959 C 128.081,451.328 99.409,480 64.04,480 28.671,480 0,451.328 0,415.959 0,380.59 28.672,351.918 64.041,351.918 c 35.369,0 64.04,28.673 64.04,64.041 z">
+    <animate
+       id="dot_hide"
+       attributeType="CSS"
+       attributeName="opacity"
+       from="0"
+       to="0"
+       dur="0.5s"
+       begin="0s;dot_animate.end+7.35s" />
+    <animate
+       id="dot_animate"
+       attributeType="CSS"
+       attributeName="opacity"
+       from="0"
+       to="1"
+       dur="0.15s"
+       begin="dot_hide.end" />
+     </path>
+  <path
+     id="arc_small"
+     fill="white"
+     d="M 303.741,463.209 C 295.387,308.609 171.556,184.622 16.791,176.259 7.656,175.765 0,183.105 0,192.253 v 48.069 c 0,8.415 6.49,15.472 14.887,16.018 111.832,7.284 201.473,96.702 208.772,208.772 0.547,8.397 7.604,14.887 16.018,14.887 h 48.069 c 9.149,10e-4 16.489,-7.655 15.995,-16.79 z">
+    <animate
+       id="arc_small_hide"
+       attributeType="CSS"
+       attributeName="opacity"
+       from="0"
+       to="0"
+       dur="0.65s"
+       begin="dot_hide.begin" />
+    <animate
+       id="arc_small_animate"
+       attributeType="CSS"
+       attributeName="opacity"
+       from="0"
+       to="1"
+       dur="0.2s"
+       begin="arc_small_hide.end" />
+     </path>
+  <path
+     id="arc_large"
+     fill="white"
+     d="M 447.99,463.497 C 439.596,229.677 251.465,40.445 16.503,32.01 7.473,31.686 0,38.981 0,48.016 v 48.068 c 0,8.625 6.835,15.645 15.453,15.999 191.179,7.839 344.627,161.316 352.465,352.465 0.353,8.618 7.373,15.453 15.999,15.453 h 48.068 c 9.034,-10e-4 16.329,-7.474 16.005,-16.504 z">
+    <animate
+       id="arc_large_hide"
+       attributeType="CSS"
+       attributeName="opacity"
+       from="0"
+       to="0"
+       dur="0.85s"
+       begin="dot_hide.begin" />
+    <animate
+       id="arc_large_animate"
+       attributeType="CSS"
+       attributeName="opacity"
+       from="0"
+       to="1"
+       dur="0.25s"
+       begin="arc_large_hide.end" />
+     </path>
+</svg>