Further optimize 'event_weekly_display' shortcode and introduce some link attribute

This commit is contained in:
sixtus 2021-09-17 18:02:55 +02:00
parent 6e811304ee
commit a3b0fd2867
5 changed files with 31 additions and 21 deletions

View File

@ -15,6 +15,7 @@ event:
weekly: weekly:
weekday: Freitag weekday: Freitag
begin: '19.00' begin: '19.00'
link: https://www.ccc.de/de/club/chaostreffs
--- ---
{{< event_weekly >}} {{< event_weekly >}}

View File

@ -13,6 +13,7 @@ event:
weekly: weekly:
weekday: Donnerstag weekday: Donnerstag
begin: '19.30' begin: '19.30'
link: https://freifunk-leipzig.de
--- ---
{{< event_weekly >}} {{< event_weekly >}}

View File

@ -17,6 +17,7 @@ event:
begin: '17.00' begin: '17.00'
finish: '20.00' finish: '20.00'
annotation: nur bei Bedarf & auf Einladung annotation: nur bei Bedarf & auf Einladung
link: https://hardwareforfuture.de
--- ---
{{< event_weekly >}} {{< event_weekly >}}

View File

@ -9,9 +9,10 @@
{{- $finish := $.Page.Param "event.weekly.finish" }} {{- $finish := $.Page.Param "event.weekly.finish" }}
{{- $interval := $.Page.Param "event.weekly.interval" }} {{- $interval := $.Page.Param "event.weekly.interval" }}
{{- $annotation := $.Page.Param "event.weekly.annotation" }} {{- $annotation := $.Page.Param "event.weekly.annotation" }}
{{- $link := $.Page.Param "event.weekly.link" }}
<p></p> <p></p>
<dl> <dl>
<dt>Wochentag</dt> <dt>Termin</dt>
<dd> <dd>
Jeden Jeden
{{- with $interval }} {{- with $interval }}
@ -38,4 +39,8 @@
{{- end }} {{- end }}
</dd> </dd>
</dl> </dl>
<p></p> <p>
{{- with $link }}
<a href="$link">Website</a>
{{- end }}
</p>

View File

@ -4,26 +4,28 @@
{{- range $page := $.Site.RegularPages.ByTitle }} {{- range $page := $.Site.RegularPages.ByTitle }}
{{ if (eq $weekday ($page.Param "event.weekly.weekday")) }} {{ if (eq $weekday ($page.Param "event.weekly.weekday")) }}
<li> <li>
<div> <p>
<a href="{{ $page.URL }}">{{ $page.Title }}</a> <a href="{{ $page.Permalink }}">{{ $page.Title }}</a>
</div> {{- with $page.Param "event.weekly.link" }}
<div> <a href="{{ . }}">Webseite</a>
<small>
{{- with $page.Param "event.weekly.interval" }}
Jeden {{ . }} {{ $weekday }} im Monat —
{{- end }} {{- end }}
von {{ $page.Param "event.weekly.begin" }} Uhr <br>
bis <small>
{{- with $page.Param "event.weekly.finish" }} {{- with $page.Param "event.weekly.interval" }}
{{ . }} Uhr Jeden {{ . }} {{ $weekday }} im Monat —
{{- else }} {{- end }}
open end von {{ $page.Param "event.weekly.begin" }} Uhr
{{- end }} bis
{{- with $page.Param "event.weekly.annotation" }} {{- with $page.Param "event.weekly.finish" }}
— {{ . }} {{ . }} Uhr
{{- end }} {{- else }}
</small> open end
</div> {{- end }}
{{- with $page.Param "event.weekly.annotation" }}
— {{ . }}
{{- end }}
</small>
</p>
</li> </li>
{{- end }} {{- end }}
{{- end }} {{- end }}