jekyll-theme-conference 4.0.2 → 4.1.0

data/_includes/schema_location.html

@@ -25,16 +25,16 @@
 {
   "@context": "https://schema.org",
   "@type": "Place"{% if location_postal_address.name %},
-  "name": {{ location_postal_address.name | jsonify }}{% endif %}{% if location_postal_address %},
+  "name": {{ location_postal_address.name | jsonify | replace: "<", "\u003c" }}{% endif %}{% if location_postal_address %},
   "url": "{{ location_url }}"{% if location_map %},
   "hasMap": "{{ location_url }}"{% endif %},
   "address": {
     "@type": "PostalAddress"{% if location_postal_address.street %},
-    "streetAddress": {{ location_postal_address.street | jsonify }}{% endif %}{% if location_postal_address.locality %},
-    "addressLocality": {{ location_postal_address.locality | jsonify }}{% endif %}{% if location_postal_address.postal_code %},
-    "postalCode": {{ location_postal_address.postal_code | jsonify }}{% endif %}{% if location_postal_address.region %},
-    "addressRegion": {{ location_postal_address.region | jsonify }}{% endif %}{% if location_postal_address.country %},
-    "addressCountry": {{ location_postal_address.country | jsonify }}{% endif %}
+    "streetAddress": {{ location_postal_address.street | jsonify | replace: "<", "\u003c" }}{% endif %}{% if location_postal_address.locality %},
+    "addressLocality": {{ location_postal_address.locality | jsonify | replace: "<", "\u003c" }}{% endif %}{% if location_postal_address.postal_code %},
+    "postalCode": {{ location_postal_address.postal_code | jsonify | replace: "<", "\u003c" }}{% endif %}{% if location_postal_address.region %},
+    "addressRegion": {{ location_postal_address.region | jsonify | replace: "<", "\u003c" }}{% endif %}{% if location_postal_address.country %},
+    "addressCountry": {{ location_postal_address.country | jsonify | replace: "<", "\u003c" }}{% endif %}
   }{% endif %}{% if contains_places != "" %},
   "containsPlace": [
     {{ contains_places }}

data/_includes/schema_room.html

@@ -13,11 +13,11 @@
 {
   "@context": "https://schema.org",
   "@type": "Place",
-  "name": {{ room.name | jsonify }},
+  "name": {{ room.name | jsonify | replace: "<", "\u003c" }},
   "url": "{{ room_url }}",
   "containedInPlace": {
     "@type": "Place"{% if location_postal_address.name %},
-    "name": {{ location_postal_address.name | jsonify }}{% endif %},
+    "name": {{ location_postal_address.name | jsonify | replace: "<", "\u003c" }}{% endif %},
     "url": "{{ schema_location_url }}"
   }
 }

data/_includes/schema_speaker.html

@@ -27,12 +27,12 @@
 {
   "@context": "https://schema.org",
   "@type": "Person",
-  "name": "{{ speaker.first_name | append: " " | append: speaker.last_name | jsonify }}",
-  "givenName": {{ speaker.first_name | jsonify }},
-  "familyName": {{ speaker.last_name | jsonify }},
+  "name": {{ speaker.first_name | append: " " | append: speaker.last_name | jsonify | replace: "<", "\u003c" }},
+  "givenName": {{ speaker.first_name | jsonify | replace: "<", "\u003c" }},
+  "familyName": {{ speaker.last_name | jsonify | replace: "<", "\u003c" }},
   "url": "{{ speaker_url }}",
   "performerIn": [
-    {% if performer_in -%}
+    {% if performer_in != "" -%}
       {{ performer_in }}
     {%- else -%}
       {%- comment -%} Link to conference event {%- endcomment -%}

data/_includes/schema_talk.html

@@ -13,31 +13,10 @@
     {%- for t in r.talks -%}
       {%- if talk.name == t.name -%}
         {%- assign talk_found = true -%}
-        {%- assign talk_start = t.time_start | default: "00:00" -%}
-        {%- assign talk_end = t.time_end | default: "00:00" -%}
-
-        {%- if talk_start contains ' +' -%}
-          {%- assign talk_start_day = talk_start | split: ' +' | last | plus: 0 -%}
-          {%- assign talk_start = talk_start | split: ' +' | first -%}
-        {%- else -%}
-          {%- assign talk_start_day = 0 -%}
-        {%- endif -%}
-        {%- if talk_end contains ' +' -%}
-          {%- assign talk_end_day = talk_end | split: ' +' | last | plus: 0 -%}
-          {%- assign talk_end = talk_end | split: ' +' | first -%}
-        {%- else -%}
-          {%- assign talk_end_day = 0 -%}
-        {%- endif -%}
-
-        {%- assign datetime_start = d.date | append: "T" | append: talk_start | append: ":00" -%}
-        {%- assign datetime_end = d.date | append: "T" | append: talk_end | append: ":00" -%}
-        {%- if site.conference.tz -%}
-          {%- assign datetime_start = datetime_start | append: site.conference.tz -%}
-          {%- assign datetime_end = datetime_end | append: site.conference.tz -%}
-        {%- else -%}
-          {%- assign datetime_start = datetime_start | append: "+00:00" -%}
-          {%- assign datetime_end = datetime_end | append: "+00:00" -%}
-        {%- endif -%}
+        {%- comment -%} Timestamps in the site's timezone (Jekyll `timezone`), e.g. 2026-02-20T09:00:00+01:00 {%- endcomment -%}
+        {%- include get_talk_timestamp.html -%}
+        {%- assign datetime_start = timestamp_start | date: "%Y-%m-%dT%H:%M:%S%:z" -%}
+        {%- assign datetime_end = timestamp_end | date: "%Y-%m-%dT%H:%M:%S%:z" -%}
 
         {%- assign room = site.rooms | where: 'name', r.name | first -%}
         {%- assign talk_url = page.url | prepend: site.baseurl | prepend: site.url -%}
@@ -101,8 +80,8 @@
 {
   "@context": "https://schema.org",
   "@type": "Event",
-  "name": {{ talk.name | jsonify }},
-  "description": {{ talk_description | jsonify }},
+  "name": {{ talk.name | jsonify | replace: "<", "\u003c" }},
+  "description": {{ talk_description | jsonify | replace: "<", "\u003c" }},
   "startDate": "{{ datetime_start }}",
   "endDate": "{{ datetime_end }}",
   "duration": "{{ duration }}",
@@ -110,11 +89,11 @@
   "eventAttendanceMode": "https://schema.org/{{ event_attendance_mode }}",
   "location": {
     "@type": "Place"{% unless room.hide %},
-    "name": {{ r.name | jsonify }}{% endunless %}{% if room.url %},
+    "name": {{ r.name | jsonify | replace: "<", "\u003c" }}{% endunless %}{% if room.url %},
     "url": "{{ room.url | prepend: site.baseurl | prepend: site.url }}"{% endif %}
   },
   "url": "{{ talk_url }}"{% if keywords_count > 0 %},
-  "keywords": [{% if talk.track %}{{ talk.track | jsonify }}{% if talk.tags and talk.tags.size > 0 %}, {% endif %}{% endif %}{% if talk.tags and talk.tags.size > 0 %}{% for tag in talk.tags %}{{ tag | jsonify }}{% unless forloop.last %}, {% endunless %}{% endfor %}{% endif %}]{% endif %}{% if talk.speakers.size > 0 %},
+  "keywords": [{% if talk.track %}{{ talk.track | jsonify | replace: "<", "\u003c" }}{% if talk.tags and talk.tags.size > 0 %}, {% endif %}{% endif %}{% if talk.tags and talk.tags.size > 0 %}{% for tag in talk.tags %}{{ tag | jsonify | replace: "<", "\u003c" }}{% unless forloop.last %}, {% endunless %}{% endfor %}{% endif %}]{% endif %}{% if talk.speakers.size > 0 %},
   "performer": [
     {%- for speaker_name in talk.speakers -%}
       {%- assign speaker = site.speakers | where: 'name', speaker_name | first -%}
@@ -133,8 +112,8 @@
   "image": "{{ site.conference.meta.schema_org.img | prepend: '/assets/images/' | prepend: site.baseurl | prepend: site.url }}"{% endif %}{% if video_url != "" %},
   "video": {
     "@type": "VideoObject",
-    "name": {{ talk.name | jsonify }},
-    "description": {{ talk_description | jsonify }},
+    "name": {{ talk.name | jsonify | replace: "<", "\u003c" }},
+    "description": {{ talk_description | jsonify | replace: "<", "\u003c" }},
     "contentUrl": "{{ video_url }}",
     "recordedAt": {
       "@type": "Event",

data/_includes/show_room.html

@@ -1,6 +1,6 @@
 {%- include get_location_config.html -%}
 {%- if room.hide or location_hide -%}
-  <span class="badge fw-normal bg-body-secondary text-reset"><i class="bi bi-square" aria-hidden="true"></i>&nbsp;{{ room.name }}</span>
+  <span class="badge fw-normal bg-body-secondary text-reset">{% include icon.html name="square" %}&nbsp;{{ room.name | escape }}</span>
 {%- else -%}
-  <a href="{{ room.url | prepend: site.baseurl }}" class="badge fw-normal bg-body-secondary text-reset link-underline-{{ track_color }} link-underline-opacity-0 link-underline-opacity-100-hover"><i class="bi bi-square" aria-hidden="true"></i>&nbsp;{{ room.name }}</a>
+  <a href="{{ room.url | prepend: site.baseurl }}" class="badge fw-normal bg-body-secondary text-reset link-underline-{{ track_color }} link-underline-opacity-0 link-underline-opacity-100-hover">{% include icon.html name="square" %}&nbsp;{{ room.name | escape }}</a>
 {%- endif -%}

data/_includes/show_talk.html

@@ -1,5 +1,5 @@
 {%- if talk.hide -%}
-  {{ talk.name }}
+  {%- if talk.lang -%}<span lang="{{ talk.lang | escape }}">{{ talk.name | escape }}</span>{%- else -%}{{ talk.name | escape }}{%- endif -%}
 {%- else -%}
-  <a class="text-reset link-underline-{{ track_color }} link-underline-opacity-0 link-underline-opacity-100-hover" href="{{ talk.url | prepend: site.baseurl }}">{{ talk.name }}</a>
+  <a {% if talk.lang %}lang="{{ talk.lang | escape }}" {% endif %}class="text-reset link-underline-{{ track_color }} link-underline-opacity-0 link-underline-opacity-100-hover" href="{{ talk.url | prepend: site.baseurl }}">{{ talk.name | escape }}</a>
 {%- endif -%}

data/_includes/show_talk_duration.html

@@ -1,3 +1,3 @@
 <span class="badge fw-normal bg-body-secondary text-reset text-start">
-  <i class="bi bi-stopwatch" aria-hidden="true"></i>&nbsp;{{ talk_duration_min }}min
+  {% include icon.html name="stopwatch" %}&nbsp;{{ talk_length_min }}min
 </span>

data/_includes/show_talk_time.html

@@ -12,9 +12,9 @@
     #{{ day_hash }}
   {%- endif -%}
 " class="badge fw-normal bg-body-secondary text-reset link-underline-{{ track_color }} link-underline-opacity-0 link-underline-opacity-100-hover {{ include.class }}">
-  <i class="bi bi-clock" aria-hidden="true"></i>&nbsp;
+  {% include icon.html name="clock" %}&nbsp;
   {%- if nbr_days > 1 and day_abbr -%}
-    {%- unless include.hide_day -%} {{ day_abbr }}, {% endunless -%}
+    {%- unless include.hide_day -%} {{ day_abbr | escape }}, {% endunless -%}
   {% endif -%}
   {%- if talk_start_hour < 10 -%}0{%- endif -%}{{- talk_start_hour -}}:{%- if talk_start_min < 10 -%}0{%- endif -%}{{- talk_start_min -}}
 </a>

data/_layouts/home.html

@@ -3,19 +3,13 @@
   <div class="bg-body-tertiary text-body-primary rounded p-4 p-md-5 mb-4">
     <h1 class="display-3 text-break">
       {% if page.header.img %}
-        {% if page.header.img_dark %}
-          <div class="mode-light">
-            <img src="{{ page.header.img | prepend: '/assets/images/' | prepend: site.baseurl }}" class="w-75 d-none d-md-inline" alt="{{ site.title }}" />
-            <img src="{{ page.header.img | prepend: '/assets/images/' | prepend: site.baseurl }}" class="w-100 d-md-none" alt="{{ site.title }}" />
-          </div>
-          <div class="mode-dark">
-            <img src="{{ page.header.img_dark | prepend: '/assets/images/' | prepend: site.baseurl }}" class="w-75 d-none d-md-inline" alt="{{ site.title }}" />
-            <img src="{{ page.header.img_dark | prepend: '/assets/images/' | prepend: site.baseurl }}" class="w-100 d-md-none" alt="{{ site.title }}" />
-          </div>
-        {% else %}
-          <img src="{{ page.header.img | prepend: '/assets/images/' | prepend: site.baseurl }}" class="w-75 d-none d-md-inline" alt="{{ site.title }}" />
-          <img src="{{ page.header.img | prepend: '/assets/images/' | prepend: site.baseurl }}" class="w-100 d-md-none" alt="{{ site.title }}" />
-        {% endif %}
+        {%- comment -%} One image, the dark variant only downloaded in dark mode {%- endcomment %}
+        <picture>
+          {%- if page.header.img_dark %}
+          <source srcset="{{ page.header.img_dark | prepend: '/assets/images/' | prepend: site.baseurl }}" media="(prefers-color-scheme: dark)" />
+          {%- endif %}
+          <img src="{{ page.header.img | prepend: '/assets/images/' | prepend: site.baseurl }}" class="home-header-img" alt="{{ site.title }}" />
+        </picture>
       {% elsif page.title %}
         {{ page.title }}
       {% else %}
@@ -23,9 +17,7 @@
       {% endif %}
     </h1>
     {% if site.description != none %}
-      <p class="lead">
-        {{ site.description | markdownify | replace: '<p>', '<p class="lead">' }}
-      </p>
+      {{ site.description | markdownify | replace: '<p>', '<p class="lead">' }}
     {% endif %}
 
     <hr class="my-4">
@@ -69,7 +61,7 @@
             </span>
 
             {%- if link.name_inactive -%}
-              <span class="live-hide d-print-inline {{ btn_default }} disabled" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
+              <span class="live-hide d-print-inline {{ btn_default }} disabled" aria-disabled="true" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
                 {{ link.name_inactive }}
               </span>
             {%- endif -%}

data/_layouts/json-data.html

@@ -1,16 +1,5 @@
 {
     {% if site.conference.live and site.conference.live.streaming.enable -%}
-    "days": [
-        {%- for d in site.data.program.days %}
-        {
-            {%- include get_day_hash.html %}
-            "name": "{{ day_name }}",
-            "hash": "{{ day_hash }}",
-            "date": "{{ d.date }}"
-        }{%- unless forloop.last -%},{%- endunless %}
-        {%- endfor %}
-    ],
-
     "rooms": {
     {%- assign first_room = true -%}
     {%- for room in site.rooms %}
@@ -25,10 +14,10 @@
             {%- else -%}
                 {%- assign first_room = false -%}
             {%- endunless %}
-        "{{ room.name }}": {
+        {{ room.name | jsonify }}: {
             "id": {{ forloop.index }},
-            "name": "{{ room.name }}",
-            "href": "{{ room_live_href }}"
+            "name": {{ room.name | jsonify }},
+            "href": {{ room_live_href | jsonify }}
         }
         {%- endif -%}
     {%- endfor %}
@@ -36,12 +25,12 @@
 
     "speakers": {
     {%- for speaker in site.speakers %}
-        "{{ speaker.name }}" : {
-            "name": "{{ speaker.first_name | append: ' ' | append: speaker.last_name }}",
+        {{ speaker.name | jsonify }} : {
+            "name": {{ speaker.first_name | append: ' ' | append: speaker.last_name | jsonify }},
         {%- if speaker.hide %}
             "href": ""
         {%- else %}
-            "href": "{{ speaker.url | prepend: site.baseurl }}"
+            "href": {{ speaker.url | prepend: site.baseurl | jsonify }}
         {%- endif %}
         }{%- unless forloop.last -%},{%- endunless %}
     {%- endfor %}
@@ -61,7 +50,7 @@
                         {%- else -%}
                             {%- assign first_room = false -%}
                         {%- endunless %}
-        "{{ room.name | replace: '"', '\"' }}": [
+        {{ room.name | jsonify }}: [
                         {%- assign first_talk = false %}
                     {%- else -%}
                         ,
@@ -70,45 +59,44 @@
                     {%- for t in r.talks %}
                         {%- assign talk = site.talks | where: 'name', t.name | first %}
             {
-                "name": "{{ talk.name | replace: '"', '\"' }}",
+                "name": {{ talk.name | jsonify }},
 
                         {%- unless talk.hide %}
-                "href": "{{ talk.url | prepend: site.baseurl }}",
+                "href": {{ talk.url | prepend: site.baseurl | jsonify }},
                         {%- else %}
                 "href": "",
                         {%- endunless -%}
 
                         {%- include get_track_properties.html %}
-                "color": "{{ track_color }}",
-                "speakers": [
-                        {%- for speaker_name in talk.speakers %}
-                    "{{ speaker_name}}"{%- unless forloop.last -%},{%- endunless -%}
-                        {%- endfor %}
-                ],
+                "color": {{ track_color | jsonify }},
+                "speakers": {% if talk.speakers %}{{ talk.speakers | jsonify }}{% else %}[]{% endif %},
 
                         {%- include get_talk_timestamp.html %}
                 "start": {{ timestamp_start }},
                 "end": {{ timestamp_end }}
 
-                        {% include get_link_types.html %}
+                        {%- include get_link_types.html context="talk" %}
                         {%- if has_live_links > 0 -%},
                 "live_links": [
+                            {%- assign first_link = true -%}
                             {%- for link in talk.links -%}
-                                {%- include get_link.html type="live" color=track_color -%}
-                                {%- if link_valid %},
+                                {%- include get_link.html type="live" color=track_color context="talk" -%}
+                                {%- unless link_valid -%}
+                                    {%- continue -%}
+                                {%- endunless -%}
+
+                                {%- unless first_link -%},{%- endunless -%}
+                                {%- assign first_link = false %}
                     {
-                        "name": "{{ link.name | replace: '"', '\"' }}",
-                        "href": "{{ link_href | replace: '"', '%22' }}"
-                                    {%- if link_icon -%},
-                        "icon": "{{ link_icon | replace: '"', '\"' }}"
-                                    {%- endif %}
-                                    {%- if link_disabled -%},
+                        "name": {{ link.name | jsonify }},
+                        "href": {{ link_href | jsonify }}
+                                {%- if link_icon -%},
+                        "icon": {{ link_icon | jsonify }}
+                                {%- endif %}
+                                {%- if link_disabled -%},
                         "disabled": true
-                                    {%- endif -%}
                                 {%- endif %}
                     }
-                                {%- assign has_live_links = has_live_links | minus: 1 -%}
-                                {%- if has_live_links > 0 -%},{%- endif -%}
                             {%- endfor %}
                 ]
                         {%- endif %}

data/_layouts/json-site.html

@@ -1,50 +1,71 @@
+{%- comment -%}
+  Resources precached by the service worker (sw.js) for offline use:
+  all visible pages and everything below /assets/ the site actually uses.
+  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.
+{%- endcomment -%}
+{%- assign pages = "" | split: "" -%}
+{%- assign assets = "" | split: "" -%}
+{%- assign asset_versions = site.data.conference_assets -%}
+
+{%- comment -%} Skip unused stylesheet bundles and the map, which needs the network anyway {%- endcomment -%}
+{%- assign skip_assets = "/assets/css/map.bundle.css" | split: "," -%}
+{%- unless site.conference.custom_style == "bootstrap" -%}
+  {%- assign skip_assets = skip_assets | push: "/assets/css/conference-only.bundle.css" -%}
+{%- endunless -%}
+{%- if site.conference.custom_style == "bootstrap" or site.conference.custom_style == "full" -%}
+  {%- assign skip_assets = skip_assets | push: "/assets/css/conference.bundle.css" -%}
+{%- endif -%}
+
+{%- for page in site.pages -%}
+  {%- assign page_ext = page.url | split: "." | last -%}
+  {%- if page.output == false or page.url == nil or page.url == "" or page.url == "/sw.js" or page_ext == "map" -%}
+    {%- continue -%}
+  {%- endif -%}
+  {%- assign url = page.url | prepend: site.baseurl -%}
+  {%- if page.url contains "/assets/" -%}
+    {%- assign assets = assets | push: url -%}
+  {%- else -%}
+    {%- assign pages = pages | push: url -%}
+  {%- endif -%}
+{%- endfor -%}
+
+{%- for collection in site.collections -%}
+  {%- unless collection.output -%}
+    {%- continue -%}
+  {%- endunless -%}
+  {%- for item in collection.docs -%}
+    {%- unless item.hide or item.output == false -%}
+      {%- assign url = item.url | prepend: site.baseurl -%}
+      {%- assign pages = pages | push: url -%}
+    {%- endunless -%}
+  {%- endfor -%}
+{%- endfor -%}
+
+{%- assign static_paths = site.static_files | map: "path" -%}
+{%- for file in site.static_files -%}
+  {%- assign ext = file.extname | downcase -%}
+  {%- assign woff2_path = file.path | append: "2" -%}
+  {%- unless file.path contains "/assets/" -%}
+    {%- continue -%}
+  {%- endunless -%}
+  {%- if ext == ".woff" and static_paths contains woff2_path -%}
+    {%- continue -%}
+  {%- endif -%}
+  {%- if ext == ".map" or skip_assets contains file.path or file.path contains "/assets/js/leaflet-" or file.path contains "/assets/webfonts/bootstrap-icons." -%}
+    {%- continue -%}
+  {%- endif -%}
+  {%- assign url = file.path | prepend: site.baseurl -%}
+  {%- assign asset_key = file.path | remove_first: "/assets/" -%}
+  {%- if asset_versions[asset_key] -%}
+    {%- assign url = url | append: "?v=" | append: asset_versions[asset_key] -%}
+  {%- endif -%}
+  {%- assign assets = assets | push: url -%}
+{%- endfor -%}
 {
-  "name": "{{ site.title }}",
-  "baseurl": "{{ site.baseurl }}",
-  "pages": [
-    {%- assign first_page = true -%}
-    {%- for page in site.pages -%}
-      {%- unless page.output == false or page.url == nil or page.url == '' -%}
-        {%- unless first_page -%},{%- endunless -%}
-        "{{ page.url | prepend: site.baseurl }}"
-        {%- assign first_page = false -%}
-      {%- endunless -%}
-    {%- endfor -%}
-    {%- for collection in site.collections -%}
-      {%- if collection.first.output -%}
-        {%- for item in collection.first.docs -%}
-          {%- unless item.output == false or item.url == nil or item.url == '' -%}
-            {%- unless first_page -%},{%- endunless -%}
-            "{{ item.url | prepend: site.baseurl }}"
-            {%- assign first_page = false -%}
-          {%- endunless -%}
-        {%- endfor -%}
-      {%- endif -%}
-    {%- endfor -%}
-    {%- for post in site.posts -%}
-      {%- unless post.url == nil or post.url == '' -%}
-        {%- unless first_page -%},{%- endunless -%}
-        "{{ post.url | prepend: site.baseurl }}"
-        {%- assign first_page = false -%}
-      {%- endunless -%}
-    {%- endfor -%}
-  ],
-  "assets": [
-    {% if site.conference.custom_style == "bootstrap" -%}
-    {%- comment %} Conference bundle with separate Bootstrap {% endcomment -%}
-    "{{ site.baseurl }}/assets/css/bootstrap.min.css",
-    "{{ site.baseurl }}/assets/css/conference-only.bundle.css",
-    {% elsif site.conference.custom_style != "full" -%}
-    {%- comment %} Full conference bundle {% endcomment -%}
-    "{{ site.baseurl }}/assets/css/conference.bundle.css",
-    {% endif -%}
-    "{{ site.baseurl }}/assets/css/main.css",
-    "{{ site.baseurl }}/assets/js/conference.bundle.js",
-    "{{ site.baseurl }}/assets/js/leaflet.bundle.js",
-    "{{ site.baseurl }}/assets/js/main.js",
-    "{{ site.baseurl }}/assets/js/config.json",
-    "{{ site.baseurl }}/assets/js/data.json",
-    "{{ site.baseurl }}/assets/webfonts/bootstrap-icons.woff",
-    "{{ site.baseurl }}/assets/webfonts/bootstrap-icons.woff2"
-  ]
+  "name": {{ site.title | jsonify }},
+  "baseurl": {{ site.baseurl | jsonify }},
+  "pages": {{ pages | uniq | jsonify }},
+  "assets": {{ assets | uniq | jsonify }}
 }

data/_layouts/location.html

@@ -37,7 +37,24 @@
   {{ content }}
 
   {% if page.map %}
-    <div id="map" class="w-100 rounded shadow-sm" aria-label="{{ site.data.lang[site.conference.lang].location.map_label | default: 'Interactive conference location map' }}"></div>
+    {%- assign map_lang = site.data.lang[site.conference.lang].location -%}
+    {%- assign map_css_version = site.data.conference_assets['css/map.bundle.css'] | default: site_version %}
+    <div id="map" class="w-100 rounded shadow-sm" aria-label="{{ map_lang.map_label | default: 'Interactive conference location map' }}" data-map-css="{{ site.baseurl }}/assets/css/map.bundle.css?v={{ map_css_version }}">
+      <template data-map-icon>{% include icon.html name="star" %}</template>
+      {%- unless page.map.click_to_load == false %}
+        {%- comment -%} Privacy: tiles are only requested from the provider after consent {%- endcomment %}
+        <div class="map-consent d-flex flex-column justify-content-center align-items-center text-center h-100 p-4 bg-body-tertiary rounded">
+          <p class="mb-3">
+            {{ map_lang.map_privacy | default: "The map is loaded from an external provider, which receives your IP address:" }}
+            {{ page.map.map_provider | default: "OpenStreetMap.Mapnik" | split: "." | first | escape }}
+          </p>
+          <button type="button" class="btn btn-primary" data-map-load>
+            {% include icon.html name="map" %}
+            {{ map_lang.map_load | default: "Load map" }}
+          </button>
+        </div>
+      {%- endunless %}
+    </div>
   {% endif %}
 
 {% include footer.html %}

data/_layouts/manifest.html

@@ -1,15 +1,14 @@
 {%- if site.conference.pwa and site.conference.pwa.enable -%}
 {
-  "name": "{{ site.title }}",
-  "short_name": "{{ site.title }}",
-  "description": "{{ site.description }}",
-  "lang": "{{ site.conference.lang | default: 'en' }}",
-  "start_url": "{{ site.baseurl | prepend: site.url }}/",
-  "scope": "{{ site.baseurl | prepend: site.url }}/",
+  "name": {{ site.title | jsonify }},
+  "short_name": {{ site.title | jsonify }},
+  "description": {{ site.description | jsonify }},
+  "lang": {{ site.conference.lang | default: 'en' | jsonify }},
+  "start_url": {{ site.baseurl | append: '/' | jsonify }},
+  "scope": {{ site.baseurl | append: '/' | jsonify }},
   "display": "standalone",
-  "background_color": "{{ site.conference.pwa.background_color | default: '#ffffff' }}",
-  "theme_color": "{{ site.conference.pwa.theme_color | default: '#0d6efd' }}",
-  "orientation": "portrait-primary",
+  "background_color": {{ site.conference.pwa.background_color | default: '#ffffff' | jsonify }},
+  "theme_color": {{ site.conference.pwa.theme_color | default: '#0d6efd' | jsonify }},
   {%- if site.conference.pwa.icons %}
   "icons": [
   {%- for icon in site.conference.pwa.icons %}
@@ -19,28 +18,30 @@
       {%- else -%}
         {%- assign icon_src = icon.img -%}
       {%- endif %}
-      "src": "{{ icon_src | prepend: '/assets/images/' | prepend: site.baseurl | prepend: site.url }}",
+      "src": {{ icon_src | prepend: '/assets/images/' | prepend: site.baseurl | jsonify }},
       {%- if icon.sizes %}
-      "sizes": "{{ icon.sizes }}",
+      "sizes": {{ icon.sizes | jsonify }},
       {%- endif -%}
       {%- if icon.type %}
-      "type": "{{ icon.type }}",
+      "type": {{ icon.type | jsonify }},
       {%- endif %}
-      "purpose": "{{ icon.purpose | default: "any" }}",
+      "purpose": {{ icon.purpose | default: "any" | jsonify }}
     }
     {%- unless forloop.last -%},{%- endunless -%}
   {%- endfor %}
   ],
   {%- endif %}
   "shortcuts": [
+  {%- assign first_shortcut = true -%}
   {%- for link in site.conference.navigation.links -%}
     {%- unless link.pwa_hide or link.live or link.menu -%}
       {%- include get_link.html %}
+      {%- unless first_shortcut -%},{%- endunless -%}
+      {%- assign first_shortcut = false %}
     {
-      "name": "{{ link.name }}",
-      "url": "{{link_href}}"
+      "name": {{ link.name | jsonify }},
+      "url": {{ link_href | jsonify }}
     }
-      {%- unless forloop.last -%},{%- endunless -%}
     {%- endunless -%}
   {%- endfor %}
   ]