From a3b0fd2867b7b550f576ad0a0533ee4d87a32dea Mon Sep 17 00:00:00 2001
From: Frieder Griesshammer <frieder.griesshammer@der-beweis.de>
Date: Fri, 17 Sep 2021 18:02:55 +0200
Subject: [PATCH] Further optimize 'event_weekly_display' shortcode and
 introduce some link attribute

---
 content/events/chaostreff.md                 |  1 +
 content/events/freifunk.md                   |  1 +
 content/events/hw4f_computerausgabe.md       |  1 +
 layouts/shortcodes/event_weekly.html         |  9 ++++-
 layouts/shortcodes/event_weekly_display.html | 40 ++++++++++----------
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/content/events/chaostreff.md b/content/events/chaostreff.md
index de7c41b..aa921d8 100644
--- a/content/events/chaostreff.md
+++ b/content/events/chaostreff.md
@@ -15,6 +15,7 @@ event:
   weekly:
     weekday: Freitag
     begin: '19.00'
+    link: https://www.ccc.de/de/club/chaostreffs
 ---
 
 {{< event_weekly >}}
diff --git a/content/events/freifunk.md b/content/events/freifunk.md
index 1e593a8..7d7b10d 100644
--- a/content/events/freifunk.md
+++ b/content/events/freifunk.md
@@ -13,6 +13,7 @@ event:
   weekly:
     weekday: Donnerstag
     begin: '19.30'
+    link: https://freifunk-leipzig.de
 ---
 
 {{< event_weekly >}}
diff --git a/content/events/hw4f_computerausgabe.md b/content/events/hw4f_computerausgabe.md
index 18d248d..44b9889 100644
--- a/content/events/hw4f_computerausgabe.md
+++ b/content/events/hw4f_computerausgabe.md
@@ -17,6 +17,7 @@ event:
     begin: '17.00'
     finish: '20.00'
     annotation: nur bei Bedarf & auf Einladung
+    link: https://hardwareforfuture.de
 ---
 
 {{< event_weekly >}}
diff --git a/layouts/shortcodes/event_weekly.html b/layouts/shortcodes/event_weekly.html
index eee905a..b13fb4d 100644
--- a/layouts/shortcodes/event_weekly.html
+++ b/layouts/shortcodes/event_weekly.html
@@ -9,9 +9,10 @@
 {{- $finish := $.Page.Param "event.weekly.finish" }}
 {{- $interval := $.Page.Param "event.weekly.interval" }}
 {{- $annotation := $.Page.Param "event.weekly.annotation" }}
+{{- $link := $.Page.Param "event.weekly.link" }}
 <p></p>
 <dl>
-  <dt>Wochentag</dt>
+  <dt>Termin</dt>
   <dd>
     Jeden
     {{- with $interval }}
@@ -38,4 +39,8 @@
     {{- end }}
   </dd>
 </dl>
-<p></p>
+<p>
+{{- with $link }}
+  <a href="$link">Website</a>
+{{- end }}
+</p>
diff --git a/layouts/shortcodes/event_weekly_display.html b/layouts/shortcodes/event_weekly_display.html
index 1783e27..b8ce489 100644
--- a/layouts/shortcodes/event_weekly_display.html
+++ b/layouts/shortcodes/event_weekly_display.html
@@ -4,26 +4,28 @@
 {{- range $page := $.Site.RegularPages.ByTitle }}
 {{ if (eq $weekday ($page.Param "event.weekly.weekday")) }}
   <li>
-    <div>
-      <a href="{{ $page.URL }}">{{ $page.Title }}</a>
-    </div>
-    <div>
-      <small>
-      {{- with $page.Param "event.weekly.interval" }}
-        Jeden {{ . }} {{ $weekday }} im Monat —
+    <p>
+      <a href="{{ $page.Permalink }}">{{ $page.Title }}</a>
+      {{- with $page.Param "event.weekly.link" }}
+        — <a href="{{ . }}">Webseite</a>
       {{- end }}
-      von {{ $page.Param "event.weekly.begin" }} Uhr
-      bis
-      {{- with $page.Param "event.weekly.finish" }}
-        {{ . }} Uhr
-      {{- else }}
-        open end
-      {{- end }}
-      {{- with $page.Param "event.weekly.annotation" }}
-        — {{ . }}
-      {{- end }}
-      </small>
-    </div>
+    <br>
+    <small>
+    {{- with $page.Param "event.weekly.interval" }}
+      Jeden {{ . }} {{ $weekday }} im Monat —
+    {{- end }}
+    von {{ $page.Param "event.weekly.begin" }} Uhr
+    bis
+    {{- with $page.Param "event.weekly.finish" }}
+      {{ . }} Uhr
+    {{- else }}
+      open end
+    {{- end }}
+    {{- with $page.Param "event.weekly.annotation" }}
+      — {{ . }}
+    {{- end }}
+    </small>
+    </p>
   </li>
 {{- end }}
 {{- end }}