jekyll-theme-conference 2.4.1 → 2.5.4

data/_layouts/delete_hidden.html

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+{% if site.conference.location.hide -%}
+rm -r _site/rooms
+rm -r _site/{{ site.conference.location.url | default: "location" }}
+{% else -%}
+{%- for room in site.rooms -%}
+{%- if room.hide -%}
+rm -r _site/{{ room.url | slice: 1, room.url.size }}
+{% endif -%}
+{%- endfor -%}
+{%- endif -%}
+
+{%- for speaker in site.speakers -%}
+{%- if speaker.hide -%}
+rm -r _site/{{ speaker.url | slice: 1, speaker.url.size }}
+{% endif -%}
+{%- endfor -%}
+
+{%- for talk in site.talks -%}
+{%- if talk.hide -%}
+rm -r _site/{{ talk.url | slice: 1, talk.url.size }}
+{% endif -%}
+{%- endfor %}
+rm _site/delete_hidden.sh

data/_layouts/home.html

@@ -22,13 +22,63 @@
     {{ content }}
 
     {% if site.conference.main.links %}
-      <p class="lead d-print-none">
+      <div class="lead d-print-none">
       {% for link in site.conference.main.links %}
-        {% assign link_styleclass = "btn btn-outline-primary btn-lg mt-2" %}
-        {% include partials/get_link.html %}
-        {{ link_tag }}
-          {{ link.name }}
-        </a>
+
+        {% if link.menu %}
+          <div class="dropdown d-inline">
+            <a class="btn btn-outline-primary btn-lg mt-2 dropdown-toggle" href="#" role="button" id="main-dropdown{{ forloop.index0 }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              {{ link.name }}
+            </a>
+            <div class="dropdown-menu" aria-labelledby="main-dropdown{{ forloop.index0 }}">
+              {% assign parent_link = link %}
+              {% for link in parent_link.menu %}
+                {% assign link_styleclass = "dropdown-item" %}
+                {% include partials/get_link.html %}
+                {{ link_tag }}
+                  {{ link.name }}
+                </a>
+              {% endfor %}
+            </div>
+          </div>
+
+        {% elsif link.live %}
+          {% include partials/get_conf_time.html %}
+          {% assign time_start = conf_start %}
+          {% assign time_end = conf_end %}
+          {% include partials/get_timestamp.html %}
+
+          {% assign offset_start = site.conference.live.streaming.start_early | default: 0 %}
+          {% assign offset_end = site.conference.live.streaming.end_late | default: 0 %}
+          {% assign timestamp_start = offset_start | times: -60 | plus: timestamp_start %}
+          {% assign timestamp_end = offset_end | times: 60 | plus: timestamp_end %}
+
+          {% if link.name %}
+            {% assign link_name = link.name %}
+          {% else %}
+            {% assign link_name =  site.data.lang[site.conference.lang].live.streaming | default: "Live Stream" %}
+          {% endif %}
+
+          <span class="live-show d-none" data-start="{{ timestamp_start }}" data-end="{{ timestamp_end }}">
+            {% if site.conference.live.streaming %}
+              <a class="btn btn-outline-primary btn-lg mt-2" title="{{ link_name }}" data-toggle="modal" data-target="#stream-modal" data-room="" href="#">
+            {% else %}
+              {% assign link_styleclass = "btn btn-outline-primary btn-lg mt-2" %}
+              {% include partials/get_link.html %}
+              {{ link_tag }}
+            {% endif %}
+
+              {{ link_name }}
+            </a>
+          </span>
+
+        {% else %}
+          {% assign link_styleclass = "btn btn-outline-primary btn-lg mt-2" %}
+          {% include partials/get_link.html %}
+          {{ link_tag }}
+            {{ link.name }}
+          </a>
+        {% endif %}
       {% endfor %}
       </p>
     {% endif %}

data/_layouts/program.html

@@ -1,50 +1,7 @@
 {% 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 %}
@@ -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>

data/_layouts/room.html

@@ -1,4 +1,7 @@
-{% include partials/header.html %}
+{%- assign this_room = page -%}
+
+{%- unless this_room.hide or site.conference.location.hide -%}
+  {%- include partials/header.html -%}
 
   <!-- title for print: -->
   <h1 class="display-5 mb-3 d-none d-print-inline">
@@ -10,7 +13,6 @@
     {{ site.data.lang[site.conference.lang].location.title | default: "Location" }}
   </h1>
 
-  {% assign this_room = page %}
   {% include partials/navbar_rooms.html %}
 
   {{ content }}
@@ -31,6 +33,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">
@@ -57,4 +62,5 @@
 
   </ul>
 
-{% include partials/footer.html %}
+  {%- include partials/footer.html -%}
+{%- endunless -%}

data/_layouts/speaker.html

@@ -1,6 +1,7 @@
-{% include partials/header.html %}
+{%- assign speaker = page -%}
 
-  {% assign speaker = page %}
+{%- unless speaker.hide -%}
+  {%- include partials/header.html -%}
 
   <p class="h6">
     {{ site.data.lang[site.conference.lang].speaker.title | default: "Speaker" }}
@@ -17,14 +18,12 @@
   {% if has_icon_links %}
     <ul class="list-unstyled">
       {% for link in speaker.links %}
-        {% assign link_styleclass = "" %}
         {% 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>
-              {{ link.name }}
+              <i class="fas fa-{{ link_icon }} pr-1"></i>&nbsp;{{ link.name }}
             </a>
           </li>
         {% endif %}
@@ -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>
@@ -97,9 +99,9 @@
 
   <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 | default: "Overview" }}
+      <i class="fas fa-users"></i>&nbsp;{{ site.data.lang[site.conference.lang].overview | default: "Overview" }}
     </a>
   </p>
 
-{% include partials/footer.html %}
+  {%- include partials/footer.html -%}
+{%- endunless -%}

data/_layouts/talk-overview.html

@@ -29,6 +29,13 @@
                 {% 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 %}
@@ -39,7 +46,7 @@
                       {% include partials/get_link.html %}
                       {% if link_icon %}
                         {{ link_tag -}}
-                          <i class="fas fa-{{ link_icon }} pr-1"></i></a>
+                          <i class="fas fa-{{ link_icon }} p-1"></i></a>
                       {% endif %}
                     {% endfor %}
                   </span>

data/_layouts/talk.html

@@ -1,6 +1,7 @@
-{% include partials/header.html %}
+{%- assign talk = page -%}
 
-  {% assign talk = page %}
+{%- unless talk.hide -%}
+  {%- include partials/header.html -%}
 
   <div class="d-flex flex-lg-row flex-column container-fluid mb-2 p-0">
     <div class="h6 mt-2 mb-0 mr-1 pr-1 pb-1">
@@ -32,12 +33,24 @@
       {% 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 | 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 | default: "in" }}
@@ -67,8 +80,7 @@
         {% if link_icon %}
           <li class="mb-1 ml-2">
             {{ link_tag }}
-              <i class="fas fa-{{ link_icon }} pr-1 text-{{ main_cat_color }}"></i>
-              {{ link.name }}
+              <i class="fas fa-{{ link_icon }} pr-1 text-{{ main_cat_color }}"></i>&nbsp;{{ link.name }}
             </a>
           </li>
         {% endif %}
@@ -97,14 +109,13 @@
 
   <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 | default: "Overview" }}
+      <i class="fas fa-bullhorn"></i>&nbsp;{{ 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 | default: "Program" }}
+      <i class="far fa-calendar-alt"></i>&nbsp;{{ site.data.lang[site.conference.lang].program.title | default: "Program" }}
     </a>
   </p>
 
-{% include partials/footer.html %}
+  {%- include partials/footer.html -%}
+{%- endunless -%}

data/_sass/conference.scss

@@ -72,6 +72,17 @@ $fa-font-path: '/assets/webfonts' !default;
   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 +151,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 +178,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 +207,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="500ms"
+       begin="0s;dot_animate.end+7.35s" />
+    <animate
+       id="dot_animate"
+       attributeType="CSS"
+       attributeName="opacity"
+       from="0"
+       to="1"
+       dur="150ms"
+       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="650ms"
+       begin="dot_hide.begin" />
+    <animate
+       id="arc_small_animate"
+       attributeType="CSS"
+       attributeName="opacity"
+       from="0"
+       to="1"
+       dur="200ms"
+       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="850ms"
+       begin="dot_hide.begin" />
+    <animate
+       id="arc_large_animate"
+       attributeType="CSS"
+       attributeName="opacity"
+       from="0"
+       to="1"
+       dur="250ms"
+       begin="arc_large_hide.end" />
+     </path>
+</svg>