jekyll-theme-conference 4.1.0 → 5.0.0

data/_layouts/json-site.html

@@ -4,7 +4,9 @@
   Documents (/documents/), source maps, .woff fonts with a .woff2 twin and
   the icon font (icons are inline SVGs) are skipped. Theme bundles carry
   their content hash (?v=), so an unchanged bundle is not downloaded again.
+  Of several editions, only the current one is precached.
 {%- endcomment -%}
+{%- include get_edition.html -%}
 {%- assign pages = "" | split: "" -%}
 {%- assign assets = "" | split: "" -%}
 {%- assign asset_versions = site.data.conference_assets -%}
@@ -23,6 +25,10 @@
   {%- if page.output == false or page.url == nil or page.url == "" or page.url == "/sw.js" or page_ext == "map" -%}
     {%- continue -%}
   {%- endif -%}
+  {%- assign page_edition = page.edition | append: "" -%}
+  {%- if page.edition and page_edition != edition_current_id -%}
+    {%- continue -%}
+  {%- endif -%}
   {%- assign url = page.url | prepend: site.baseurl -%}
   {%- if page.url contains "/assets/" -%}
     {%- assign assets = assets | push: url -%}
@@ -36,6 +42,10 @@
     {%- continue -%}
   {%- endunless -%}
   {%- for item in collection.docs -%}
+    {%- assign item_edition = item.edition | append: "" -%}
+    {%- if item.edition and item_edition != edition_current_id -%}
+      {%- continue -%}
+    {%- endif -%}
     {%- unless item.hide or item.output == false -%}
       {%- assign url = item.url | prepend: site.baseurl -%}
       {%- assign pages = pages | push: url -%}
@@ -64,7 +74,7 @@
   {%- assign assets = assets | push: url -%}
 {%- endfor -%}
 {
-  "name": {{ site.title | jsonify }},
+  "name": {{ edition_title | jsonify }},
   "baseurl": {{ site.baseurl | jsonify }},
   "pages": {{ pages | uniq | jsonify }},
   "assets": {{ assets | uniq | jsonify }}

data/_layouts/location.html

@@ -1,3 +1,4 @@
+{%- unless page.hide -%}
 {% include header.html %}
 
   {% assign this_room = page %}
@@ -10,9 +11,7 @@
     {% endif %}
   </h1>
 
-  {% unless page.hide %}
-    {% include navbar_rooms.html %}
-  {% endunless %}
+  {% include navbar_rooms.html %}
 
   {% if page.postal_address %}
     <address>
@@ -58,3 +57,6 @@
   {% endif %}
 
 {% include footer.html %}
+{%- else -%}
+  {%- include hidden_page.html -%}
+{%- endunless -%}

data/_layouts/manifest.html

@@ -1,10 +1,11 @@
+{%- include get_edition.html -%}
 {%- if site.conference.pwa and site.conference.pwa.enable -%}
 {
-  "name": {{ site.title | jsonify }},
-  "short_name": {{ site.title | jsonify }},
-  "description": {{ site.description | jsonify }},
+  "name": {{ edition_title | jsonify }},
+  "short_name": {{ edition_title | jsonify }},
+  "description": {{ edition_description | jsonify }},
   "lang": {{ site.conference.lang | default: 'en' | jsonify }},
-  "start_url": {{ site.baseurl | append: '/' | jsonify }},
+  "start_url": {{ site.baseurl | append: edition_base | append: '/' | jsonify }},
   "scope": {{ site.baseurl | append: '/' | jsonify }},
   "display": "standalone",
   "background_color": {{ site.conference.pwa.background_color | default: '#ffffff' | jsonify }},
@@ -33,7 +34,7 @@
   {%- endif %}
   "shortcuts": [
   {%- assign first_shortcut = true -%}
-  {%- for link in site.conference.navigation.links -%}
+  {%- for link in edition_nav_links -%}
     {%- unless link.pwa_hide or link.live or link.menu -%}
       {%- include get_link.html %}
       {%- unless first_shortcut -%},{%- endunless -%}

data/_layouts/program.html

@@ -1,6 +1,7 @@
+{%- include get_edition.html -%}
 {%- include get_location_config.html -%}
 {% include header.html %}
-  {% assign nbr_days = site.data.program.days | size -%}
+  {% assign nbr_days = edition_program.days | size -%}
 
   <h1 class="display-5 {% if nbr_days > 1 -%} mb-2 {%- else -%} mb-4 {%- endif %} text-break">
     {%- if page.title -%}
@@ -15,7 +16,7 @@
   {%- if nbr_days > 1 %}
     <nav aria-label="{{ site.data.lang[site.conference.lang].program.days | default: 'Conference days' }}">
       <ul class="nav nav-pills justify-content-center mb-3" id="program-tabs" role="tablist">
-        {%- for d in site.data.program.days -%}
+        {%- for d in edition_program.days -%}
           {%- include get_day_hash.html %}
           <li class="nav-item" role="presentation">
             <a class="nav-link {%- if forloop.index == 1 %} active{% endif %}" id="tab-{{ day_hash }}" data-bs-toggle="tab" {%- if d.date -%}{%- include get_talk_timestamp.html %} data-ts="{{ timestamp_start }}" {%- endif %} href="#{{ day_hash }}" role="tab" aria-controls="{{ day_hash }}" aria-selected="{% if forloop.index == 1 %}true{% else %}false{% endif %}">{{ day_name | escape }}</a>
@@ -26,7 +27,7 @@
     <div class="tab-content" id="day-content">
   {%- endif %}
 
-  {%- for d in site.data.program.days -%}
+  {%- for d in edition_program.days -%}
     {%- if nbr_days > 1 -%}
       {%- include get_day_hash.html %}
       <div class="tab-pane {%- if forloop.index == 1 %} active{% endif %}" id="{{ day_hash }}" role="tabpanel" aria-labelledby="tab-{{ day_hash }}">
@@ -39,7 +40,7 @@
             <th scope="col" class="program-time text-center" aria-label="{{ site.data.lang[site.conference.lang].program.time | default: 'Time' }}">#</th>
             {%- assign nbr_rooms = d.rooms | size -%}
             {%- for r in d.rooms -%}
-              {%- assign room = site.rooms | where: 'name', r.name | first %}
+              {%- assign room = edition_rooms | where: 'name', r.name | first %}
               <th scope="col" class="program-talk text-center" id="room-{{ day_hash }}-{{ forloop.index }}">
                 {%- if room.hide or location_hide -%}
                   {{- room.name | escape -}}
@@ -126,11 +127,11 @@
               {%- endif %}
 
               {%- for r in d.rooms -%}
-                {%- assign room = site.rooms | where: 'name', r.name | first -%}
+                {%- assign room = edition_rooms | where: 'name', r.name | first -%}
 
                 {%- assign active_talk = false -%}
                 {%- for t in r.talks -%}
-                  {%- assign talk = site.talks | where: 'name', t.name | first -%}
+                  {%- assign talk = edition_talks | where: 'name', t.name | first -%}
 
                   {%- include get_talk_time.html -%}
 
@@ -232,10 +233,10 @@
     </div>
   {%- endif -%}
 
-  {%- if site.conference.talks.tracks %}
+  {%- if edition_tracks %}
     {%- unless page.hide_legend -%}
       <h2 class="h5 mt-4">{{ site.data.lang[site.conference.lang].program.legend | default: "Caption" }}</h2>
-      {%- for track_prop in site.conference.talks.tracks %}
+      {%- for track_prop in edition_tracks %}
         <div class="d-block d-sm-inline-block m-1 p-1 ps-2 pe-2 bg-{{ track_prop.color | default: 'light' }}-subtle text-{{ track_prop.color | default: 'light' }}-emphasis border-start border-4 border-{{ track_prop.color | default: 'light' }}-subtle fw-normal">
           {{- track_prop.name | escape -}}
         </div>

data/_layouts/room.html

@@ -1,3 +1,4 @@
+{%- include get_edition.html -%}
 {%- include get_location_config.html -%}
 {%- assign this_room = page -%}
 
@@ -19,7 +20,7 @@
   {{ content }}
 
   {% assign room_talks = false %}
-  {% for d in site.data.program.days %}
+  {% for d in edition_program.days %}
     {% include get_day_hash.html %}
     {% for r in d.rooms %}
       {% if this_room.name == r.name and r.talks.size > 0 %}
@@ -36,7 +37,7 @@
 
         <table class="mw-100">
         {%- for t in r.talks -%}
-          {%- assign talk = site.talks | where: 'name', t.name | first -%}
+          {%- assign talk = edition_talks | where: 'name', t.name | first -%}
           {%- include show_talk_listed.html hide_day=true -%}
         {%- endfor -%}
         </table>

data/_layouts/speaker-overview.html

@@ -12,7 +12,7 @@
 
   <div class="col-count-1 col-count-md-2 col-count-lg-3">
     {% assign cur_letter = false %}
-    {% assign speakers = site.speakers | sort_natural: 'last_name' %}
+    {% assign speakers = edition_speakers | sort_natural: 'last_name' %}
     {% for speaker in speakers %}
 
       {% assign last_letter = speaker.last_name | slice: 0 | capitalize %}

data/_layouts/speaker.html

@@ -40,7 +40,7 @@
   {% endif %}
 
   {% assign active_speaker = false %}
-  {% for talk in site.talks %}
+  {% for talk in edition_talks %}
     {% for speaker_name in talk.speakers %}
       {% if speaker_name == speaker.name %}
         {% assign active_speaker = true %}
@@ -53,11 +53,11 @@
     <h2 class="h5 mt-4 mb-2">{{ site.data.lang[site.conference.lang].speaker.talks | default: "Talks at this conference" }}:</h2>
 
     <table class="mw-100">
-    {%- for d in site.data.program.days -%}
+    {%- for d in edition_program.days -%}
       {%- include get_day_hash.html -%}
       {%- for r in d.rooms -%}
         {%- for t in r.talks -%}
-          {%- assign talk = site.talks | where: 'name', t.name | first -%}
+          {%- assign talk = edition_talks | where: 'name', t.name | first -%}
 
           {%- for speaker_name in talk.speakers -%}
             {%- if speaker_name == speaker.name -%}
@@ -71,11 +71,14 @@
     </table>
   {% endif %}
 
+  {%- include get_overview_url.html layout="speaker-overview" -%}
+  {%- if overview_url %}
   <p class="d-print-none d-pwa-none mt-5">
-    <a href="{{ page.collection | prepend: '/' | prepend: site.baseurl }}" class="btn btn-outline-secondary">
+    <a href="{{ overview_url | prepend: site.baseurl }}" class="btn btn-outline-secondary">
       {% include icon.html name="people" %}&nbsp;{{ site.data.lang[site.conference.lang].overview | default: "Overview" }}
     </a>
   </p>
+  {%- endif %}
 
   {%- include footer.html -%}
 {%- else -%}

data/_layouts/stream-overview.html

@@ -11,7 +11,7 @@
   {{ content }}
 
   {%- assign nbr_streams = 0 -%}
-  {%- for room in site.rooms -%}
+  {%- for room in edition_rooms -%}
     {%- if room.live -%}
       {%- assign mod_nbr_streams = nbr_streams | modulo: 2 -%}
       {%- if mod_nbr_streams == 0 %}
@@ -24,7 +24,7 @@
         {%- include get_room_live_href.html %}
         {%- comment -%} Loaded by the embed module, after consent {%- endcomment %}
         <iframe data-embed-src="{{ room_live_href | escape }}" loading="lazy" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen title="{{ site.data.lang[site.conference.lang].live.stream | default: 'Live Stream' }}: {{ room.name | escape }}" aria-labelledby="stream-heading-{{ forloop.index }}"></iframe>
-        {%- include embed_consent.html href=room_live_href click_to_load=site.conference.live.streaming.click_to_load %}
+        {%- include embed_consent.html href=room_live_href click_to_load=edition_live.streaming.click_to_load %}
       </div>
     </div>
 

data/_layouts/sw.js

@@ -117,8 +117,20 @@ const networkFirst = async (event) => {
 // Cache first: versioned assets do not change once cached
 const cacheFirst = async (event) => (await caches.match(event.request)) || networkFirst(event);
 
+// Folders of documents (e.g. slides, not offline): /documents/, with
+// editions /<id>/documents/
+{%- assign document_paths = "/documents/" | split: "," -%}
+{%- if site.conference.editions.size > 0 -%}
+  {%- assign document_paths = "" | split: "" -%}
+  {%- for e in site.conference.editions -%}
+    {%- assign document_path = "/" | append: e.id | append: "/documents/" -%}
+    {%- assign document_paths = document_paths | push: document_path -%}
+  {%- endfor -%}
+{%- endif %}
+const DOCUMENT_PATHS = {{ document_paths | jsonify }};
+
 // Fetch event - only handle same-origin GET requests within the site,
-// except the service worker itself and documents (e.g. slides, not offline)
+// except the service worker itself and documents
 self.addEventListener("fetch", (event) => {
   const { request } = event;
   const url = new URL(request.url);
@@ -126,7 +138,7 @@ self.addEventListener("fetch", (event) => {
   if (request.method !== "GET" || url.origin !== self.location.origin || !url.pathname.startsWith(`${BASE_URL}/`)) {
     return;
   }
-  if (url.pathname === `${BASE_URL}/sw.js` || url.pathname.startsWith(`${BASE_URL}/documents/`)) {
+  if (url.pathname === `${BASE_URL}/sw.js` || DOCUMENT_PATHS.some((path) => url.pathname.startsWith(`${BASE_URL}${path}`))) {
     return;
   }
 

data/_layouts/talk-overview.html

@@ -10,15 +10,15 @@
 
 {{ content }}
 
-{% if site.conference.talks.tracks %}
-  {% for track_prop in site.conference.talks.tracks %}
+{% if edition_tracks %}
+  {% for track_prop in edition_tracks %}
     <h2 class="h3 mt-4 mb-3">
       <span class="badge rounded-0 bg-{{ track_prop.color | default: 'light' }}-subtle text-{{ track_prop.color | default: 'light' }}-emphasis border-4 border-start border-{{ track_prop.color | default: 'light' }}-subtle d-block d-sm-inline text-wrap">
         {{ track_prop.name | escape }}
       </span>
     </h2>
     <ul class="list-unstyled">
-      {% for talk in site.talks -%}
+      {% for talk in edition_talks -%}
         {% if talk.track == track_prop.name %}
           {% include get_talk_overview_talk.html %}
         {% endif %}
@@ -27,7 +27,7 @@
   {% endfor %}
 {% else %}
   <ul class="list-unstyled">
-    {% for talk in site.talks -%}
+    {% for talk in edition_talks -%}
       {% include get_talk_overview_talk.html %}
     {%- endfor %}
   </ul>

data/_layouts/talk.html

@@ -32,7 +32,7 @@
   </p>
 
   <div class="mb-3 p-0">
-    {% for d in site.data.program.days -%}
+    {% for d in edition_program.days -%}
       {%- include get_day_hash.html -%}
       {%- for r in d.rooms -%}
         {%- for t in r.talks -%}
@@ -77,9 +77,12 @@
   {% endif %}
 
   <p class="d-print-none d-pwa-none mt-5">
-    <a href="{{ page.collection | prepend: '/' | prepend: site.baseurl }}" class="btn btn-outline-secondary me-2">
+    {%- include get_overview_url.html layout="talk-overview" -%}
+    {%- if overview_url %}
+    <a href="{{ overview_url | prepend: site.baseurl }}" class="btn btn-outline-secondary me-2">
       {% include icon.html name="megaphone" %}&nbsp;{{ site.data.lang[site.conference.lang].overview | default: "Overview" }}
     </a>
+    {%- endif %}
 
     {%- include get_program_config.html -%}
     <a href="{{ program_url | prepend: site.baseurl }}" class="btn btn-outline-secondary">