Theme: Combine events and articles into the same list

content/blog/2026/2026-05-08-diday-website/index.md

@@ -2,9 +2,7 @@
 categories: article
 title: 'DIDAY.org mit Unterstützung des CCCHH'
 date: '2026-06-07T14:00:00+02:00' # date of the event
-publishDate: '2026-06-07T14:00:00+02:00' # when to publish
 draft: false
-location: Z9
 authors:
   - stb
 tags:

themes/ccchh/layouts/index.html

@@ -7,33 +7,17 @@
     {{- $events := where (.Site.GetPage "blog").Pages ".Params.categories" "event" }}
     {{- $lookback := time.ParseDuration "-6h" }}
     {{- $upcoming := where $events ".Params.date" "ge" (time.Now.Add $lookback) }}
-    {{ if $upcoming }}
-    <div class="announcements">
-      <h2 id="neuigkeiten" class="on-hover-trg">Neuigkeiten <a href="#neuigkeiten" class="on-hover"><i class="fa-solid fa-link small"></i></a></h2>
-      {{- range $upcoming.ByDate }}
-      <div class="announcement">
-        {{- partial "blog-header.html" (dict "headingLink" true "level" 4 "reduced" true "page" . ) }}
-
-        {{- if in .RawContent "<!--more-->" }}
-          {{ .Summary | safeHTML }}
-        {{- else }}
-          <p>{{ .Summary | safeHTML }}</p>
-        {{- end }}
-        {{- if .Truncated }}
-          <p class="ellipsis"><a href="{{ .RelPermalink }}">mehr lesen</a></p>
-        {{- end }}
-      </div>
-      {{- end }}
-    </div>
-    {{- end }}
 
     {{- $article := where (.Site.GetPage "blog").Pages ".Params.categories" "article" }}
-    {{- $articleDisplayTime := time.ParseDuration "-30h" }}
+    {{- $articleDisplayTime := time.ParseDuration "-126h" }}
     {{- $articleNew := where $article ".Params.publishDate" "ge" (time.Now.Add $articleDisplayTime) }}
-    {{ if $articleNew }}
+
+    {{- $neuigkeiten := $upcoming | append $articleNew }}
+
+    {{ if $neuigkeiten }}
     <div class="announcements">
       <h2 id="neuigkeiten" class="on-hover-trg">Neuigkeiten <a href="#neuigkeiten" class="on-hover"><i class="fa-solid fa-link small"></i></a></h2>
-      {{- range $articleNew.ByDate }}
+      {{- range $neuigkeiten.ByDate }}
       <div class="announcement">
         {{- partial "blog-header.html" (dict "headingLink" true "level" 4 "reduced" true "page" . ) }}
 

themes/ccchh/layouts/partials/blog-header.html

@@ -14,7 +14,11 @@
         {{- end }}
 
         <div class="infos">
+          {{ if (eq .Params.categories "event") }}
           <span class="li-space"><i class="fa-solid fa-calendar-day"></i> {{ .Date | time.Format "Mon, 2006-01-02 15:04" }}</span>
+          {{- else }}
+          <span class="li-space"><i class="fa-solid fa-newspaper"></i> {{ .Date | time.Format "2006-01-02" }}</span>
+          {{- end }}
           {{- with .Params.location }}
           <span class="li-space">
               <i class="fa-solid fa-location-dot"></i>