jekyll-theme-conference 2.3.0 → 2.5.1

data/_includes/partials/navbar_rooms.html

@@ -1,7 +1,7 @@
 <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 }}
+      {{ site.data.lang[site.conference.lang].location.directions | default: "Directions" }}
     </a>
   </li>
   {% for r in site.data.program %}

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

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

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

@@ -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">
@@ -7,16 +10,15 @@
 
   <!-- 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 %}
   {% include partials/navbar_rooms.html %}
 
   {{ 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 +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">
@@ -51,10 +56,11 @@
     {% 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 %}
 
   </ul>
 
-{% include partials/footer.html %}
+  {%- include partials/footer.html -%}
+{%- 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

@@ -1,9 +1,10 @@
-{% 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 }}
+    {{ site.data.lang[site.conference.lang].speaker.title | default: "Speaker" }}
   </p>
 
   <h1 class="font-weight-light mb-3">
@@ -17,7 +18,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 +33,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 +62,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 +83,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,8 +101,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 }}
+      {{ 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

@@ -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,17 +29,24 @@
                 {% 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 -}}
-                          <i class="fas fa-{{ link_icon }} pr-1"></i></a>
+                          <i class="fas fa-{{ link_icon }} p-1"></i></a>
                       {% endif %}
                     {% endfor %}
                   </span>
@@ -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

@@ -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,20 +33,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 +74,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 +90,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 +98,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,13 +111,14 @@
   <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>
 
-{% 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;
+  }
 }