jekyll-theme-conference 3.6.6 → 3.7.0

data/_includes/partials/checks.html

@@ -1,69 +1,105 @@
-{%- assign errors = '' | split: ',' -%}
-
-{%- unless site.data.lang.version -%}
-  {%- unless site.conference.lang == "en" -%}
-    {%- assign errors = errors | push : "The internationalization file containing different strings for this template seems to be missing. Have you copied the `_data/lang.yml` file from the [theme's repository](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/blob/main/_data/lang.yml) to you local website folder?" -%}
-  {%- endunless -%}
-{%- elsif site.data.lang.version != 8 -%}
-  {%- assign errors = errors | push : "The internationalization file in `_data/lang.yml` seems to be outdated and does not correspond to the current version of the theme. Grab the current version from the [theme's repository](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/blob/main/_data/lang.yml)." -%}
-{%- endunless -%}
-{%- unless site.conference.lang == "en" or site.conference.lang == "de" or site.conference.lang == "fr" or site.conference.lang == "pt" -%}
-  {%- assign errors = errors | push : "Unknown language selected for `site.conference.lang` parameter. Supported are `en`, `de`, `fr`, and `pt`." -%}
-{%- endunless -%}
-
-{%- assign main_category_size = site.conference.talks.main_categories | size -%}
-{%- if main_category_size == 0 -%}
-  {%- assign errors = errors | push : "Your `_config.yml` configuration file does not define any main category for your talks. Have you set the `conference.talks.main_categories` property? See also [Talk Settings](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/#talk-settings) section in the theme's README file." -%}
-{%- endif -%}
-
-{%- assign nbr_days = site.data.program.days | size -%}
-{%- if nbr_days == 0 -%}
-  {%- assign errors = errors | push : "Your schedule in `_data/program.yml` does not seem to contain any days. Have you already created the file?" -%}
-{%- endif -%}
-{%- if site.conference.live -%}
-  {%- for d in site.data.program.days -%}
-    {%- unless d.date or d.date == "" -%}
-      {%- assign error_msg = "Day " | append: forloop.index | append: " in your schedule should have a (non-empty) `date` property."  -%}
-      {%- assign errors = errors | push : error_msg -%}
-    {%- endunless -%}
-  {%- endfor -%}
-{%- endif -%}
-
-{%- assign nbr_rooms = site.rooms | size -%}
-{%- if nbr_rooms == 0 -%}
-  {%- assign errors = errors | push : "The `rooms` collection does not seem to contain any entry. Have you accidentially renamed the collection or is your `_rooms/` folder empty?" -%}
-{%- else -%}
-  {%- for room in site.rooms -%}
-    {%- assign nbr_rooms_name = site.rooms | where: 'name', room.name | size %}
-    {%- if nbr_rooms_name > 1 -%}
-      {%- assign error_msg = "The room with the `name` _" | append: room.name | append: "_ oocures more than once but should be unique."  -%}
-      {%- assign errors = errors | push : error_msg -%}
-    {%- endif -%}
-  {%- endfor -%}
-{%- endif -%}
-
-{%- assign nbr_speakers = site.speakers | size -%}
-{%- if nbr_speakers == 0 -%}
-  {%- assign errors = errors | push : "The `speakers` collection does not seem to contain any entry. Have you accidentially renamed the collection or is your `_speakers/` folder empty?" -%}
-{%- else -%}
-  {%- for speaker in site.speakers -%}
-    {%- assign nbr_speakers_name = site.speakers | where: 'name', speaker.name | size %}
-    {%- if nbr_speakers_name > 1 -%}
-      {%- assign error_msg = "The speaker with the `name` _" | append: speaker.name | append: "_ oocures more than once but should be unique."  -%}
-      {%- assign errors = errors | push : error_msg -%}
-    {%- endif -%}
-  {%- endfor -%}
-{%- endif -%}
-
-{%- assign nbr_talks = site.talks | size -%}
-{%- if nbr_talks == 0 -%}
-  {%- assign errors = errors | push : "The `talks` collection does not seem to contain any entry. Have you accidentially renamed the collection or is your `_talks/` folder empty?" -%}
-{%- else -%}
-  {%- for talk in site.talks -%}
-    {%- assign nbr_talks_name = site.talks | where: 'name', talk.name | size %}
-    {%- if nbr_talks_name > 1 -%}
-      {%- assign error_msg = "The talk with the `name` _" | append: talk.name | append: "_ oocures more than once but should be unique."  -%}
-      {%- assign errors = errors | push : error_msg -%}
-    {%- endif -%}
-  {%- endfor -%}
-{%- endif -%}
+{%- assign errors = '' | split: ',' -%}
+
+{%- unless site.data.lang.version -%}
+  {%- unless site.conference.lang == "en" -%}
+    {%- assign errors = errors | push: "The internationalization file containing different strings for this template seems to be missing. Have you copied the `_data/lang.yml` file from the [theme's repository](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/blob/main/_data/lang.yml) to you local website folder?" -%}
+  {%- endunless -%}
+{%- elsif site.data.lang.version != 8 -%}
+  {%- assign errors = errors | push: "The internationalization file in `_data/lang.yml` seems to be outdated and does not correspond to the current version of the theme. Grab the current version from the [theme's repository](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/blob/main/_data/lang.yml)." -%}
+{%- endunless -%}
+{%- unless site.conference.lang == "en" or site.conference.lang == "de" or site.conference.lang == "fr" or site.conference.lang == "pt" -%}
+  {%- assign errors = errors | push: "Unknown language selected for `site.conference.lang` parameter. Supported are `en`, `de`, `fr`, and `pt`." -%}
+{%- endunless -%}
+
+{%- assign missing_tracks = "" | split: "," -%}
+{%- assign talks_with_categories = 0 -%}
+{%- for talk in site.talks -%}
+  {%- assign missing_track = 1 -%}
+  {%- for track in site.conference.talks.tracks -%}
+    {%- if talk.track == track.name -%}
+      {%- assign missing_track = 0 -%}
+      {%- break -%}
+    {%- endif -%}
+  {%- endfor -%}
+  {%- if missing_track > 0 -%}
+    {%- unless missing_tracks contains talk.track -%}
+      {%- assign missing_tracks = missing_tracks | push: talk.track -%}
+    {%- endunless -%}
+  {%- endif -%}
+  {%- if talk.categories.size > 0 -%}
+    {%- assign talks_with_categories = talks_with_categories | plus: 1 -%}
+  {%- endif -%}
+{%- endfor -%}
+{%- assign main_categories_size = site.conference.talks.main_categories | size -%}
+{%- if main_categories_size > 0 -%}
+  {%- assign errors = errors | push: "Your `_config.yml` file contains an outdated property name. Please rename `conference.talks.main_categories` to `conference.talks.tracks` in your configuration. For more details, refer to the [Talk Settings](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/#talk-settings) section in the theme's README." -%}
+{%- endif -%}
+{%- if talks_with_categories > 0 -%}
+  {%- assign errors = errors | push: "The `categories` property in the FrontMatter of some of your talks is deprecated. Please update it by reorganizing the content into `track` and `tags` properties instead. For more details, refer to the [Talk Settings](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/#talk-settings) section in the theme's README." -%}
+{%- endif -%}
+{%- if missing_tracks.size > 0 -%}
+  {%- capture error_msg -%}
+    It looks like some of your talks are assigned to tracks not defined in your `_config.yml` file. Please add the following missing tracks to the `conference.talks.tracks` property in your configuration:
+    {%- for missing_track in missing_tracks %}
+- {{ missing_track }}
+{% endfor %}
+For more details, refer to the [Talk Settings](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/#talk-settings) section in the theme's README
+  {%- endcapture -%}
+  {%- assign errors = errors | push: error_msg -%}
+{%- endif -%}
+
+{%- if site.conference.talks.hide_icons == true -%}
+  {%- assign errors = errors | push: "Your `_config.yml` file contains an outdated property name. Please rename `conference.talks.hide_icons` to `conference.talks.hide_link_icons` in your configuration. For more details, refer to the [Talk Settings](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/#talk-settings) section in the theme's README." -%}
+{%- endif -%}
+
+{%- assign nbr_days = site.data.program.days | size -%}
+{%- if nbr_days == 0 -%}
+  {%- assign errors = errors | push: "Your schedule in `_data/program.yml` does not seem to contain any days. Have you already created the file?" -%}
+{%- endif -%}
+{%- if site.conference.live -%}
+  {%- for d in site.data.program.days -%}
+    {%- unless d.date or d.date == "" -%}
+      {%- assign error_msg = "Day " | append: forloop.index | append: " in your schedule should have a (non-empty) `date` property."  -%}
+      {%- assign errors = errors | push: error_msg -%}
+    {%- endunless -%}
+  {%- endfor -%}
+{%- endif -%}
+
+{%- assign nbr_rooms = site.rooms | size -%}
+{%- if nbr_rooms == 0 -%}
+  {%- assign errors = errors | push: "The `rooms` collection does not seem to contain any entry. Have you accidentally renamed the collection or is your `_rooms/` folder empty?" -%}
+{%- else -%}
+  {%- for room in site.rooms -%}
+    {%- assign nbr_rooms_name = site.rooms | where: 'name', room.name | size -%}
+    {%- if nbr_rooms_name > 1 -%}
+      {%- assign error_msg = "The room with the `name` _" | append: room.name | append: "_ occurs more than once but should be unique."  -%}
+      {%- assign errors = errors | push: error_msg -%}
+    {%- endif -%}
+  {%- endfor -%}
+{%- endif -%}
+
+{%- assign nbr_speakers = site.speakers | size -%}
+{%- if nbr_speakers == 0 -%}
+  {%- assign errors = errors | push: "The `speakers` collection does not seem to contain any entry. Have you accidentally renamed the collection or is your `_speakers/` folder empty?" -%}
+{%- else -%}
+  {%- for speaker in site.speakers -%}
+    {%- assign nbr_speakers_name = site.speakers | where: 'name', speaker.name | size -%}
+    {%- if nbr_speakers_name > 1 -%}
+      {%- assign error_msg = "The speaker with the `name` _" | append: speaker.name | append: "_ occurs more than once but should be unique."  -%}
+      {%- assign errors = errors | push: error_msg -%}
+    {%- endif -%}
+  {%- endfor -%}
+{%- endif -%}
+
+{%- assign nbr_talks = site.talks | size -%}
+{%- if nbr_talks == 0 -%}
+  {%- assign errors = errors | push: "The `talks` collection does not seem to contain any entry. Have you accidentally renamed the collection or is your `_talks/` folder empty?" -%}
+{%- else -%}
+  {%- for talk in site.talks -%}
+    {%- assign nbr_talks_name = site.talks | where: 'name', talk.name | size -%}
+    {%- if nbr_talks_name > 1 -%}
+      {%- assign error_msg = "The talk with the `name` _" | append: talk.name | append: "_ occurs more than once but should be unique."  -%}
+      {%- assign errors = errors | push: error_msg -%}
+    {%- endif -%}
+  {%- endfor -%}
+{%- endif -%}

data/_includes/partials/get_link.html

@@ -1,85 +1,99 @@
-
-{%- assign link_disabled = link.disabled -%}
-{%- assign link_icon = link.icon -%}
-{%- assign link_iframe = link.iframe -%}
-
-{%- if link.absolute_url -%}
-  {%- assign link_href = link.absolute_url -%}
-
-{%- elsif link.relative_url -%}
-  {%- assign link_href = link.relative_url | prepend: site.baseurl -%}
-
-{%- elsif link.file -%}
-  {%- assign link_icon = "file-alt" -%}
-
-  {%- if talk -%}
-    {%- assign link_href = link.file | prepend: '/documents/slides/' | prepend: site.baseurl -%}
-
-  {%- elsif speaker -%}
-    {%- assign link_href = link.file | prepend: '/documents/bio/' | prepend: site.baseurl -%}
-
-  {%- else -%}
-    {%- assign link_href = link.file | prepend: '/documents/' | prepend: site.baseurl -%}
-
-  {%- endif -%}
-
-{%- elsif link.video -%}
-  {%- assign link_href = link.video -%}
-  {%- assign link_icon = "video" -%}
-  {%- assign link_iframe = true -%}
-
-  {%- if talk -%}
-    {%- capture modal_title -%}
-      {%- if talk.hide -%}
-        {{ talk.name }}
-      {%- else -%}
-        <a class="text-reset" href="{{ talk.url | prepend: site.baseurl }}">
-          {{ talk.name }}
-        </a>
-      {%- endif -%}
-    {%- endcapture -%}
-    {%- capture modal_subtitle -%}
-      {%- include partials/list_speakers.html -%}
-    {%- endcapture -%}
-
-  {%- elsif speaker -%}
-    {%- capture modal_title -%}
-      {%- if speaker.hide -%}
-        {{ speaker.first_name }} {{ speaker.last_name }}
-      {%- else -%}
-        <a class="text-reset" href="{{ speaker.url | prepend: site.baseurl }}">
-          {{ speaker.first_name }} {{ speaker.last_name }}
-        </a>
-      {%- endif -%}
-    {%- endcapture -%}
-    {%- assign modal_footer = link.name -%}
-
-  {%- endif -%}
-
-{%- else -%}
-  {%- assign link_disabled = true -%}
-
-{%- endif -%}
-
-{%- capture link_tag -%}
-  {%- if link.disabled -%}
-    <a class="disabled{% if link_styleclass %} {{ link_styleclass }}{% endif %}" href="#">
-
-  {%- elsif link_iframe -%}
-    <a {% if link_styleclass %}class="{{ link_styleclass }}"{% endif %} title="{{ link.name }}" data-toggle="modal" data-target="#link-modal" data-href="{{ link_href }}" href="#" {% if modal_title -%}
-      data-format='html' data-title="{{ modal_title | strip_newlines | escape }}" {%- if modal_subtitle %} data-subtitle="{{ modal_subtitle | strip_newlines | escape }}"{%- endif -%}
-    {%- elsif link.name -%}
-      data-format='text' data-title="{{ link.name }}"
-    {%- endif %} {% if modal_footer -%}
-      data-format='html' data-footer="{{ modal_footer | strip_newlines | escape }}"
-    {%- elsif link.description -%}
-      data-format='text' data-footer="{{ link.description }}"
-    {%- endif %}>
-
-  {%- else -%}
-    <a{% if link_styleclass %} class="{{ link_styleclass }}"{% endif %} href="{{ link_href }}" title="{{ link.name }}">
-
-  {%- endif -%}
-{%- endcapture -%}
-
-{%- assign link_styleclass = "" -%}
+{%- assign link_valid = false -%}
+{%- if link.live -%}
+  {%- if include.link_type == "live" -%}
+    {%- assign link_valid = true -%}
+  {%- endif -%}
+{%- elsif link.icon or link.file or link.video -%}
+  {%- if include.link_type == "icon" -%}
+    {%- assign link_valid = true -%}
+  {%- endif -%}
+{%- else -%}
+  {%- if include.link_type == "regular" -%}
+    {%- assign link_valid = true -%}
+  {%- endif -%}
+{%- endif -%}
+
+{%- assign link_disabled = link.disabled -%}
+{%- assign link_icon = link.icon -%}
+{%- assign link_iframe = link.iframe -%}
+
+{%- if link.absolute_url -%}
+  {%- assign link_href = link.absolute_url -%}
+
+{%- elsif link.relative_url -%}
+  {%- assign link_href = link.relative_url | prepend: site.baseurl -%}
+
+{%- elsif link.file -%}
+  {%- assign link_icon = link.icon | default: "file-alt" -%}
+
+  {%- if talk -%}
+    {%- assign link_href = link.file | prepend: '/documents/slides/' | prepend: site.baseurl -%}
+
+  {%- elsif speaker -%}
+    {%- assign link_href = link.file | prepend: '/documents/bio/' | prepend: site.baseurl -%}
+
+  {%- else -%}
+    {%- assign link_href = link.file | prepend: '/documents/' | prepend: site.baseurl -%}
+
+  {%- endif -%}
+
+{%- elsif link.video -%}
+  {%- assign link_href = link.video -%}
+  {%- assign link_icon = link.icon | default: "video" -%}
+  {%- assign link_iframe = link.iframe | default: true -%}
+
+  {%- if talk -%}
+    {%- capture modal_title -%}
+      {%- if talk.hide -%}
+        {{ talk.name }}
+      {%- else -%}
+        <a class="text-reset" href="{{ talk.url | prepend: site.baseurl }}">
+          {{ talk.name }}
+        </a>
+      {%- endif -%}
+    {%- endcapture -%}
+    {%- capture modal_subtitle -%}
+      {%- include partials/list_speakers.html -%}
+    {%- endcapture -%}
+
+  {%- elsif speaker -%}
+    {%- capture modal_title -%}
+      {%- if speaker.hide -%}
+        {{ speaker.first_name }} {{ speaker.last_name }}
+      {%- else -%}
+        <a class="text-reset" href="{{ speaker.url | prepend: site.baseurl }}">
+          {{ speaker.first_name }} {{ speaker.last_name }}
+        </a>
+      {%- endif -%}
+    {%- endcapture -%}
+    {%- assign modal_footer = link.name -%}
+
+  {%- endif -%}
+
+{%- else -%}
+  {%- assign link_disabled = true -%}
+
+{%- endif -%}
+
+{%- capture link_tag -%}
+  {%- if link.disabled -%}
+    <a class="disabled{% if link_styleclass %} {{ link_styleclass }}{% endif %}" href="#">
+
+  {%- elsif link_iframe -%}
+    <a {% if link_styleclass %}class="{{ link_styleclass }}"{% endif %} title="{{ link.name }}" data-toggle="modal" data-target="#link-modal" data-href="{{ link_href }}" href="#" {% if modal_title -%}
+      data-format='html' data-title="{{ modal_title | strip_newlines | escape }}" {%- if modal_subtitle %} data-subtitle="{{ modal_subtitle | strip_newlines | escape }}"{%- endif -%}
+    {%- elsif link.name -%}
+      data-format='text' data-title="{{ link.name }}"
+    {%- endif %} {% if modal_footer -%}
+      data-format='html' data-footer="{{ modal_footer | strip_newlines | escape }}"
+    {%- elsif link.description -%}
+      data-format='text' data-footer="{{ link.description }}"
+    {%- endif %}>
+
+  {%- else -%}
+    <a{% if link_styleclass %} class="{{ link_styleclass }}"{% endif %} href="{{ link_href }}" title="{{ link.name }}">
+
+  {%- endif -%}
+{%- endcapture -%}
+
+{%- assign link_styleclass = "" -%}

data/_includes/partials/get_link_types.html

@@ -4,12 +4,15 @@
   {%- assign links = speaker.links -%}
 {%- endif -%}
 
-{%- assign has_icon_links = false -%}
-{%- assign has_regular_links = false -%}
+{%- assign has_live_links = 0 -%}
+{%- assign has_icon_links = 0 -%}
+{%- assign has_regular_links = 0 -%}
 {%- for link in links -%}
-  {%- if link.icon or link.file or link.video -%}
-    {%- assign has_icon_links = true -%}
+  {%- if link.live -%}
+    {%- assign has_live_links = has_live_links | plus: 1 -%}
+  {%- elsif link.icon or link.file or link.video -%}
+    {%- assign has_icon_links = has_icon_links | plus: 1 -%}
   {%- else -%}
-    {%- assign has_regular_links = true -%}
+    {%- assign has_regular_links = has_regular_links | plus: 1 -%}
   {%- endif -%}
 {%- endfor -%}

data/_includes/partials/get_tag_icon.html

@@ -0,0 +1,13 @@
+{% assign tag_icon = "" %}
+{% for tag_prop in site.conference.talks.tags %}
+  {% if tag == tag_prop.name %}
+    {% if tag_prop.icon %}
+      {% assign tag_icon = tag_prop.icon %}
+    {% endif %}
+  {% endif %}
+{% endfor %}
+
+{% assign tag_html = tag %}
+{% if tag_icon.size > 0 %}
+  {% assign tag_html = '<i class="fas fa-' | append: tag_icon  | append: '"></i>'' %}
+{% endif %}

data/_includes/partials/get_talk_overview_talk.html

@@ -0,0 +1,81 @@
+<li class="pl-2 mb-2 border-soft-{{ track.color | default: 'light' }}">
+  <p class="mb-0">
+    {% include partials/show_talk.html %}
+  </p>
+  <p class="font-weight-light mb-0">
+    {% include partials/list_speakers.html %}
+  </p>
+
+  {% if talk.hide -%}
+    {%- assign talk_scheduled = false -%}
+    {%- for d in site.data.program.days -%}
+      {%- include partials/get_day_hash.html -%}
+      {%- for r in d.rooms -%}
+        {%- assign room = site.rooms | where: 'name', r.name | first -%}
+        {%- for t in r.talks -%}
+          {%- if talk.name == t.name -%}
+            <p class="mb-0">
+
+              {%- if site.conference.live -%}
+                {%- include partials/get_talk_timestamp.html -%}
+                <span class="live-hide" data-start="{{ timestamp_start }}" data-end="{{ timestamp_end }}">
+              {%- endif -%}
+
+              {%- include partials/get_time_pronoun.html -%}
+              {%- include partials/get_talk_time.html -%}
+              {{- time_pronoun }} {% include partials/show_talk_time.html %}
+
+              {%- if site.conference.live -%}
+                </span>
+                {%- include partials/show_live_button.html -%}
+              {%- endif %}
+
+              {{ site.data.lang[site.conference.lang].pronoun.in | default: "in" }} {% include partials/show_room.html -%}
+            </p>
+
+            {%- assign talk_scheduled = true -%}
+            {%- break -%}
+          {%- endif -%}
+        {%- endfor -%}
+
+        {%- if talk_scheduled -%}
+          {%- break -%}
+        {%- endif -%}
+      {%- endfor -%}
+
+      {%- if talk_scheduled -%}
+        {%- break -%}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- endif %}
+
+  <p class="mb-0">
+    {%- if site.conference.live and talk.hide != true -%}
+      {% for d in site.data.program.days -%}
+        {%- for r in d.rooms -%}
+          {%- for t in r.talks -%}
+            {%- if talk.name == t.name -%}
+              {%- assign live_button_styleclass = "mr-1" -%}
+              {%- include partials/show_live_button.html -%}
+            {%- endif -%}
+          {%- endfor -%}
+        {%- endfor -%}
+      {%- endfor -%}
+    {%- endif -%}
+    {%- include partials/list_tags.html -%}
+
+    {%- include partials/get_link_types.html -%}
+    {%- if has_icon_links > 0 and site.conference.talks.hide_link_icons != true -%}
+      {% for link in talk.links -%}
+        {%- assign link_styleclass = "badge badge-light text-reset font-weight-normal mr-1" -%}
+        {%- include partials/get_link.html link_type="icon" -%}
+        {%- if link_valid -%}
+          {{- link_tag -}}
+            <i class="fas fa-{{ link_icon }} text-secondary"></i>
+          </a>
+        {%- endif -%}
+      {%- endfor %}
+    {%- endif %}
+  </p>
+
+</li>

data/_includes/partials/get_track_properties.html

@@ -0,0 +1,6 @@
+{%- for track in site.conference.talks.tracks -%}
+  {%- if talk.track == track.name -%}
+    {%- assign track_color = track.color | default: 'light' -%}
+    {%- break -%}
+  {%- endif -%}
+{%- endfor -%}

data/_includes/partials/list_tags.html

@@ -0,0 +1,7 @@
+{%- assign has_tags = false -%}
+
+{%- for tag in talk.tags -%}
+  {%- assign has_tags = true -%}
+  {%- include partials/get_tag_icon.html -%}
+  <span class="badge badge-light text-reset font-weight-normal">{{ tag_html }}</span>&nbsp;
+{%- endfor -%}

data/_includes/partials/navbar.html

@@ -31,42 +31,57 @@
           {%- elsif link.live -%}
             {%- include partials/get_live_timestamps.html -%}
 
-            {%- 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>
+            {%- if link.name == blank -%}
+              {%- assign link_name = site.data.lang[site.conference.lang].live.stream | default: "Live Stream" -%}
+            {%- elsif link.name -%}
+              {%- assign link_name = link.name -%}
+            {%- else -%}
+              {%- assign link_name = nil -%}
             {%- endif -%}
 
-            <li class="nav-item live-show d-none" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
-              {%- if site.conference.live.streaming.enable %}
-                <a class="nav-link" title="
-                  {%- if link.name -%}
-                    {{- link.name -}}
-                  {%- else -%}
-                    {{- site.data.lang[site.conference.lang].live.stream | default: "Live Stream" -}}
-                  {%- endif -%}
-                  " {% if site.conference.live.streaming.external -%}
+            {%- if link_name -%}
+              <li class="nav-item live-show d-none" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
+                {%- if site.conference.live.streaming.enable %}
+                  <a
+                    class="nav-link"
+                    title="{{ link_name }}"
+                  {%- if site.conference.live.streaming.external %}
                     href="{{ site.conference.live.streaming.external }}"
-                  {%- else -%}
+                  {%- else %}
                     data-toggle="modal" data-target="#stream-modal" data-room="{{ r.name }}" href="#"
                   {%- endif -%}
                   >
-              {%- else %}
-                {%- assign link_styleclass = "nav-link" -%}
-                {%- include partials/get_link.html %}
-                {{ link_tag }}
-              {%- endif %}
+                {%- else %}
+                  {%- assign link_styleclass = "nav-link" -%}
+                  {%- include partials/get_link.html %}
+                  {{ link_tag }}
+                {%- endif %}
 
-                {{ link.name | default: "" }}
+                  {{ link_name }}
 
-                <span class="live-button badge badge-dark font-weight-normal text-left">
-                  <object data="{{ site.baseurl }}/assets/icons/live.svg" type="image/svg+xml">!</object>
-                  {{ site.data.lang[site.conference.lang].live.live | default: "Live" }}
-                </span>
-              </a>
-            </li>
+                  <span class="live-button badge badge-dark font-weight-normal text-left">
+                    <object data="{{ site.baseurl }}/assets/icons/live.svg" type="image/svg+xml">!</object>
+                    {{ site.data.lang[site.conference.lang].live.live | default: "Live" }}
+                  </span>
+                </a>
+              </li>
+            {%- endif -%}
+
+            {%- if link.name_inactive == blank -%}
+              {%- assign link_name_inactive = site.data.lang[site.conference.lang].live.stream | default: "Live Stream" -%}
+            {%- elsif link.name_inactive -%}
+              {%- assign link_name_inactive = link.name_inactive -%}
+            {%- else -%}
+              {%- assign link_name_inactive = nil -%}
+            {%- endif -%}
+
+            {%- 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 -%}
 
           {%- else %}
             <li class="nav-item {% if page.url contains link.relative_url %}active{% endif %}">

data/_layouts/data.html

@@ -82,8 +82,8 @@
                 "href": "",
                         {%- endunless -%}
 
-                        {%- include partials/get_main_category.html %}
-                "color": "{{ main_cat_color }}",
+                        {%- include partials/get_track_properties.html %}
+                "color": "{{ track_color }}",
                 "speakers": [
                         {%- for speaker_name in talk.speakers %}
                     "{{ speaker_name}}"{%- unless forloop.last -%},{%- endunless -%}
@@ -94,19 +94,25 @@
                 "start": {{ timestamp_start }},
                 "end": {{ timestamp_end }}
 
-                        {%- if talk.live.links -%},
+                        {% include partials/get_link_types.html %}
+                        {%- if has_live_links > 0 -%},
                 "live_links": [
-                            {%- for link in talk.live.links %}
+                            {%- for link in talk.links -%}
+                                {%- include partials/get_link.html link_type="live" -%}
+                                {%- if link_valid %},
                     {
                         "name": "{{ link.name | replace: '"', '\"' }}",
-                        "href": "{{ link.absolute_url | replace: '"', '%22' }}"
-                                {%- if link.icon -%},
-                        "icon": "{{ link.icon | replace: '"', '\"' }}"
-                                {%- endif %}
-                                {%- if link.disabled -%},
+                        "href": "{{ link_href | replace: '"', '%22' }}"
+                                    {%- if link_icon -%},
+                        "icon": "{{ link_icon | replace: '"', '\"' }}"
+                                    {%- endif %}
+                                    {%- if link_disabled -%},
                         "disabled": true
+                                    {%- endif -%}
                                 {%- endif %}
-                    }{%- unless forloop.last -%},{%- endunless -%}
+                    }
+                                {%- assign has_live_links = has_live_links | minus: 1 -%}
+                                {%- if has_live_links > 0 -%},{%- endif -%}
                             {%- endfor %}
                 ]
                         {%- endif %}