From a8e87d5d291de42e39ef0afcd1a7be1f949ad8a4 Mon Sep 17 00:00:00 2001
From: echtnurich <chaos@echtnurich.de>
Date: Wed, 10 Jun 2026 20:28:18 +0200
Subject: [PATCH] Theme: Combine events and articles into the same list

---
 themes/ccchh/layouts/index.html | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/themes/ccchh/layouts/index.html b/themes/ccchh/layouts/index.html
index 5963234..8631c3b 100644
--- a/themes/ccchh/layouts/index.html
+++ b/themes/ccchh/layouts/index.html
@@ -12,25 +12,12 @@
     {{- $articleDisplayTime := time.ParseDuration "-126h" }}
     {{- $articleNew := where $article ".Params.publishDate" "ge" (time.Now.Add $articleDisplayTime) }}
 
-    {{ if or $upcoming $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 $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 }}
-
-      {{- range $articleNew.ByDate }}
+      {{- range $neuigkeiten.ByDate }}
       <div class="announcement">
         {{- partial "blog-header.html" (dict "headingLink" true "level" 4 "reduced" true "page" . ) }}