jekyll-theme-conference 4.0.2 → 5.0.0

data/_includes/conference_config.json

@@ -0,0 +1,79 @@
+{%- comment -%}
+  Settings and translated strings of the JavaScript modules, inlined into
+  every page (no extra request before the modules start)
+{%- endcomment -%}
+{%- assign lang = site.data.lang[site.conference.lang] -%}
+{
+    "baseurl": {{ site.baseurl | jsonify }},
+    "edition": {{ edition | jsonify }},
+    "edition_current": {{ edition_current | jsonify }},
+
+    {%- include get_location_config.html -%}
+    {%- if location_map %}
+    "map": {
+        "map_provider": {{ location_map.map_provider | default: 'OpenStreetMap.Mapnik' | jsonify }},
+        "home_coord": [{{ location_map.home_coord | default: '47.3744489, 8.5410422' }}],
+        "default_zoom": {{ location_map.default_zoom | default: 17 }}
+        {%- if location_map.script %},
+        "script": {{ location_map.script | prepend: '/assets/js/' | prepend: site.baseurl | jsonify }}
+        {%- endif %}
+    },
+    {%- endif %}
+
+    {% if edition_live -%}
+    "live": {
+        "timezone": {{ site.timezone | jsonify }},
+        "days": [
+            {%- for d in edition_program.days %}
+            {
+                {%- include get_day_hash.html %}
+                "name": {{ day_name | jsonify }},
+                "date": {{ d.date | jsonify }}
+            }{%- unless forloop.last -%},{%- endunless %}
+            {%- endfor %}
+        ]
+    },
+    {%- endif %}
+
+    {% if edition_live.streaming.enable -%}
+    "stream": {
+        "pause": {{ edition_live.streaming.pause | default: 60 }},
+        "prepend": {{ edition_live.streaming.prepend | default: 5 }},
+        "extend": {{ edition_live.streaming.extend | default: 5 }}
+    },
+    {%- endif %}
+
+    {% if site.conference.pwa -%}
+    "pwa": {
+        "enable": {{ site.conference.pwa.enable | default: false }}
+    },
+    {%- endif %}
+
+    "lang": {
+        "map": {
+            "focus_conf": {{ lang.location.focus_conf | default: "Center map on conference location" | jsonify }},
+            "focus_me": {{ lang.location.focus_me | default: "Show me where I am" | jsonify }}
+        },
+        "live": {
+            "time": {
+                "soon": {{ lang.live.time.soon | default: "soon" | jsonify }},
+                "now": {{ lang.live.time.now | default: "now" | jsonify }},
+                "in": {{ lang.live.time.in | default: "in" | append: " " | jsonify }},
+                "since": {{ lang.live.time.since | default: "since" | append: " " | jsonify }},
+                "weeks": {{ lang.live.time.weeks | default: "weeks" | jsonify }},
+                "week": {{ lang.live.time.week | default: "week" | jsonify }},
+                "days": {{ lang.live.time.days | default: "days" | jsonify }},
+                "day": {{ lang.live.time.day | default: "day" | jsonify }},
+                "hours": {{ lang.live.time.hours | default: "hours" | jsonify }},
+                "hour": {{ lang.live.time.hour | default: "hour" | jsonify }},
+                "minutes": {{ lang.live.time.minutes | default: "minutes" | jsonify }},
+                "minute": {{ lang.live.time.minute | default: "minute" | jsonify }}
+            }
+        },
+        "stream": {
+            "pre_stream": {{ lang.live.pre_stream | default: "Live stream has not started yet." | jsonify }},
+            "post_stream": {{ lang.live.post_stream | default: "Live stream has ended." | jsonify }},
+            "pause_stream": {{ lang.live.pause_stream | default: "Live stream is currently paused." | jsonify }}
+        }
+    }
+}

data/_includes/embed_consent.html

@@ -0,0 +1,21 @@
+{%- comment -%}
+  Consent box shown instead of embedded third-party content (video, stream)
+  until the visitor loads it (see _js/core/consent.js), e.g.
+  {% include embed_consent.html href=room_live_href %}. The link to the
+  provider also works without JavaScript. Omitted with click_to_load=false
+  (e.g. `conference.live.streaming.click_to_load`).
+{%- endcomment -%}
+{%- unless include.click_to_load == false -%}
+  {%- assign embed_lang = site.data.lang[site.conference.lang].embed -%}
+  {%- assign embed_host = include.href | split: "/" -%}
+  <div class="embed-consent d-flex flex-column justify-content-center align-items-center text-center p-4 bg-body-tertiary{% if include.hidden %} d-none{% endif %}" data-embed-consent>
+    <p class="mb-3">
+      {{ embed_lang.privacy | default: "This content is loaded from an external provider, which receives your IP address:" }}
+      <a href="{{ include.href | escape }}" rel="noopener" data-embed-host>{{ embed_host[2] | escape }}</a>
+    </p>
+    <button type="button" class="btn btn-primary" data-embed-load>
+      {% include icon.html name="play-fill" %}
+      {{ embed_lang.load | default: "Load content" }}
+    </button>
+  </div>
+{%- endunless -%}

data/_includes/footer.html

@@ -1,18 +1,20 @@
 
   </main>
 
-  <footer class="fixed-bottom">
+  <footer class="footer-pwa">
     {%- include navbar_pwa.html -%}
   </footer>
 
   {%- include modal_link.html -%}
 
-  {%- if site.conference.live.streaming.enable -%}
+  {%- if edition_live.streaming.enable -%}
     {%- include modal_live.html -%}
   {%- endif -%}
 
-  <script type="module" src="{{ site.baseurl }}/assets/js/conference.bundle.js?t={{ site.time | date: '%s' }}" data-baseurl="{{ site.baseurl }}"></script>
-  <script type="module" src="{{ site.baseurl }}/assets/js/main.js?t={{ site.time | date: '%s' }}"></script>
+  {%- capture conference_config -%}{%- include conference_config.json -%}{%- endcapture %}
+  <script type="application/json" id="conference-config">{{ conference_config | replace: "<", "\u003c" }}</script>
+  <script type="module" src="{{ site.baseurl }}/assets/js/conference.bundle.js?v={{ asset_versions['js/conference.bundle.js'] | default: site_version }}"></script>
+  <script type="module" src="{{ site.baseurl }}/assets/js/main.js?t={{ site_version }}"></script>
 
 </body>
 </html>

data/_includes/get_edition.html

@@ -0,0 +1,85 @@
+{%- comment -%}
+  Edition of the current page, e.g. "2025" for /2025/talks/x/ (Front Matter
+  `edition`, set per folder via `defaults`; none: the current edition). The
+  current edition is the first of `conference.editions` with `current: true`,
+  else the first one. Without `conference.editions` there is a single edition:
+  `edition` is nil and everything below is the site's own. Sets:
+  - edition, edition_config (its `editions` entry), edition_current_id,
+    edition_current (true on the current edition)
+  - edition_base: URL prefix of the edition's pages, e.g. "/2025" (or "")
+  - edition_documents: folder of linked files, e.g. "/2025/documents"
+  - edition_talks, edition_speakers, edition_program
+  - edition_rooms: by `order`, else as they first appear in the program
+  - edition_title, edition_description and per sub-setting (e.g.
+    `navigation.logo`): edition_link_preview, edition_schema_org,
+    edition_nav_logo, edition_nav_links, edition_nav_breakpoint,
+    edition_nav_editions,
+    edition_info_bars, edition_info_modals, edition_tracks, edition_tags:
+    the edition's setting, else the site's
+  - edition_live: `conference.live` on the current edition, else nil
+{%- endcomment -%}
+{%- assign edition = nil -%}
+{%- assign edition_config = nil -%}
+{%- assign edition_current_id = nil -%}
+{%- assign edition_current = true -%}
+{%- assign edition_base = "" -%}
+{%- assign edition_talks = site.talks -%}
+{%- assign edition_speakers = site.speakers -%}
+{%- assign edition_rooms = site.rooms -%}
+{%- assign edition_program = site.data.program -%}
+
+{%- assign editions = site.conference.editions -%}
+{%- if editions.size > 0 -%}
+  {%- assign edition_current_config = editions | where: "current", true | first | default: editions[0] -%}
+  {%- assign edition_current_id = edition_current_config.id | append: "" -%}
+  {%- assign edition = page.edition | default: edition_current_id | append: "" -%}
+  {%- assign edition_config = editions | where: "id", edition | first -%}
+  {%- if edition != edition_current_id -%}
+    {%- assign edition_current = false -%}
+  {%- endif -%}
+
+  {%- assign edition_base = "/" | append: edition -%}
+  {%- assign edition_talks = site.talks | where: "edition", edition -%}
+  {%- assign edition_speakers = site.speakers | where: "edition", edition -%}
+  {%- assign edition_rooms = site.rooms | where: "edition", edition -%}
+  {%- assign edition_program = site.data.programs[edition] -%}
+{%- endif -%}
+{%- assign edition_documents = edition_base | append: "/documents" -%}
+
+{%- comment -%}
+  Rooms by `order`, else as they first appear in the program (e.g. the
+  program's room columns), followed by rooms not in it
+{%- endcomment -%}
+{%- assign rooms_with_order = edition_rooms | where_exp: "r", "r.order != nil" -%}
+{%- if rooms_with_order.size > 0 -%}
+  {%- assign edition_rooms = edition_rooms | sort: "order", "last" -%}
+{%- else -%}
+  {%- assign rooms_by_program = "" | split: "" -%}
+  {%- for d in edition_program.days -%}
+    {%- for r in d.rooms -%}
+      {%- assign room = edition_rooms | where: "name", r.name | first -%}
+      {%- if room -%}
+        {%- assign rooms_by_program = rooms_by_program | push: room -%}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- endfor -%}
+  {%- assign edition_rooms = rooms_by_program | concat: edition_rooms | uniq -%}
+{%- endif -%}
+
+{%- assign edition_title = edition_config.title | default: site.title -%}
+{%- assign edition_description = edition_config.description | default: site.description -%}
+{%- assign edition_link_preview = edition_config.meta.link_preview | default: site.conference.meta.link_preview -%}
+{%- assign edition_schema_org = edition_config.meta.schema_org | default: site.conference.meta.schema_org -%}
+{%- assign edition_nav_logo = edition_config.navigation.logo | default: site.conference.navigation.logo -%}
+{%- assign edition_nav_links = edition_config.navigation.links | default: site.conference.navigation.links -%}
+{%- assign edition_nav_breakpoint = edition_config.navigation.breakpoint | default: site.conference.navigation.breakpoint -%}
+{%- assign edition_nav_editions = edition_config.navigation.editions | default: site.conference.navigation.editions -%}
+{%- assign edition_info_bars = edition_config.info.bars | default: site.conference.info.bars -%}
+{%- assign edition_info_modals = edition_config.info.modals | default: site.conference.info.modals -%}
+{%- assign edition_tracks = edition_config.talks.tracks | default: site.conference.talks.tracks -%}
+{%- assign edition_tags = edition_config.talks.tags | default: site.conference.talks.tags -%}
+
+{%- assign edition_live = nil -%}
+{%- if edition_current -%}
+  {%- assign edition_live = site.conference.live -%}
+{%- endif -%}

data/_includes/get_link.html

@@ -1,3 +1,10 @@
+{%- comment -%}
+  Link tag of `link`, e.g. {% include get_link.html context="talk" %}. The
+  context ("talk" with `talk`, "speaker" with `speaker`, or none) selects the
+  folder of files and the title of videos. Passed explicitly: variables of
+  that name may be left over from elsewhere on the page. Relative URLs and
+  files belong to the page's edition, e.g. /program/ -> /2025/program/.
+{%- endcomment -%}
 {%- assign link_valid = false -%}
 {%- if link.live -%}
   {%- if include.type == "live" -%}
@@ -26,19 +33,19 @@
   {%- assign link_href = link.absolute_url -%}
 
 {%- elsif link.relative_url -%}
-  {%- assign link_href = link.relative_url | prepend: site.baseurl -%}
+  {%- assign link_href = link.relative_url | prepend: edition_base | prepend: site.baseurl -%}
 
 {%- elsif link.file -%}
   {%- assign link_icon = link.icon | default: "file-earmark-text" -%}
 
-  {%- if talk -%}
-    {%- assign link_href = link.file | prepend: '/documents/slides/' | prepend: site.baseurl -%}
+  {%- if include.context == "talk" -%}
+    {%- assign link_href = link.file | prepend: '/slides/' | prepend: edition_documents | prepend: site.baseurl -%}
 
-  {%- elsif speaker -%}
-    {%- assign link_href = link.file | prepend: '/documents/bio/' | prepend: site.baseurl -%}
+  {%- elsif include.context == "speaker" -%}
+    {%- assign link_href = link.file | prepend: '/bio/' | prepend: edition_documents | prepend: site.baseurl -%}
 
   {%- else -%}
-    {%- assign link_href = link.file | prepend: '/documents/' | prepend: site.baseurl -%}
+    {%- assign link_href = link.file | prepend: '/' | prepend: edition_documents | prepend: site.baseurl -%}
 
   {%- endif -%}
 
@@ -47,14 +54,14 @@
   {%- assign link_icon = link.icon | default: "camera-video-fill" -%}
   {%- assign link_iframe = link.iframe | default: true -%}
 
-  {%- if talk -%}
+  {%- if include.context == "talk" -%}
 
     {%- capture modal_title -%}
       {%- if talk.hide -%}
-        {{ talk.name }}
+        {{ talk.name | escape }}
       {%- else -%}
         <a class="text-reset link-underline-{{ include.color | default: "primary" }} link-underline-opacity-0 link-underline-opacity-100-hover" href="{{ talk.url | prepend: site.baseurl }}">
-          {{ talk.name }}
+          {{ talk.name | escape }}
         </a>
       {%- endif -%}
     {%- endcapture -%}
@@ -63,19 +70,19 @@
       {%- include list_speakers.html -%}
     {%- endcapture -%}
 
-  {%- elsif speaker -%}
+  {%- elsif include.context == "speaker" -%}
 
     {%- capture modal_title -%}
       {%- if speaker.hide -%}
-        {{ speaker.first_name }} {{ speaker.last_name }}
+        {{ speaker.first_name | escape }} {{ speaker.last_name | escape }}
       {%- else -%}
         <a class="text-reset link-underline-{{ include.color | default: "primary" }} link-underline-opacity-0 link-underline-opacity-100-hover" href="{{ speaker.url | prepend: site.baseurl }}">
-          {{ speaker.first_name }} {{ speaker.last_name }}
+          {{ speaker.first_name | escape }} {{ speaker.last_name | escape }}
         </a>
       {%- endif -%}
     {%- endcapture -%}
 
-    {%- assign modal_footer = link.name -%}
+    {%- assign modal_footer = link.name | escape -%}
 
   {%- endif -%}
 
@@ -106,45 +113,48 @@
     <a
       class="{{ link_class }}"
       href="#"
-      title="{{ link.name }}"
+      title="{{ link.name | escape }}"
       data-bs-toggle="modal"
       data-bs-target="#link-modal"
-      data-href="{{ link_href }}"
+      data-href="{{ link_href | escape }}"
+      {% if link.click_to_load == false %}
+        data-click-to-load="false"
+      {% endif %}
       {% if modal_title %}
-        data-format='html'
+        data-title-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 }}"
+        data-title-format="text"
+        data-title="{{ link.name | escape }}"
       {% endif %}
       {% if modal_footer %}
-        data-format='html'
+        data-footer-format="html"
         data-footer="{{ modal_footer | strip_newlines | escape }}"
       {% elsif link.description %}
-        data-format='text'
-        data-footer="{{ link.description }}"
+        data-footer-format="text"
+        data-footer="{{ link.description | escape }}"
       {% endif %}
     >
 
   {%- elsif link.live -%}
-    {%- if site.conference.live and site.conference.live.streaming.enable -%}
+    {%- if edition_live and edition_live.streaming.enable -%}
       {% include get_link_tag_streaming.html class=link_class %}
     {%- else-%}
       <a
         class="{{ link_class }}"
-        href="{{ link_href }}"
-        title="{{ link.name }}"
+        href="{{ link_href | escape }}"
+        title="{{ link.name | escape }}"
       >
     {%- endif -%}
 
   {%- else -%}
     <a
       class="{{ link_class }}{% if include.is_active %} active{% endif %}"
-      href="{{ link_href }}"
-      title="{{ link.name }}"
+      href="{{ link_href | escape }}"
+      title="{{ link.name | escape }}"
       {%- if include.is_active %}
       aria-current="page"
       {%- endif %}
@@ -153,11 +163,12 @@
   {%- endif -%}
 {%- endcapture -%}
 
+{%- assign link_icon_name = link_icon | default: 'link-45deg' -%}
 {%- capture link_list_item -%}
   <li class="mb-1">
     {{ link_tag | replace: ' class="', ' class="icon-link '}}
-      <i class="bi bi-{{ link_icon | default: 'link-45deg' }}" aria-hidden="true"></i>
-      {{- link.name }}
+      {% include icon.html name=link_icon_name %}
+      {{- link.name | escape }}
     </a>
   </li>
 {%- endcapture -%}

data/_includes/get_link_tag_streaming.html

@@ -1,16 +1,16 @@
 {%- assign stream_label = site.data.lang[site.conference.lang].live.stream | default: "Live Stream" -%}
 
-{%- if site.conference.live.streaming.external -%}
+{%- if edition_live.streaming.external -%}
   <a
     class="{{ include.class }}"
-    href="{{ site.conference.live.streaming.external }}"
+    href="{{ edition_live.streaming.external }}"
     title="{{ stream_label }}"
   >
 {%- else -%}
   {%- if r -%}
     {%- assign data_room = r -%}
   {%- else -%}
-    {% assign data_room = site.rooms | sort: "order" | first %}
+    {% assign data_room = edition_rooms | first %}
   {%- endif -%}
   <a
     class="{{ include.class }}"
@@ -18,7 +18,7 @@
     title="{{ stream_label }}"
     data-bs-toggle="modal"
     data-bs-target="#stream-modal"
-    data-room="{{ data_room.name }}"
+    data-room="{{ data_room.name | escape }}"
     aria-haspopup="dialog"
   >
 {%- endif -%}

data/_includes/get_link_types.html

@@ -1,6 +1,8 @@
-{%- if talk -%}
+{%- comment -%} Links of the talk or speaker given by the context, e.g. context="talk" {%- endcomment -%}
+{%- assign links = nil -%}
+{%- if include.context == "talk" -%}
   {%- assign links = talk.links -%}
-{%- elsif speaker -%}
+{%- elsif include.context == "speaker" -%}
   {%- assign links = speaker.links -%}
 {%- endif -%}
 

data/_includes/get_live_timestamps.html

@@ -1,9 +1,9 @@
-{%- assign min_pause = site.conference.live.stop | default: 240 -%}
+{%- assign min_pause = edition_live.stop | default: 240 -%}
 {%- assign min_pause = min_pause | times: 60 -%}
 
-{%- if site.conference.live.streaming.enable -%}
-  {%- assign offset_start = site.conference.live.streaming.prepend | default: 5 -%}
-  {%- assign offset_end = site.conference.live.streaming.extend | default: 5 -%}
+{%- if edition_live.streaming.enable -%}
+  {%- assign offset_start = edition_live.streaming.prepend | default: 5 -%}
+  {%- assign offset_end = edition_live.streaming.extend | default: 5 -%}
 {%- else -%}
   {%- assign offset_start = 0 -%}
   {%- assign offset_end = 0 -%}
@@ -12,7 +12,7 @@
 {%- assign live_starts = "" -%}
 {%- assign live_ends = "" -%}
 
-{%- for d in site.data.program.days -%}
+{%- for d in edition_program.days -%}
   {%- for r in d.rooms -%}
     {%- assign last_end = 0 -%}
 

data/_includes/get_location_config.html

@@ -7,6 +7,11 @@
 
 {%- for p in site.pages -%}
   {%- if p.layout == 'location' -%}
+    {%- comment -%} The page of this edition {%- endcomment -%}
+    {%- assign p_edition = p.edition | default: edition_current_id | append: "" -%}
+    {%- if edition and p_edition != edition -%}
+      {%- continue -%}
+    {%- endif -%}
     {%- assign location_page = p -%}
     {%- break -%}
   {%- endif -%}

data/_includes/get_menu.html

@@ -0,0 +1,30 @@
+{%- comment -%}
+  Dropdown menu of a link: `menu` lists its links, or is "editions" for the
+  menu to switch between editions. Input: link, or include.menu instead
+  (e.g. menu="editions"). Sets:
+  - menu_links: the list of links, or "editions"
+  - menu_name: the link's `name`; for editions, else `navigation.editions.name`,
+    else the page's edition id (e.g. "2026")
+  - menu_label: accessible name of the toggle if its text alone is unclear,
+    e.g. "Edition: 2026" (else nil)
+  - menu_empty: true for editions with fewer than two editions
+{%- endcomment -%}
+{%- assign menu_links = link.menu -%}
+{%- assign menu_name = link.name -%}
+{%- if include.menu -%}
+  {%- assign menu_links = include.menu -%}
+  {%- assign menu_name = nil -%}
+{%- endif -%}
+{%- assign menu_label = nil -%}
+{%- assign menu_empty = false -%}
+
+{%- if menu_links == "editions" -%}
+  {%- if site.conference.editions.size < 2 -%}
+    {%- assign menu_empty = true -%}
+  {%- endif -%}
+  {%- assign menu_name = menu_name | default: edition_nav_editions.name -%}
+  {%- unless menu_name -%}
+    {%- assign menu_name = edition -%}
+    {%- assign menu_label = site.data.lang[site.conference.lang].editions.title | default: "Edition" | append: ": " | append: edition -%}
+  {%- endunless -%}
+{%- endif -%}

data/_includes/get_overview_url.html

@@ -0,0 +1,18 @@
+{%- comment -%}
+  URL of the edition's overview page with the given layout, wherever it
+  lives, e.g. include.layout="speaker-overview" for /2025/people/. Sets
+  overview_url (nil without such a page).
+{%- endcomment -%}
+{%- assign overview_url = nil -%}
+
+{%- for p in site.pages -%}
+  {%- if p.layout == include.layout -%}
+    {%- comment -%} The page of this edition {%- endcomment -%}
+    {%- assign p_edition = p.edition | default: edition_current_id | append: "" -%}
+    {%- if edition and p_edition != edition -%}
+      {%- continue -%}
+    {%- endif -%}
+    {%- assign overview_url = p.url -%}
+    {%- break -%}
+  {%- endif -%}
+{%- endfor -%}

data/_includes/get_page_description.html

@@ -6,15 +6,15 @@
 
 {%- capture page_description -%}
   {%- if page.layout == 'talk' -%}
-    {{ site.data.lang[site.conference.lang].talk.title | default: 'Talk' }} {{ site.data.lang[site.conference.lang].pronoun.by | default: 'by'}} {% include list_speakers.html text_only=true %} {{ preposition }} {{ site.title }}
+    {{ site.data.lang[site.conference.lang].talk.title | default: 'Talk' }} {{ site.data.lang[site.conference.lang].pronoun.by | default: 'by'}} {% include list_speakers.html text_only=true %} {{ preposition }} {{ edition_title }}
   {%- elsif page.layout == 'speaker' -%}
-    {{ site.data.lang[site.conference.lang].speaker.title | default: 'Speaker' }} {{ preposition }} {{ site.title }}
-  {%- elsif site.description -%}
-    {{ site.description }}
+    {{ site.data.lang[site.conference.lang].speaker.title | default: 'Speaker' }} {{ preposition }} {{ edition_title }}
+  {%- elsif edition_description -%}
+    {{ edition_description }}
   {%- endif -%}
 {%- endcapture -%}
 
-{%- if page_description.empty and include.default -%}
+{%- if page_description == empty and include.default -%}
   {%- assign page_description = include.default -%}
 {%- endif -%}
 

data/_includes/get_program_config.html

@@ -1,22 +1,41 @@
-{%- assign program_page = nil -%}
-{%- assign program_url = nil -%}
-{%- assign program_time_steps = 15 -%}
+{%- comment -%}
+  Resolved once per page and edition: get_talk_time.html includes this for
+  every talk and time step of the program
+{%- endcomment -%}
+{%- assign program_config_key = page.url | append: "|" | append: edition -%}
+{%- unless program_config_resolved == program_config_key -%}
+  {%- assign program_page = nil -%}
+  {%- assign program_url = nil -%}
+  {%- assign program_time_steps = 15 -%}
 
-{%- for p in site.pages -%}
-  {%- if p.layout == 'program' -%}
-    {%- assign program_page = p -%}
-    {%- break -%}
-  {%- endif -%}
-{%- endfor -%}
+  {%- for p in site.pages -%}
+    {%- if p.layout == 'program' -%}
+      {%- comment -%} The page of this edition {%- endcomment -%}
+      {%- assign p_edition = p.edition | default: edition_current_id | append: "" -%}
+      {%- if edition and p_edition != edition -%}
+        {%- continue -%}
+      {%- endif -%}
+      {%- assign program_page = p -%}
+      {%- break -%}
+    {%- endif -%}
+  {%- endfor -%}
+
+  {%- if program_page -%}
+    {%- assign program_url = program_page.url -%}
+
+    {%- comment -%} A program page rounds talks to its own time steps {%- endcomment -%}
+    {%- if page.layout == 'program' -%}
+      {%- assign program_page = page -%}
+    {%- endif -%}
 
-{%- if program_page -%}
-  {%- assign program_url = program_page.url -%}
-  {%- if program_page.time_steps -%}
-    {%- if program_page.time_steps == "start" -%}
-      {%- assign program_time_steps = 1 -%}
-    {%- else -%}
-      {%- assign program_time_steps = program_page.time_steps -%}
+    {%- if program_page.time_steps -%}
+      {%- if program_page.time_steps == "start" -%}
+        {%- assign program_time_steps = 1 -%}
+      {%- else -%}
+        {%- assign program_time_steps = program_page.time_steps -%}
+      {%- endif -%}
     {%- endif -%}
   {%- endif -%}
-{%- endif -%}
 
+  {%- assign program_config_resolved = program_config_key -%}
+{%- endunless -%}

data/_includes/get_room_live_href.html

@@ -3,6 +3,6 @@
     {%- if room.live.absolute_url -%}
         {%- assign room_live_href = room.live.absolute_url -%}
     {%- elsif room.live.relative_url -%}
-        {%- assign room_live_href = room.live.relative_url | prepend: site.baseurl -%}
+        {%- assign room_live_href = room.live.relative_url | prepend: edition_base | prepend: site.baseurl -%}
     {%- endif -%}
 {%- endif -%}

data/_includes/get_schema_event.html

@@ -0,0 +1,28 @@
+{%- comment -%}
+  Schema.org EventStatus and EventAttendanceMode of the edition, e.g.
+  `event_status: postponed` sets event_status to "EventPostponed". Sets
+  event_status, event_attendance_mode.
+{%- endcomment -%}
+{%- assign event_status_raw = edition_schema_org.event_status | default: "scheduled" -%}
+{%- if event_status_raw == "scheduled" -%}
+  {%- assign event_status = "EventScheduled" -%}
+{%- elsif event_status_raw == "cancelled" -%}
+  {%- assign event_status = "EventCancelled" -%}
+{%- elsif event_status_raw == "postponed" -%}
+  {%- assign event_status = "EventPostponed" -%}
+{%- elsif event_status_raw == "moved_online" -%}
+  {%- assign event_status = "EventMovedOnline" -%}
+{%- else -%}
+  {%- assign event_status = "EventScheduled" -%}
+{%- endif -%}
+
+{%- assign event_attendance_mode_raw = edition_schema_org.event_attendance_mode | default: "offline" -%}
+{%- if event_attendance_mode_raw == "offline" -%}
+  {%- assign event_attendance_mode = "OfflineEventAttendanceMode" -%}
+{%- elsif event_attendance_mode_raw == "online" -%}
+  {%- assign event_attendance_mode = "OnlineEventAttendanceMode" -%}
+{%- elsif event_attendance_mode_raw == "mixed" -%}
+  {%- assign event_attendance_mode = "MixedEventAttendanceMode" -%}
+{%- else -%}
+  {%- assign event_attendance_mode = "OfflineEventAttendanceMode" -%}
+{%- endif -%}

data/_includes/get_start_times.html

@@ -1,12 +1,29 @@
-{%- assign selected_day = site.data.program.days | where: "date", d.date | first -%}
-{%- assign start_times = "" | split: "," -%}
+{%- assign selected_day = edition_program.days | where: "date", d.date | first -%}
+{%- assign start_keys = "" | split: "," -%}
 
+{%- comment -%}
+  Sortable keys "<minutes since day start, fixed width>|<time>",
+  e.g. "100570|09:30" or "101500|01:00 +1" (after midnight)
+{%- endcomment -%}
 {%- if selected_day -%}
   {%- for room in selected_day.rooms -%}
     {%- for talk in room.talks -%}
-      {%- unless start_times contains talk.time_start -%}
-        {%- assign start_times = start_times | push: talk.time_start -%}
+      {%- assign time = talk.time_start | split: " +" -%}
+      {%- assign day_offset = time[1] | default: 0 | plus: 0 -%}
+      {%- assign hour = time[0] | split: ":" | first | plus: 0 -%}
+      {%- assign min = time[0] | split: ":" | last | plus: 0 -%}
+      {%- assign day_minutes = day_offset | times: 1440 -%}
+      {%- assign key = hour | times: 60 | plus: min | plus: day_minutes | plus: 100000 | append: "|" | append: talk.time_start -%}
+      {%- unless start_keys contains key -%}
+        {%- assign start_keys = start_keys | push: key -%}
       {%- endunless -%}
     {%- endfor -%}
   {%- endfor -%}
 {%- endif -%}
+
+{%- assign start_times = "" | split: "," -%}
+{%- assign start_keys = start_keys | sort -%}
+{%- for key in start_keys -%}
+  {%- assign start_time = key | split: "|" | last -%}
+  {%- assign start_times = start_times | push: start_time -%}
+{%- endfor -%}