jekyll-theme-conference 2.5.2 → 3.0.2

data/_includes/partials/get_link_types.html

@@ -1,15 +1,15 @@
-{% if talk %}
-  {% assign links = talk.links%}
-{% else if speaker %}
-  {% assign links = speaker.links%}
-{% endif %}
+{%- if talk -%}
+  {%- assign links = talk.links -%}
+{%- else if speaker -%}
+  {%- assign links = speaker.links -%}
+{%- endif -%}
 
-{% assign has_icon_links = false %}
-{% assign has_regular_links = false %}
-{% for link in links %}
-  {% if link.icon or link.file or link.video %}
-    {% assign has_icon_links = true %}
-  {% else %}
-    {% assign has_regular_links = true %}
-  {% endif %}
-{% endfor %}
+{%- assign has_icon_links = false -%}
+{%- assign has_regular_links = false -%}
+{%- for link in links -%}
+  {%- if link.icon or link.file or link.video -%}
+    {%- assign has_icon_links = true -%}
+  {%- else -%}
+    {%- assign has_regular_links = true -%}
+  {%- endif -%}
+{%- endfor -%}

data/_includes/partials/get_live_timestamps.html

@@ -0,0 +1,49 @@
+{%- assign min_pause = site.conference.live.time_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 -%}
+{%- else -%}
+  {%- assign offset_start = 0 -%}
+  {%- assign offset_end = 0 -%}
+{%- endif -%}
+
+{%- assign live_starts = "" -%}
+{%- assign live_ends = "" -%}
+
+{%- for d in site.data.program.days -%}
+  {%- for r in d.rooms -%}
+    {%- assign last_end = 0 -%}
+
+    {%- for t in r.talks -%}
+      {%- include partials/get_talk_timestamp.html -%}
+
+      {%- assign last_pause = timestamp_start | minus: last_end -%}
+
+      {%- if forloop.last == true or last_pause >= min_pause and forloop.index0 > 0 -%}
+        {%- if forloop.last -%}
+          {%- assign last_end = timestamp_end -%}
+        {%- endif -%}
+
+        {%- assign live_end = offset_end | times: 60 | plus: last_end %}
+        {%- if live_ends == "" -%}
+          {%- assign live_ends = live_end -%}
+        {%- else -%}
+          {%- assign live_ends = live_ends | append: "," | append: live_end -%}
+        {%- endif -%}
+      {%- endif -%}
+
+      {%- if forloop.index0 == 0 or last_pause >= min_pause -%}
+        {%- assign live_start = offset_start | times: -60 | plus: timestamp_start -%}
+        {%- if live_starts == "" -%}
+          {%- assign live_starts = live_start -%}
+        {%- else -%}
+          {%- assign live_starts = live_starts | append: "," | append: live_start -%}
+        {%- endif -%}
+      {%- endif -%}
+
+      {%- assign last_end = timestamp_end -%}
+    {%- endfor -%}
+  {%- endfor -%}
+{%- endfor -%}

data/_includes/partials/get_main_category.html

@@ -1,9 +1,9 @@
-{% for main_cat in site.conference.talks.main_categories %}
-  {% for cat in talk.categories %}
-    {% if cat == main_cat.name %}
-      {% assign main_cat = main_cat.name %}
-      {% assign main_cat_color = main_cat.color %}
-      {% break %}
-    {% endif %}
-  {% endfor %}
-{% endfor %}
+{%- for main_cat in site.conference.talks.main_categories -%}
+  {%- for cat in talk.categories -%}
+    {%- if cat == main_cat.name -%}
+      {%- assign main_cat = main_cat.name -%}
+      {%- assign main_cat_color = main_cat.color -%}
+      {%- break -%}
+    {%- endif -%}
+  {%- endfor -%}
+{%- endfor -%}

data/_includes/partials/get_talk_time.html

@@ -1,9 +1,9 @@
-{% assign talk_start = t.time_start %}
-{% assign talk_end = t.time_end %}
+{%- assign talk_start = t.time_start -%}
+{%- assign talk_end = t.time_end -%}
 
-{% assign talk_start_hour = talk_start | split: ':' | first %}
-{% assign talk_start_min = talk_start | split: ':' | last | divided_by: site.conference.program.time_steps | floor | times: site.conference.program.time_steps %}
-{% assign talk_end_hour = talk_end | split: ':' | first %}
-{% assign talk_end_min = talk_end | split: ':' | last | divided_by: site.conference.program.time_steps | ceil | times: site.conference.program.time_steps %}
+{%- assign talk_start_hour = talk_start | split: ':' | first -%}
+{%- assign talk_start_min = talk_start | split: ':' | last | divided_by: site.conference.program.time_steps | floor | times: site.conference.program.time_steps -%}
+{%- assign talk_end_hour = talk_end | split: ':' | first -%}
+{%- assign talk_end_min = talk_end | split: ':' | last | divided_by: site.conference.program.time_steps | ceil | times: site.conference.program.time_steps -%}
 
-{% assign talk_duration_min = talk_end_hour | minus: talk_start_hour | times: 60 | minus: talk_start_min | plus: talk_end_min %}
+{%- assign talk_duration_min = talk_end_hour | minus: talk_start_hour | times: 60 | minus: talk_start_min | plus: talk_end_min -%}

data/_includes/partials/get_talk_timestamp.html

@@ -0,0 +1,4 @@
+{%- assign datetime_start = d.date | append: " " | append: t.time_start -%}
+{%- assign timestamp_start = datetime_start | date: "%s" -%}
+{%- assign datetime_end = d.date | append: " " | append: t.time_end -%}
+{%- assign timestamp_end = datetime_end | date: "%s" -%}

data/_includes/partials/get_time_pronoun.html

@@ -0,0 +1,6 @@
+{%- assign nbr_days = site.data.program.days | size -%}
+{%- if nbr_days > 1 and day_abbr -%}
+  {%- assign time_pronoun = site.data.lang[site.conference.lang].pronoun.on_ | default: "on" -%}
+{%- else -%}
+  {%- assign time_pronoun = site.data.lang[site.conference.lang].pronoun.at | default: "at" -%}
+{%- endif -%}

data/_includes/partials/header.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ site.conference.lang }}">
+<html lang="{{ site.conference.lang | default: 'en' }}">
 
 <head>
   <meta charset="utf-8" />
@@ -10,36 +10,39 @@
   </title>
   <meta name="description" content="{{ site.description }}" />
 
-  <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/main.css" />
+  <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/main.css?t={{ site.time | date: "%s" }}" />
 
-  {%- if site.conference.live -%}
-    <link rel="prefetch" href="{{ site.baseurl }}/assets/icons/live.svg" />
-  {%- endif -%}
+  <link rel="preload" as="font" href="{{ site.baseurl }}/assets/webfonts/fa-regular-400.woff2" type="font/woff2" crossorigin="anonymous" />
+  <link rel="preload" as="font" href="{{ site.baseurl }}/assets/webfonts/fa-solid-900.woff2" type="font/woff2" crossorigin="anonymous" />
+  {% if site.conference.live -%}
+  <link rel="prefetch" as="image" href="{{ site.baseurl }}/assets/icons/live.svg" type="image/svg+xml" crossorigin="anonymous" />
+  <link rel="prefetch" as="fetch" href="{{ site.baseurl }}/assets/js/data.json" type="application/json" crossorigin="anonymous" />
+  {%- endif %}
 
   {%- if site.conference.live.streaming -%}
     {%- for room in site.rooms -%}
-      {%- if room.live -%}
-        <link rel="preconnect" href="{{ room.live }}" />
+      {%- if room.live %}
+  <link rel="preconnect" href="{{ room.live }}" />
       {%- endif -%}
     {%- endfor -%}
-  {%- endif -%}
+  {%- endif %}
 </head>
 
 <body class="pb-4">
   <header>
     <!-- navigation bar (web only): -->
-    {% include partials/navbar.html %}
+    {%- include partials/navbar.html -%}
 
-    {% unless page.url == "/" %}
+    {%- unless page.url == "/" -%}
       <!-- site title (print only): -->
       <div class="container d-none d-print-block mt-4 mb-4">
         <h1 class="display-4">
           {{ site.title }}
         </h1>
       </div>
-    {% endunless %}
+    {%- endunless -%}
 
   </header>
   <main class="container">
 
-    {% include partials/info_bar.html %}
+    {%- include partials/info_bar.html -%}

data/_includes/partials/info_bar.html

@@ -1,30 +1,30 @@
-{% if site.conference.show_errors %}
-  {% include partials/checks.html %}
-  {% if errors.size > 0 %}
-    {% for error in errors %}
+{%- if site.conference.show_errors -%}
+  {%- include partials/checks.html -%}
+  {%- if errors.size > 0 -%}
+    {%- for error in errors %}
       <div class="alert alert-danger fade show" role="alert">
         <h5 class="alert-heading">There was an error when generating when generating the site!</h5>
 
         {{ error | markdownify }}
       </div>
-    {% endfor %}
-  {% endif %}
-{% endif %}
+    {%- endfor -%}
+  {%- endif -%}
+{%- endif -%}
 
-{% if site.conference.info_bars.size > 0 %}
-  {% for info_bar in site.conference.info_bars %}
-    {% if page.url == "/" and info_bar.pages_only != true %}
-      {% assign show_info_bar = true %}
-    {% endif %}
-    {% if page.url != "/" and info_bar.main_only != true %}
-      {% assign show_info_bar = true %}
-    {% endif %}
+{%- if site.conference.info_bars.size > 0 -%}
+  {%- for info_bar in site.conference.info_bars -%}
+    {%- if page.url == "/" and info_bar.pages_only != true -%}
+      {%- assign show_info_bar = true -%}
+    {%- endif -%}
+    {%- if page.url != "/" and info_bar.main_only != true -%}
+      {%- assign show_info_bar = true -%}
+    {%- endif -%}
 
-    {% if show_info_bar %}
+    {%- if show_info_bar %}
       <div class="alert alert-{{ info_bar.color }} alert-dismissible fade show" role="alert">
-        {% if info_bar.title %}
+        {%- if info_bar.title %}
           <h4 class="alert-heading">{{ info_bar.title }}</h4>
-        {% endif %}
+        {%- endif %}
 
         {{ info_bar.text | markdownify }}
 
@@ -32,7 +32,7 @@
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
-    {% endif %}
-    {% assign show_info_bar = false %}
-  {% endfor %}
-{% endif %}
+    {%- endif -%}
+    {%- assign show_info_bar = false -%}
+  {%- endfor -%}
+{%- endif -%}

data/_includes/partials/list_categories.html

@@ -1,4 +1,4 @@
-{% include partials/get_main_category.html %}
+{%- include partials/get_main_category.html -%}
 
 <span class="badge badge-{{ main_cat_color }}">{{ main_cat }}</span>
-{% include partials/list_sub_categories.html %}
+{%- include partials/list_sub_categories.html -%}

data/_includes/partials/list_speakers.html

@@ -1,20 +1,16 @@
-{% for speaker_name in talk.speakers %}
-  {% assign speaker = site.speakers | where: 'name', speaker_name | first %}
-  {% if site.conference.speakers.show_firstname %}
-    {% assign speaker_short = speaker.first_name | append: ' ' | append: speaker.last_name %}
-  {% else %}
-    {% assign speaker_short = speaker.first_name | slice: 0 | append : '. ' | append: speaker.last_name %}
-  {% endif %}
+{%- for speaker_name in talk.speakers -%}
+  {%- assign speaker = site.speakers | where: 'name', speaker_name | first -%}
+  {%- if site.conference.speakers.show_firstname -%}
+    {%- assign speaker_short = speaker.first_name | append: ' ' | append: speaker.last_name -%}
+  {%- else -%}
+    {%- assign speaker_short = speaker.first_name | slice: 0 | append : '. ' | append: speaker.last_name -%}
+  {%- endif -%}
 
-  {% if speaker.hide %}
-    {{ speaker_short }}<!--
-  {% else %}
-    <a class="text-reset" href="{{ speaker.url | prepend: site.baseurl }}">{{ speaker_short }}</a><!--
-  {% endif %}
-  {% if forloop.last != true %}
-    -->,
-  {% else %}
-    -->
-  {% endif %}
+  {%- if speaker.hide -%}
+    {{ speaker_short }}
+  {%- else -%}
+    <a class="text-reset" href="{{ speaker.url | prepend: site.baseurl }}">{{ speaker_short }}</a>
+  {%- endif -%}
+  {%- if forloop.last != true %}, {% endif -%}
 
-{% endfor %}
+{%- endfor -%}

data/_includes/partials/list_sub_categories.html

@@ -1,8 +1,8 @@
-{% assign has_sub_categories = false %}
+{%- assign has_sub_categories = false -%}
 
-{% for cat in talk.categories %}
-  {% if cat != main_cat %}
-    {% assign has_sub_categories = true %}
-    <span class="badge badge-light text-reset font-weight-normal">{{ cat }}</span>
-  {% endif %}
-{% endfor %}
+{%- for cat in talk.categories -%}
+  {%- if cat != main_cat -%}
+    {%- assign has_sub_categories = true -%}
+    <span class="badge badge-light text-reset font-weight-normal">{{ cat }}</span>&nbsp;
+  {%- endif -%}
+{%- endfor -%}

data/_includes/partials/modal_link.html

@@ -0,0 +1,21 @@
+<div class="modal fade" id="link-modal" tabindex="-1" role="dialog" aria-labelledby="link-modal-label" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <div class="modal-title" id="link-modal-label">
+          <h3 class="mb-2 font-weight-light"></h3>
+          <h5 class="mb-0 font-weight-light"></h5>
+        </div>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body embed-responsive embed-responsive-16by9">
+        <iframe class="embed-responsive-item" src="" allowfullscreen></iframe>
+      </div>
+      <div class="modal-footer justify-content-start">
+        <p></p>
+      </div>
+    </div>
+  </div>
+</div>

data/_includes/partials/{live-modal.html → modal_live.html}

@@ -1,6 +1,7 @@
 <div class="modal fade" id="stream-modal" tabindex="-1" role="dialog" aria-labelledby="link-modal-label" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+  <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
+
       <div class="modal-header">
         <h5 class="modal-title">
           {{ site.data.lang[site.conference.lang].live.streaming | default: "Live Stream" }}
@@ -9,29 +10,39 @@
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
+
       <div class="modal-body embed-responsive embed-responsive-16by9">
         <iframe class="embed-responsive-item" src="" allowfullscreen></iframe>
         <div id="stream-placeholder" class="embed-responsive-item d-none justify-content-center align-items-center">
           <div></div>
         </div>
       </div>
-      <div class="modal-footer justify-content-around">
-        {% for r in site.data.program %}
-          {% assign room = site.rooms | where: 'name', r.room | first %}
 
+      <div class="modal-footer flex-column justify-content-start d-none live-past" id="stream-info" data-time="">
+        <div class="my-0 small align-self-start live-time" id="stream-info-time" data-time=""></div>
+        <div class="pl-2 align-self-start" id="stream-info-color">
+          <p class="mb-0">
+            <a class="text-reset" href="#" id="stream-info-talk"></a>
+          </p>
+          <p class="font-weight-light mb-0" id="stream-info-speakers"></p>
+        </div>
+      </div>
+
+      <div class="modal-footer justify-content-around">
+        {%- 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 %}
+        {%- endfor %}
         <div class="form-group w-100 d-block d-sm-none">
           <select class="form-control" id="stream-select">
-            {% for r in site.data.program %}
-              {% assign room = site.rooms | where: 'name', r.room | first %}
-              <option {% unless room.live %}disabled{% endunless %}>{{ room.name }}</option>
-            {% endfor %}
+            {%- for room in site.rooms -%}
+              <option value="{{ forloop.index }}" {% unless room.live %}disabled{% endunless %}>{{ room.name }}</option>
+            {%- endfor %}
           </select>
         </div>
       </div>
+
     </div>
   </div>
 </div>

data/_includes/partials/navbar.html

@@ -9,44 +9,44 @@
 
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav mr-auto">
-        {% for link in site.conference.navigation.links %}
+        {%- for link in site.conference.navigation.links -%}
 
-          {% if link.menu %}
+          {%- if link.menu %}
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="navbar-dropdown{{ forloop.index0 }}" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 {{ link.name }}
               </a>
               <div class="dropdown-menu" aria-labelledby="navbar-dropdown{{ forloop.index0 }}">
-                {% assign parent_link = link %}
-                {% for link in parent_link.menu %}
-                  {% assign link_styleclass = "dropdown-item" %}
-                  {% include partials/get_link.html %}
+                {%- 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 %}
+                {%- endfor %}
               </div>
             </li>
 
-          {% elsif link.live %}
-            {% include partials/get_conf_time.html %}
-            {% assign time_start = conf_start %}
-            {% assign time_end = conf_end %}
-            {% include partials/get_timestamp.html %}
+          {%- elsif link.live -%}
+            {%- include partials/get_live_timestamps.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_inactive -%}
+              <li class="nav-item live-hide" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
+                <a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">
+                  {{ link.name_inactive }}
+                </a>
+              </li>
+            {%- endif -%}
 
-            <li class="nav-item live-show d-none" data-start="{{ timestamp_start }}" data-end="{{ timestamp_end }}">
-              {% if site.conference.live.streaming %}
+            <li class="nav-item live-show d-none" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
+              {%- if site.conference.live.streaming %}
                 <a class="nav-link" title="{% if link.name %}{{ link.name }}{% else %}{{ site.data.lang[site.conference.lang].live.streaming | default: "Live Stream" }}{% endif %}" data-toggle="modal" data-target="#stream-modal" data-room="" href="#">
-              {% else %}
-                {% assign link_styleclass = "nav-link" %}
-                {% include partials/get_link.html %}
+              {%- else %}
+                {%- assign link_styleclass = "nav-link" -%}
+                {%- include partials/get_link.html %}
                 {{ link_tag }}
-              {% endif %}
+              {%- endif %}
 
                 {{ link.name | default: "" }}
 
@@ -57,30 +57,30 @@
               </a>
             </li>
 
-          {% else %}
+          {%- else %}
             <li class="nav-item {% if page.url contains link.relative_url %}active{% endif %}">
-              {% assign link_styleclass = "nav-link" %}
-              {% include partials/get_link.html %}
+              {%- assign link_styleclass = "nav-link" -%}
+              {%- include partials/get_link.html -%}
               {{ link_tag }}
                 {{ link.name }}
               </a>
             </li>
-          {% endif %}
-        {% endfor %}
+          {%- endif -%}
+        {%- endfor %}
       </ul>
     </div>
 
-    {% if site.conference.navigation.logo %}
+    {%- if site.conference.navigation.logo %}
       <div class="navbar-brand navbar-logo mr-0 w-25 text-right overflow-hidden">
         <a href="{{ site.conference.navigation.logo.url }}">
-          {% if site.conference.navigation.logo.img %}
+          {%- 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 }}" />
-          {% else %}
+          {%- else %}
             {{ site.conference.navigation.logo.name }}
-          {% endif %}
+          {%- endif %}
         </a>
       </div>
-    {% endif %}
+    {%- endif %}
 
   </div>
 </nav>