jekyll-theme-conference 3.6.7 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8bdd1485da018cf75b0fd718f064cbf1bc69e450550ee90bc90d9dcc82c6a43
-  data.tar.gz: c752b33abeda1d546170e16a5d187a2b083e79b89b83e829dbb0a46635b253e9
+  metadata.gz: 14df4316c5e862e8c82f79e0f5a3f72bd853e887de0b682a2c39d3f4d2c1c679
+  data.tar.gz: d93e7c6ffd7295f70437889e1dfa412ff4016847a0d5dff78bb6c7536cd38868
 SHA512:
-  metadata.gz: 6f05431d3e0f9f21f04594c81874df6610ebb3b9ab46e6e9deee9cb0dd3264d262611a6d0bea8fe5472ca60fa92175e23672338dd2ccef9c62619bf6639674d7
-  data.tar.gz: 4ca82e19cd2f771a3872d7c082dfd8754579e303da448369baf12d847d4d59686cba7781d1dd520b8a710f4a9d9e4cbd8ebb9bef9193059616a7618bd7f77140
+  metadata.gz: 8081fcab1154116b7b183fb18babfeed96377df783fa14ce6a9e625ad7144bd07ae11fa3d4f2aaa0192809f8d4f09c7b85a8e88d2378ae8274b46e0cf3034985
+  data.tar.gz: 8ed5663bfedc430cd1f23660f3fe2144e1fd4751024c5872bb82682c0346a943335016cee0ecfc1247d2020a905a67d52b7e17a60d3d610612b2eccb0fb3338b

data/README.md

@@ -139,15 +139,15 @@ To be up and running simply use the default content of this repository as an ini
 
 ### Automatic Import
 
-There exists a Python file in this repository, `_tools/create_entries.py`, which can be used to import content from a [frab](https://github.com/frab/frab/wiki/Manual#introduction) compatible JSON file (e.g., from [pretalx.com](https://pretalx.com/p/about/)) or a CSV table and generate the different talk, speakers and room files automatically.
+In this repository, you'll find the Python file `_tools/import_schedule.py`. This script allows you to import content from a [frab](https://github.com/frab/frab/wiki/Manual#introduction)-compatible JSON file, such as those exported from [pretalx.com](https://pretalx.com/p/about/)."
 
-1. Copy the files `_tools/create_entries.py` and `_tools/requirements.txt` from this repository
+1. Copy the files `_tools/import_schedule.py` and `_tools/requirements.txt` from this repository
 
 2. Create a virtual environment and activate it
 
    ```bash
-   python -m venv venv
-   source venv/bin/activate
+   python -m venv .venv
+   source .venv/bin/activate
    ```
 
 3. Install the requirements
@@ -159,16 +159,16 @@ There exists a Python file in this repository, `_tools/create_entries.py`, which
 4. Execute the script, e.g., to show the help type
 
    ```bash
-   python _tools/create_entries.py --help
+   python _tools/import_schedule.py --help
    ```
 
 ### Automatic Build
 
-If you do not want to install the entire Ruby/Jekyll tool chain on your machine you can use [GitHub Actions](https://github.com/features/actions), Github's continuous integration platform. This repository contains multiple example Github Action configuration files in the `_tools/` folder:
+If you prefer not to install the full Ruby/Jekyll toolchain locally, you can leverage [GitHub Actions](https://github.com/features/actions), GitHub's continuous integration platform. This repository includes several example GitHub Actions configuration files in the `_tools/` folder:
 
-- `build.yml`: automatically builds and minimizes the website upon adding a new tag starting with a `v` (e.g., `v2020.01.01`). It then attaches the generated website as an archive to a release for easy downloading. Requires `purgecss.config.js` to be copied to the project's root too.
-- `test.yml`: automatically tries to build the website upon a new pull request. It can thus be used as status check before merging.
-- `schedule.yml`: automatically generates the schedule and content files when a new pull request contains a `schedule.json` file (see the _Automatic Import_ subsection above). Thus, it allows quick updates of the site's content from [pretalx.com](https://pretalx.com/p/about/) exports.
+- `build.yml`: This workflow automatically builds and optimizes the website whenever a new tag starting with `v` (e.g., `v2020.01.01`) is added. It then attaches the generated website as an archive to a release for easy download. Note that `purgecss.config.js` must also be copied to the project's root for this to work.
+- `test.yml`: This workflow automatically attempts to build the website upon a new pull request, making it suitable for use as a status check before merging.
+- `schedule.yml`: This workflow automatically generates schedule and content files when a new pull request includes a `schedule.json` file (refer to the 'Automatic Import' section for details). This enables quick content updates from [pretalx.com](https://pretalx.com/p/about/) exports.
 
 To get started, simply copy the desired workflow file to your repository and adapt it to your needs:
 
@@ -439,10 +439,12 @@ conference:
 
 ### Talk Settings
 
-Each talk can have one or multiple categories associated via FrontMatter (see the _Individual Pages: Talks_ section below for more details). Some of these categories can be elevated to so-called main categories". These are used to color group the talks across the entire website, particularly in the program. To do so add the `main_categories` property under the `talks` property. It consists of a list of all main categories. Each main category consists of:
+Talks can optionally be organized into tracks, where each track groups talks under a common subject. Tracks are visually distinct across the website, especially in the program, by a unique color. Additionally, each talk can have one or more associated tags. Both tracks and tags are linked via the talk's FrontMatter (refer to the _Individual Pages: Talks_ section for more details).
 
-- its name (`name`, must be corresponding to the listed categories in the talk's FrontMatter), and
-- a color (`color`) following the Bootstrap color scheme (see below), possible values are:
+To define available tracks, add the `tracks` property under the `talks` property in the configuration file. This property is a list of tracks, with each track requiring:
+
+- its `name`, which must match the track specified in the talk's FrontMatter.
+- a color (`color`) following the Bootstrap color scheme (see below), possible values include:
   - `primary` (your website's main color, normally blue)
   - `secondary` (your website's secondary color, normally grey)
   - `success` (green)
@@ -452,22 +454,32 @@ Each talk can have one or multiple categories associated via FrontMatter (see th
   - `light` (white)
   - `dark` (dark grey)
 
-Each talk can have associated links listed at the end of its content. If these links have an icon associated (see _Content_ > _Talks_ below), they are also shown on the talk overview page (e.g., to show in the overview, which talk has a video recording and, which not). To disable the showing of icon links on the overview page, set the `hide_icons` property to `true` (default: `false`).
+Instead of displaying the tag name, you can replace it with an icon. To define tags with icons, add the `tags` property under the `talks property in your configuration file. Each listed tag requires:
+
+- its `name`, which must match the tag specified in the talk's FrontMatter.
+- optionally, an icon to show instead of the tag's name (`icon: ` followed by the [FontAwesome](https://fontawesome.com/icons?d=gallery&s=solid&m=free) icon name to show).
+
+Talks can also have associated links displayed at the end of their content. If these links have an icon (see _Content_ > _Talks_ below), they will also appear on the talk overview page (e.g., to indicate which talks have video recordings). To prevent icon links from showing on the overview page, set the `hide_link_icons` property to `true` (default is `false`).
 
 Example:
 
 ```yaml
 conference:
   talks:
-    # Talk categories
-    main_categories:
-      - name: Cat A
+    # Talk tracks
+    tracks:
+      - name: Track A
         color: info
-      - name: Cat B
+      - name: Track B
         color: success
 
-    # Hide icons on talk overview page
-    hide_icons: false
+    # Talk tags
+    tags:
+      - name: No recording
+        icon: video-slash
+
+    # Hide link icons on talk overview page
+    hide_link_icons: false
 ```
 
 ### Speaker Settings
@@ -613,7 +625,8 @@ Each talk is represented by a file in the `_talks/` directory. It must begin wit
 
 - the talk's `name` (used as identifier),
 - one or more existing `speakers` name(s),
-- optionally, one or more `categories` of which one should be a main category as defined in the site's configuration,
+- optionally, a `track` which should match the tracks defined in the site's configuration,
+- optionally, a list of `tags`
 - optionally, a list of `links` (see the _Links_ subsection below for the available properties):
   - Links with an `icon` are treated separately and are also included on the talk overview page.
   - Links with `live: true` are only shown below the live stream for the given talk in form of buttons.
@@ -626,9 +639,9 @@ Example:
 name: Vim Impetus Placerat Cotidieque Ad
 speakers:
   - Tolga Philip
-categories:
-  - Cat B
-  - Talk
+track: Track A
+tags:
+  - Short
 ---
 ```
 
@@ -728,8 +741,8 @@ There exists a Python file in this repository, `_tools/import_resources.py`, whi
 2. Create a virtual environment and activate it
 
    ```bash
-   python -m venv venv
-   source venv/bin/activate
+   python -m venv .venv
+   source .venv/bin/activate
    ```
 
 3. Install the requirements

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_prop in site.conference.talks.tracks -%}
+    {%- if talk.track == track_prop.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_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: '" title="' | append: tag | append: '"></i>'' %}
+{% endif %}

data/_includes/partials/get_talk_overview_talk.html

@@ -0,0 +1,81 @@
+<li class="pl-2 mb-2 border-soft-{{ track_prop.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_prop in site.conference.talks.tracks -%}
+  {%- if talk.track == track_prop.name -%}
+    {%- assign track_color = track_prop.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/_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 -%}

data/_layouts/program.html

@@ -143,8 +143,8 @@
                   {%- if d_start_hour == 0 and d_start_min == 0 -%}
 
                     {%- assign talk_nbr_steps = talk_duration_min | divided_by: site.conference.program.time_steps -%}
-                    {%- include partials/get_main_category.html -%}
-                    <td rowspan="{{ talk_nbr_steps }}" class="alert alert-{{ main_cat_color }} shadow-sm overflow-hidden" style="z-index: {{ z-index-max | minus: i }}">
+                    {%- include partials/get_track_properties.html -%}
+                    <td rowspan="{{ talk_nbr_steps }}" class="alert alert-{{ track_color }} shadow-sm overflow-hidden" style="z-index: {{ z-index-max | minus: i }}">
 
                       {%- assign live_button_styleclass = "mb-2" %}
                       {%- include partials/show_live_button.html %}
@@ -156,7 +156,7 @@
                         {%- include partials/list_speakers.html %}
                       </p>
                       <p class="mb-1">
-                        {%- include partials/list_sub_categories.html %}
+                        {%- include partials/list_tags.html %}
                       </p>
                     </td>
                     {%- assign active_talk = true %}
@@ -189,11 +189,11 @@
     </div>
   {%- endif -%}
 
-  {%- if site.conference.talks.main_categories %}
+  {%- if site.conference.talks.tracks %}
     <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 -}}
+      {%- for track_prop in site.conference.talks.tracks %}
+        <div class="d-block d-sm-inline-block m-1 p-1 pl-2 pr-2 border-soft-{{ track_prop.color | default: 'light' }} bg-soft-{{ track_prop.color | default: 'light' }} font-weight-normal">
+          {{- track_prop.name -}}
         </div>
       {%- endfor -%}
   {%- endif -%}

data/_layouts/room.html

@@ -36,7 +36,7 @@
         <table class="list-program">
         {%- for t in r.talks -%}
           {%- assign talk = site.talks | where: 'name', t.name | first -%}
-          {%- include partials/get_main_category.html %}
+          {%- include partials/get_track_properties.html %}
 
           <tr>
             <td class="pr-2">
@@ -48,7 +48,7 @@
               {%- assign live_button_styleclass = "w-100" -%}
               {% include partials/show_live_button.html %}
             </td>
-            <td class="pl-2 border-soft-{{ main_cat_color }}">
+            <td class="pl-2 border-soft-{{ track_color }}">
               <p class="mb-0">
                 {%- include partials/show_talk.html -%}
               </p>

data/_layouts/speaker.html

@@ -77,7 +77,7 @@
             {%- for speaker_name in talk.speakers -%}
               {%- if speaker_name == speaker.name -%}
 
-                {%- include partials/get_main_category.html -%}
+                {%- include partials/get_track_properties.html -%}
 
                 <tr>
                   <td class="pr-2 py-0">
@@ -85,7 +85,7 @@
                     {%- assign talk_time_styleclass = "w-100" -%}
                     {%- include partials/show_talk_time.html -%}
                   </td>
-                  <td class="pl-2 py-0 align-baseline border-soft-{{ main_cat_color }}">
+                  <td class="pl-2 py-0 align-baseline border-soft-{{ track_color }}">
                     <span class="mr-2">
                       {%- include partials/show_talk.html -%}
                     </span>

data/_layouts/talk-overview.html

@@ -1,112 +1,36 @@
 {% include partials/header.html %}
 
-  <h1 class="display-5 mb-4 text-break">
-    {%- if page.title -%}
-      {{- page.title -}}
-    {%- else -%}
-      {{- site.data.lang[site.conference.lang].talk.overview | default: "Talks" -}}
-    {%- endif -%}
-  </h1>
-
-  {{ content }}
-
-  {% for main_category in site.conference.talks.main_categories %}
+<h1 class="display-5 mb-4 text-break">
+  {%- if page.title -%}
+    {{- page.title -}}
+  {%- else -%}
+    {{- site.data.lang[site.conference.lang].talk.overview | default: "Talks" -}}
+  {%- endif -%}
+</h1>
+
+{{ content }}
+
+{% if site.conference.talks.tracks %}
+  {% for track_prop in site.conference.talks.tracks %}
     <h3 class="mt-4 mb-3">
-      <span class="badge border-soft-{{ main_category.color }} bg-soft-{{ main_category.color }} d-block d-sm-inline text-wrap">
-        {{ main_category.name }}
+      <span class="badge border-soft-{{ track_prop.color | default: 'light' }} bg-soft-{{ track_prop.color | default: 'light' }} d-block d-sm-inline text-wrap">
+        {{ track_prop.name }}
       </span>
     </h3>
     <ul class="list-unstyled">
       {% for talk in site.talks -%}
-        {%- for cat in talk.categories -%}
-          {%- if cat == main_category.name -%}
-            {%- assign main_cat = main_category.name -%}
-            <li class="pl-2 mb-2 border-soft-{{ main_category.color }}">
-              <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_sub_categories.html -%}
-
-                {%- include partials/get_link_types.html -%}
-                {%- if has_icon_links > 0 and site.conference.talks.hide_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>
-            {%- break -%}
-          {%- endif -%}
-        {%- endfor -%}
+        {% if talk.track == track_prop.name %}
+          {% include partials/get_talk_overview_talk.html %}
+        {% endif %}
       {%- endfor %}
     </ul>
-  {%- endfor -%}
+  {% endfor %}
+{% else %}
+  <ul class="list-unstyled">
+    {% for talk in site.talks -%}
+      {% include partials/get_talk_overview_talk.html %}
+    {%- endfor %}
+  </ul>
+{% endif %}
 
 {% include partials/footer.html %}

data/_layouts/talk.html

@@ -3,24 +3,27 @@
 {%- unless talk.hide -%}
   {%- include partials/header.html -%}
 
-  <div class="d-flex flex-md-row flex-column container-fluid mb-2 p-0">
-    <div class="h6 mt-2 mb-0 mr-1 pr-1 pb-1">
-      {% include partials/get_main_category.html %}
-      <span class="d-block d-sm-inline p-1 pl-2 pr-2 border-soft-{{ main_cat_color }} bg-soft-{{ main_cat_color }} font-weight-normal">
-        {{ main_cat }}
-      </span>
+  {% if talk.track or talk.tags.size > 0 %}
+    <div class="d-flex flex-md-row flex-column container-fluid mb-2 p-0">
+      {% if talk.track %}
+        <div class="h6 mt-2 mb-0 mr-1 pr-1 pb-1">
+          {% include partials/get_track_properties.html %}
+          <span class="d-block d-sm-inline p-1 pl-2 pr-2 border-soft-{{ track_color }} bg-soft-{{ track_color }} font-weight-normal">
+            {{ talk.track }}
+          </span>
+        </div>
+      {% endif %}
+
+      {% if talk.tags.size > 0 %}
+        <div class="h6 mt-2 mb-0 ml-1 pr-1 pb-1">
+          {% for tag in talk.tags %}
+            {%- include partials/get_tag_icon.html -%}
+            <span class="mr-2">{{ tag_html }}</span>
+          {% endfor %}
+        </div>
+      {% endif %}
     </div>
-
-    {% if talk.categories.size > 1 %}
-      <div class="h6 mt-2 mb-0 ml-1 pr-1 pb-1">
-        {% for cat in talk.categories %}
-          {% if cat != main_cat %}
-            <span class="mr-2">{{ cat }}</span>
-          {% endif %}
-        {% endfor %}
-      </div>
-    {% endif %}
-  </div>
+  {% endif %}
 
   <h1 class="font-weight-light text-break">{{ talk.name }}</h1>
 
@@ -79,7 +82,7 @@
         {% if link_valid %}
           <li class="mb-1">
             {{ link_tag }}
-              <span class="badge bg-soft-{{ main_cat_color }} font-weight-normal mr-1">
+              <span class="badge bg-soft-{{ track_color | default: 'light' }} font-weight-normal mr-1">
                 <i class="fas fa-{{ link_icon }} fa-fw"></i>
               </span>
               {{- link.name }}
@@ -99,7 +102,7 @@
         {% include partials/get_link.html link_type="regular" %}
 
         {% if link_valid %}
-          <li class="mb-1 ml-2 pl-2 border-soft-{{ main_cat_color }}">
+          <li class="mb-1 ml-2 pl-2 border-soft-{{ track_color | default: 'light' }}">
             {{ link_tag }}
               {{ link.name }}
             </a>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 3.6.7
+  version: 3.7.1
 platform: ruby
 authors:
 - Lorenz Schmid
@@ -83,19 +83,20 @@ files:
 - _includes/partials/get_link.html
 - _includes/partials/get_link_types.html
 - _includes/partials/get_live_timestamps.html
-- _includes/partials/get_main_category.html
 - _includes/partials/get_page_description.html
 - _includes/partials/get_page_title.html
 - _includes/partials/get_room_live_href.html
+- _includes/partials/get_tag_icon.html
+- _includes/partials/get_talk_overview_talk.html
 - _includes/partials/get_talk_time.html
 - _includes/partials/get_talk_timestamp.html
 - _includes/partials/get_time_pronoun.html
+- _includes/partials/get_track_properties.html
 - _includes/partials/header.html
 - _includes/partials/info_bar.html
-- _includes/partials/list_categories.html
 - _includes/partials/list_page_meta.html
 - _includes/partials/list_speakers.html
-- _includes/partials/list_sub_categories.html
+- _includes/partials/list_tags.html
 - _includes/partials/modal_link.html
 - _includes/partials/modal_live.html
 - _includes/partials/navbar.html

data/_includes/partials/get_main_category.html

@@ -1,9 +0,0 @@
-{%- 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/list_categories.html

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

data/_includes/partials/list_sub_categories.html

@@ -1,8 +0,0 @@
-{%- 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>&nbsp;
-  {%- endif -%}
-{%- endfor -%}