adjust styling and bump dates etc

2026-08-28 15:39:56 +02:00 · 2026-08-28 15:39:56 +02:00 · a584a5252f
commit a584a5252f
parent 476bf0d6d9
40 changed files with 678 additions and 294 deletions
--- a/layouts/_default/list.xml.html
+++ b/layouts/_default/list.xml.html
@ -2,10 +2,10 @@
 <events>
  {{ range .Pages }}
  <event>
-    <title>{{ .Title }}</title>
+    <title>{{ .Title | html }}</title>
    <link>{{ .Permalink }}</link>
    <date>{{ .Date.Format "2006-01-02" }}</date>
-    <description>{{ .Summary | plainify }}</description>
+    <description>{{ .Summary | plainify | html }}</description>
    {{ with .Params.location }}<location>{{ . }}</location>{{ end }}
  </event>
  {{ end }}
--- a/layouts/_default/single.ics
+++ b/layouts/_default/single.ics
@ -0,0 +1,21 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CCCB//Calendar//DE
+{{ with .Title }}
+X-WR-CALNAME:{{ . }}
+{{ end }}
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+{{ if and .Date (not .Params.members_only) }}
+BEGIN:VEVENT
+UID:{{ .File.UniqueID }}@berlin.ccc.de
+DTSTAMP:{{ .Date.UTC.Format "20060102T150405Z" }}
+DTSTART:{{ .Date.UTC.Format "20060102T150405Z" }}
+{{ with .Params.event.end }}DTEND:{{ dateFormat "20060102T150405Z" . }}{{ end }}
+SUMMARY:{{ .Title }}
+DESCRIPTION:{{ .Summary | plainify }}
+URL:{{ .Permalink }}
+{{ with .Params.location }}LOCATION:{{ . }}{{ end }}
+END:VEVENT
+{{ end }}
+END:VCALENDAR
--- a/layouts/datengarten/section.ics
+++ b/layouts/datengarten/section.ics
@ -21,6 +21,7 @@ END:STANDARD
 END:VTIMEZONE

 {{ range .Pages }}
+{{ if and .Params.event.start .Params.event.end -}}
 BEGIN:VEVENT
 ORGANIZER;CN="CCCB":mailto:datengarten@berlin.ccc.de
 SUMMARY:{{ .Title }}{{ with .Params.subtitle }}: {{ . }}{{ end }}
@ -34,5 +35,6 @@ LOCATION:{{ with .Params.location }}{{ . }}{{ else }}CCCB{{ end }}
 URL:{{ .Permalink }}
 DESCRIPTION:{{ .Permalink }}
 END:VEVENT
+{{ end -}}
 {{ end }}
 END:VCALENDAR
--- a/layouts/datengarten/section.xml
+++ b/layouts/datengarten/section.xml
@ -11,21 +11,21 @@
  {{range .Pages.ByDate -}}
  <day index="{{.Params.no}}" date="{{dateFormat "2006-01-02" .Params.event.start}}" start="{{dateFormat "2006-01-02T15:04:05" .Params.event.start}}" end="{{dateFormat "2006-01-02T15:04:05" .Params.event.end}}">
    <room name="Saal23">
-        <event id="{{.Params.no}}" guid="456fb60c-5ce7-11e8-be47-1fb2912eb8{{.Params.no}}">
+        <event id="{{.Params.no}}" guid="456fb60c-5ce7-11e8-be47-{{ printf "%012x" .Params.no }}">
        <date>{{dateFormat "2006-01-02T15:04:05" .Params.event.start}}</date>
        <start>{{dateFormat "15:04:05" .Params.event.start}}</start>
 	<duration>{{ $end := time .Params.event.end }}{{ $t := time "1970-01-01"}}{{ dateFormat "15:04" ( $t.Add ( $end.Sub (time .Params.event.start) ) ) }}</duration>
        <room>Saal23</room>
        <slug>dg-{{.Params.no}}</slug>
-        <title>{{htmlEscape .Title}}</title>
-	<subtitle>{{with .Params.subtitle}}{{htmlEscape .}}{{end}}</subtitle>
+        <title>{{.Title | html}}</title>
+	<subtitle>{{with .Params.subtitle}}{{. | html}}{{end}}</subtitle>
        <track/>
        <type/>
        <language>{{.Params.language}}</language>
-	<abstract><![CDATA[{{htmlUnescape .Plain|safeHTML}}]]></abstract>
-	<description><![CDATA[{{htmlUnescape .Plain|safeHTML}}]]></description>
+	<abstract><![CDATA[{{.Plain | safeHTML}}]]></abstract>
+	<description><![CDATA[{{.Plain | safeHTML}}]]></description>
        <persons>
-            <person id="0">{{htmlEscape .Params.speaker}}</person>
+            <person id="0">{{.Params.speaker | html}}</person>
        </persons>
        <links/>
      </event>
--- a/layouts/page/single.ics
+++ b/layouts/page/single.ics
@ -25,7 +25,7 @@ SUMMARY:{{.Title}}
 UID:{{lower (replace .Title " " "")}}@berlin.ccc.de
 SEQUENCE:0
 STATUS:CONFIRMED
-DTSTAMP:20180508T200000Z
+DTSTAMP:{{ now.Format "20060102T150405Z" }}
 DTSTART;TZID=Europe/Berlin:{{.Params.dtstart}}
 DTEND;TZID=Europe/Berlin:{{.Params.dtend}}
 RRULE:{{.Params.rrule}}
--- a/layouts/partials/extend-footer.html
+++ b/layouts/partials/extend-footer.html
@ -0,0 +1,2 @@
+{{ $fairydust := resources.Get "js/fairydust.js" | resources.Minify | resources.Fingerprint "sha512" }}
+<script src="{{ $fairydust.RelPermalink }}" integrity="{{ $fairydust.Data.Integrity }}" defer></script>
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@ -52,7 +52,7 @@

  </div>
  <script>
-    {{ if not .Site.Params.disableImageZoom | default true }}
+    {{ if not .Site.Params.disableImageZoom }}
    mediumZoom(document.querySelectorAll("img:not(.nozoom)"), {
      margin: 24,
      background: 'rgba(0,0,0,0.5)',
--- a/layouts/partials/talk-infobox.html
+++ b/layouts/partials/talk-infobox.html
@ -5,20 +5,20 @@
 <strong><i class="far fa-user fa-fw"></i>👤 Speaker:</strong> {{ .Page.Params.Speaker }}<br/>
 {{ end }}
 <strong><i class="far fa-calendar fa-fw"></i>🗓️ Date:</strong> {{ dateFormat "02.01.2006, 15:04" .Page.Params.Event.start }} Uhr<br/>
-{{ with (eq $.Page.Params.Language "de") }}
+{{ if eq $.Page.Params.Language "de" }}
 <strong><i class="fa fa-language fa-fw"></i>🌐 Language:</strong> Deutsch/German<br/>
 {{ end }}
-{{ with (eq $.Page.Params.Language "en") }}
+{{ if eq $.Page.Params.Language "en" }}
 <strong><i class="fa fa-language fa-fw"></i>🌐 Language:</strong> Englisch/English<br/>
 {{ end }}
 <strong><i class="fa fa-map-marker fa-fw"></i>📍 Location:</strong> {{ partial "location" .Page.Params.Location }}<br/>
 {{ if isset .Page.Params "recording" }}
-  <strong><i class="hover:underline hover:decoration-primary-400 hover:text-primary-500"></i>📹 Livestream: </strong> <a href="{{ .Page.Params.Recording }}">{{ .Page.Params.Recording }}</a></p>
+  <strong><i class="hover:underline hover:decoration-primary-400 hover:text-primary-500"></i>📹 Video/Stream: </strong> <a href="{{ .Page.Params.Recording }}">{{ .Page.Params.Recording }}</a>
 {{ else }}
  {{ if and (eq .Page.Params.Streaming true) (not (isset .Page.Params "recording" )) }}
-    <p><strong>Stream:</strong> <a class="hover:underline hover:decoration-primary-400 hover:text-primary-500" href="https://streaming.media.ccc.de/datengarten">streaming.media.ccc.de/datengarten</a></p>
+    <strong>Stream:</strong> <a class="hover:underline hover:decoration-primary-400 hover:text-primary-500" href="https://streaming.media.ccc.de/datengarten">streaming.media.ccc.de/datengarten</a>
  {{ else }}
-    <p><strong><i class="fa fa-exclamation-triangle fa-fw"></i></strong> Dieser Vortrag wird <strong>nicht</strong> gestreamed</a>! / This talk will <strong>not</strong> be streamed!</p>
+    <strong><i class="fa fa-exclamation-triangle fa-fw"></i></strong> Dieser Vortrag wird <strong>nicht</strong> gestreamt! / This talk will <strong>not</strong> be streamed!
  {{ end }}
 {{ end }}
 </p>
--- a/layouts/shortcodes/foldergallery.html
+++ b/layouts/shortcodes/foldergallery.html
@ -3,8 +3,8 @@ Put this file in /layouts/shortcodes/gallery.html
 Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
 -->
 <!-- count how many times we've called this shortcode; load the css if it's the first time -->
-{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="{{ "css/hugo-easy-gallery.css" | absURL }}" />{{ end }}
-{{- $.Page.Scratch.Add "figurecount" 1 }}
+{{- if not ($.Page.Store.Get "figurecount") }}<link rel="stylesheet" href="{{ "css/hugo-easy-gallery.css" | absURL }}" />{{ end }}
+{{- $.Page.Store.Add "figurecount" 1 }}
 {{ $baseURL := .Site.BaseURL }}
 <div class="gallery caption-position-{{ with .Get "caption-position" | default "bottom" }}{{.}}{{end}} caption-effect-{{ with .Get "caption-effect" | default "slide" }}{{.}}{{end}} hover-effect-{{ with .Get "hover-effect" | default "zoom" }}{{.}}{{end}} {{ if ne (.Get "hover-transition") "none" }}hover-transition{{end}}" itemscope itemtype="http://schema.org/ImageGallery">
 	{{- with (.Get "dir") -}}
--- a/layouts/shortcodes/series.html
+++ b/layouts/shortcodes/series.html
@ -21,7 +21,7 @@
    {{ if $art.Params.recording }}
 	<td><a href="{{ $art.Params.recording }}"><i class="fa fa-video fa-fw"></i></a></td>
    {{ else }}
-	<td><i class="fa fa-video-slash fa-fw"></i></a></td>
+	<td><i class="fa fa-video-slash fa-fw"></i></td>
    {{ end }}
  </tr>
    {{ end }}
--- a/layouts/veranstaltungen/list.ics
+++ b/layouts/veranstaltungen/list.ics
@ -6,20 +6,23 @@ CALSCALE:GREGORIAN
 METHOD:PUBLISH
 X-WR-CALNAME:CCCB Veranstaltungen
 X-WR-TIMEZONE:{{ $time_zone }}
-{{ range .Pages }}
+{{- range .Pages }}
+{{- if not .Params.members_only }}
 BEGIN:VEVENT
 UID:{{ .File.BaseFileName }}@berlin.ccc.de
 SUMMARY:{{ .Title }}
-{{ with .Params.subtitle }}
-DESCRIPTION:{{ . }}
-
-Link: https://berlin.ccc.de{{ $.RelPermalink }}
-{{ end }}
+{{ with .Params.subtitle -}}
+DESCRIPTION:{{ . }}\nLink: https://berlin.ccc.de{{ $.Page.RelPermalink }}
+{{ end -}}
 URL:https://berlin.ccc.de{{ .RelPermalink }}
-{{ with .Params.dtstart }}DTSTART;TZID=Europe/Berlin:{{ . }}{{ end }}
-{{ with .Params.dtend }}DTEND;TZID=Europe/Berlin:{{ . }}{{ end }}
-{{ with .Params.rrule }}RRULE:{{ . }}{{ end }}
+{{ with .Params.dtstart -}}DTSTART;TZID=Europe/Berlin:{{ . }}
+{{ end -}}
+{{ with .Params.dtend -}}DTEND;TZID=Europe/Berlin:{{ . }}
+{{ end -}}
+{{ with .Params.rrule -}}RRULE:{{ . }}
+{{ end -}}
 DTSTAMP:{{ now.Format "20060102T150405Z" }}
 END:VEVENT
-{{ end }}
+{{ end -}}
+{{ end -}}
 END:VCALENDAR