Merge branch 'staging' into production

.gitignore

@@ -102,3 +102,6 @@ shell.nix
 
 # Python
 .venv
+
+# murmeldin
+overview.md

build.sh

@@ -3,6 +3,8 @@
 set -e
 set -x
 
+rm -rf public/ # delete old generated files
+
 hugo $(cat .hugo-params)
 ./tools/merge_cals.py
 upcoming="$(tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')"

config/_default/hugo.toml

@@ -1,14 +1,10 @@
-# -- Site Configuration --
-# Refer to the theme docs for more details about each of these parameters.
-# https://blowfish.page/docs/getting-started/
+theme = 'blowfish'
+baseURL = 'https://oururl.de/'
+defaultContentLanguage = 'de'
+relativeURLs = true
+canonifyURLs = true
 
-theme = "blowfish" # UNCOMMENT THIS LINE
-baseURL = "https://berlin.ccc.de/"
-defaultContentLanguage = "de"
-RelativeURLs = true
-CanonifyURLs = true
-
-pluralizeListTitles = "false" # hugo function useful for non-english languages, find out more in  https://gohugo.io/getting-started/configuration/#pluralizelisttitles
+pluralizeListTitles = false
 
 enableRobotsTXT = true
 summaryLength = 0
@@ -18,8 +14,6 @@ buildFuture = false
 
 enableEmoji = true
 
-# googleAnalytics = "G-XXXXXXXXX"
-
 [pagination]
   pagerSize = 100
 
@@ -27,10 +21,10 @@ enableEmoji = true
   anchor = 'Center'
 
 [taxonomies]
-  tag = "tags"
-  category = "categories"
-  author = "authors"
-  series = "series"
+  tag = 'tags'
+  category = 'categories'
+  author = 'authors'
+  series = 'series'
 
 [sitemap]
   changefreq = 'daily'
@@ -38,63 +32,61 @@ enableEmoji = true
   priority = 0.5
 
 [permalinks]
-  post = "/post/:year/:month/:day/:title/"
+  post = '/post/:year/:month/:day/:title/'
 
 [outputs]
-  home = ["HTML", "RSS", "JSON"]
-  section = ["HTML", "Calendar", "RSS", "XML", "ICS"]
-  page = ["HTML", "Calendar", "ICS"]
+  home = ['html', 'rss', 'json']
+  section = ['html', 'Calendar', 'rss', 'xml']
+  page = ['html', 'Calendar']
 
 # Output Formats Configuration
 [outputFormats.Calendar]
-  mediaType = "text/calendar"
-  baseName = "index"
+  mediaType = 'text/calendar'
+  baseName = 'index'
   isPlainText = true
   notAlternative = true
 
 [outputFormats.XML]
-  mediaType = "application/xml"
-  baseName = "index"
+  mediaType = 'application/xml'
+  baseName = 'index'
   isPlainText = true
 
 [outputFormats.RSS]
-  mediaType = "application/rss+xml"
+  mediaType = 'application/rss+xml'
 
 # Media Types Configuration
 [mediaTypes]
-  [mediaTypes."text/calendar"]
-    suffixes = ["ics"]
-  [mediaTypes."application/rss"]
-    suffixes = ["rss"]
-  [mediaTypes."application/xml"]
-    suffixes = ["xml"]
+  [mediaTypes.'text/calendar']
+    suffixes = ['ics']
+  [mediaTypes.'application/rss+xml']
+    suffixes = ['xml', 'rss']
 
 [related]
   threshold = 0
   toLower = false
 
-    [[related.indices]]
-        name = "tags"
-        weight = 100
+  [[related.indices]]
+    name = 'tags'
+    weight = 100
 
-    [[related.indices]]
-        name = "categories"
-        weight = 100
+  [[related.indices]]
+    name = 'categories'
+    weight = 100
 
-    [[related.indices]]
-        name = "series"
-        weight = 50
+  [[related.indices]]
+    name = 'series'
+    weight = 50
 
-    [[related.indices]]
-        name = "authors"
-        weight = 20
+  [[related.indices]]
+    name = 'authors'
+    weight = 20
 
-    [[related.indices]]
-        name = "date"
-        weight = 10
-
-    [[related.indices]]
-      applyFilter = false
-      name = 'fragmentrefs'
-      type = 'fragments'
+  [[related.indices]]
+      name = 'date'
       weight = 10
+
+  [[related.indices]]
+    applyFilter = false
+    name = 'fragmentrefs'
+    type = 'fragments'
+    weight = 10

config/_default/languages.de.toml

@@ -29,5 +29,4 @@ title = "Chaos Computer Club Berlin"
     { forgejo = "https://git.berlin.ccc.de/explore/repos" },
     { email = "mailto:mail2025@berlin.ccc.de" },
     { github = "https://github.com/cccb/" },
-
   ]

config/_default/menus.de.toml

@@ -39,7 +39,6 @@
 # The footer menu is displayed at the bottom of the page, just before
 # the copyright notice. Configure as per the main menu above.
 
-
 [[footer]]
   name = "Tags"
   pageRef = "tags"

content/datengarten/113/index.md

@@ -0,0 +1,24 @@
+---
+categories: ["Datengarten"]
+tags: ["not yet announced", "Datengarten", "Veranstaltung"]
+series: "Datengarten"
+title: "Datengarten 113"
+no: 113
+subtitle: ""
+speaker: "not yet announced"
+date: 2025-03-24T19:00:00+01:00
+event:
+  start: 2025-04-04T20:00:00+01:00
+  end:   2025-04-04T21:30:00+01:00
+location: CCCB
+language: de
+streaming: true
+recording: https://streaming.media.ccc.de/datengarten/cccb
+draft: false
+---
+
+Am 07.05. findet um 20 Uhr wieder ein Datengarten statt, der noch angekündigt wird. Mehr dazu demnächst hier.
+
+//
+
+On 07.05., 20:00, there will be another Datengarten, which will be announced soon. You will find more information here soon.

content/datengarten/_preset/index.md

@@ -0,0 +1,24 @@
+---
+categories: ["Datengarten"]
+tags: ["Alltag", "Kompression", "Mediendateien", "Datengarten", "Veranstaltung"]
+series: "Datengarten"
+title: "Datengarten 1XX"
+no: 1XX
+subtitle: ""
+speaker: ""
+date: 2025-03-24T19:00:00+01:00
+event:
+  start: 2025-04-04T20:00:00+01:00
+  end:   2025-04-04T21:30:00+01:00
+location: CCCB
+language: de
+streaming: true
+recording: https://streaming.media.ccc.de/datengarten/cccb
+draft: true
+---
+
+Am 07.05. findet wieder ein Datengarten statt, der noch angekündigt wird. Mehr dazu demnächst hier.
+
+//
+
+On 07.05. there will be another Datengarten, which will be announced soon. You will find more information here soon.

content/verein/anfahrt.md

@@ -27,7 +27,7 @@ Eine beschränkte Anzahl von Fahrradständern befindet sich im Innenhof. Auf dem
 
 ## mit öffentlichem Nahverkehr
 
-Der Club befindet sich in unmittelbarer Nähe zum S+U Bahnhof **Friedrichstraße**, an dem auch Regionalbahnen halten. Vom S-Bahn-Bahnsteig gibt es einen direkten Weg über die Spree unterhalb der Bahnbrücke. Über die Albrechtstraße erreicht ihr die Marienstraße.
+Der Club befindet sich in unmittelbarer Nähe zum S+U Bahnhof **Friedrichstraße**, an dem auch Regionalbahnen halten. Vom S-Bahn-Bahnsteig (S3/S5/S7, oberirdisch, Ausgang Schiffbauerdamm) gibt es einen direkten Weg über die Spree unterhalb der Bahnbrücke. Über die Albrechtstraße erreicht ihr die Marienstraße.
 
 ## mit dem Fernverkehr
 

layouts/veranstaltungen/list.ics

@@ -16,8 +16,8 @@ DESCRIPTION:{{ . }}
 Link: https://berlin.ccc.de{{ $.RelPermalink }}
 {{ end }}
 URL:https://berlin.ccc.de{{ .RelPermalink }}
-{{ with .Params.dtstart }}DTSTART:{{ . }}{{ end }}
-{{ with .Params.dtend }}DTEND:{{ . }}{{ 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