Merge branch 'improve-cal-view' into develop

Buterland-Beckerhook · Nov 16, 2020 · 5341971 · 5341971
2 parents d7311f3 + f0c1112
commit 5341971
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 94 deletions.
diff --git a/content/termine/_index.md b/content/termine/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Termine
-type: eventlist
+layout: abo
 outputs:
 - html
 - json

diff --git a/content/termine/abo.md b/content/termine/abo.md
@@ -0,0 +1,7 @@
+---
+title: Termine
+type: eventlist
+outputs:
+- calendar
+---
+Test
diff --git a/themes/bb2018/assets/jsconfig.json b/themes/bb2018/assets/jsconfig.json
@@ -0,0 +1,10 @@
+{
+ "compilerOptions": {
+  "baseUrl": ".",
+  "paths": {
+   "*": [
+    "*"
+   ]
+  }
+ }
+}
diff --git a/themes/bb2018/layouts/termine/abo.calendar.ics b/themes/bb2018/layouts/termine/abo.calendar.ics
@@ -0,0 +1,11 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//buterland-beckerhook//termine//DE
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+{{- range first 2 .Sections -}}
+{{- range .Pages.ByParam "start" -}}
+{{- template "termine/calentry.ics" . -}}
+{{- end -}}
+{{- end -}}
+END:VCALENDAR
diff --git a/themes/bb2018/layouts/termine/calentry.ics b/themes/bb2018/layouts/termine/calentry.ics
@@ -0,0 +1,40 @@
+{{ $start := time .Params.start -}}
+{{ $end := time .Params.end -}}
+{{ $hasStart := (eq (printf "%T" $start) "time.Time") -}}
+{{ $hasEnd := (eq (printf "%T" $end) "time.Time") -}}
+{{ $seq := 0 }}
+{{ with .Params.revision }}{{ $seq = . }}{{ end -}}
+{{ $status := "CONFIRMED" -}}
+{{ with .Params.canceled }}{{ if . }}{{ $status = "CANCELED" }}{{ end -}}{{ end -}}
+{{ if and $hasStart (not .Draft) }}
+BEGIN:VEVENT
+ORGANIZER;CN="Schützenverein Buterland-Beckerhook":mailto:Kontakt@Buterland-Beckerhook.de
+SUMMARY:{{ .Title }}
+{{ with .Content }}DESCRIPTION: {{ . | plainify }}{{ end -}}
+UID:{{ sha256 (printf "%s-%s" .Title (dateFormat "01-2006" $start)) }}
+SEQUENCE:{{ $seq }}
+STATUS:{{ $status }}
+DTSTAMP:{{- with .Params.Date }}{{dateFormat "20060102T150405Z" . }}{{ else }}{{dateFormat "20060102T150405Z" now }}{{ end }}
+LAST-MODIFIED:{{- with .Params.lastmod }}{{dateFormat "20060102T150405Z" . }}{{ else }}{{dateFormat "20060102T150405Z" now }}{{ end }}
+{{- if (gt $start.Hour 0) }}
+DTSTART;TZID=Europe/Berlin:{{dateFormat "20060102T150405" $start}}
+DTEND;TZID=Europe/Berlin:{{- if $hasEnd }}{{dateFormat "20060102T150405" $end }}{{ else }}{{ printf "%sT000000" (dateFormat "20060102" ($start.AddDate 0 0 1)) -}}{{- end -}}
+{{ else }}
+DTSTART;VALUE=DATE:{{dateFormat "20060102" $start }}
+DTEND;VALUE=DATE:{{- if $hasEnd }}{{dateFormat "20060102" $end }}{{ else }}{{dateFormat "20060102" $start -}}{{- end }}{{ end }}
+LOCATION:{{ with .Params.location -}}
+  {{- with (index $.Site.Data.locations .) -}}
+  {{- .name }}
+  {{- with .street }}, {{.}}{{ end }}
+  {{- with .zip }}, {{.}}{{ end }}
+  {{- with .city }} {{.}}{{ end }}
+  {{- if and (isset . "lat") (isset . "lng") }}
+GEO:{{ .lat }};{{ .lng }}
+  {{- end -}}
+  {{- else }}
+  {{- . -}}
+  {{- end }}
+  {{- end }}
+URL:{{ .Site.BaseURL }}/termine
+END:VEVENT
+{{ end -}}
diff --git a/themes/bb2018/layouts/termine/list.calendar.ics b/themes/bb2018/layouts/termine/list.calendar.ics
@@ -4,46 +4,6 @@ PRODID:-//buterland-beckerhook//termine//DE
 CALSCALE:GREGORIAN
 METHOD:PUBLISH
 {{ range .Pages.ByParam "start" -}}
-{{ $start := time .Params.start -}}
-{{ $end := time .Params.end -}}
-{{ $hasStart := (eq (printf "%T" $start) "time.Time") -}}
-{{ $hasEnd := (eq (printf "%T" $end) "time.Time") -}}
-{{ $seq := 0 }}
-{{ with .Params.revision }}{{ $seq = . }}{{ end -}}
-{{ $status := "CONFIRMED" }}
-{{ with .Params.canceled }}{{ if . }}{{ $status = "CANCELED" }}{{ end -}}{{ end -}}
-
-{{ if and $hasStart (not .Draft) }}
-BEGIN:VEVENT
-ORGANIZER;CN="Schützenverein Buterland-Beckerhook":mailto:Kontakt@Buterland-Beckerhook.de
-SUMMARY:{{ .Title }}
-{{ with .Content }}DESCRIPTION: {{ . | plainify }}{{ end -}}
-UID:{{ sha256 (printf "%s-%s" .Title (dateFormat "01-2006" $start)) }}
-SEQUENCE:{{ $seq }}
-STATUS:{{ $status }}
-DTSTAMP:{{- with .Params.Date }}{{dateFormat "20060102T150405Z" . }}{{ else }}{{dateFormat "20060102T150405Z" now }}{{ end }}
-LAST-MODIFIED:{{- with .Params.lastmod }}{{dateFormat "20060102T150405Z" . }}{{ else }}{{dateFormat "20060102T150405Z" now }}{{ end }}
-{{- if (gt $start.Hour 0) }}
-DTSTART;TZID=Europe/Berlin:{{dateFormat "20060102T150405" $start}}
-DTEND;TZID=Europe/Berlin:{{- if $hasEnd }}{{dateFormat "20060102T150405" $end }}{{ else }}{{ printf "%sT000000" (dateFormat "20060102" ($start.AddDate 0 0 1)) -}}{{- end -}}
-{{ else }}
-DTSTART;VALUE=DATE:{{dateFormat "20060102" $start }}
-DTEND;VALUE=DATE:{{- if $hasEnd }}{{dateFormat "20060102" $end }}{{ else }}{{dateFormat "20060102" $start -}}{{- end }}{{ end }}
-LOCATION:{{ with .Params.location -}}
-  {{- with (index $.Site.Data.locations .) -}}
-  {{- .name }}
-  {{- with .street }}, {{.}}{{ end }}
-  {{- with .zip }}, {{.}}{{ end }}
-  {{- with .city }} {{.}}{{ end }}
-  {{- if and (isset . "lat") (isset . "lng") }}
-GEO:{{ .lat }};{{ .lng }}
-  {{- end -}}
-  {{- else }}
-  {{- . -}}
-  {{- end }}
-  {{- end }}
-URL:{{ .Site.BaseURL }}/termine
-END:VEVENT
-{{ end -}}
+{{- template "termine/calentry.ics" . -}}
 {{ end -}}
 END:VCALENDAR
diff --git a/themes/bb2018/layouts/termine/noscript.html b/themes/bb2018/layouts/termine/noscript.html
@@ -24,9 +24,6 @@
     <tr>
         <td class="uk-text-bold {{ if $was }}uk-text-muted{{ end }}">
             <a class="uk-link uk-link-text-nu" href="{{ .RelPermalink }}">{{ .Title }}</a>
-            {{ with .OutputFormats.Get "calendar" }}
-            <a class="uk-link uk-link-text-nu" href="{{ .Permalink | safeURL }}" type="{{ .MediaType.Type }}" uk-icon="calendar"></a>
-            {{ end }}
         </td>
 
         <td class="{{ if $was }} uk-text-muted{{ end }}">
@@ -64,12 +61,12 @@
 <div class="uk-alert">
     <h3 uk-icon="info"></h3>
     <p class="uk-text-small uk-margin-remove-top uk-margin-left">
-        Du kannst einzelne Termine einfach in deinen Kalendar importieren, indem du auf das Icon hinter dem Event klickst.
         {{ $year := .Params.year}}
         {{ with .OutputFormats.Get "calendar" }}
-        Oder klicke <a href="{{ .Permalink | safeURL }}" type="{{ .MediaType.Type }}" uk-icon="calendar">hier </a>, um alle Termine
-        aus {{ $year }} zu importieren.
+        Du kannst die Termine für {{ $year }} ganz einfach in deinen Kalendar importieren, indem du
+        <a href="{{ .Permalink | safeURL }}" type="{{ .MediaType.Type }}" uk-icon="calendar">hier </a>, klickst.
         {{ end }}
+        Um einen einzelnen Termin zu importieren, wechsle in die Detailansicht des Termins.
     </p>
 </div>
 

diff --git a/themes/bb2018/layouts/termine/single.calendar.ics b/themes/bb2018/layouts/termine/single.calendar.ics
@@ -4,45 +4,5 @@ VERSION:2.0
 PRODID:-//buterland-beckerhook//termine//DE
 CALSCALE:GREGORIAN
 METHOD:PUBLISH
-{{ $start := time .Params.start -}}
-{{ $end := time .Params.end -}}
-{{ $hasStart := (eq (printf "%T" $start) "time.Time") -}}
-{{ $hasEnd := (eq (printf "%T" $end) "time.Time") -}}
-{{ $seq := 0 }}
-{{ with .Params.revision }}{{ $seq = . }}{{ end -}}
-{{ $status := "CONFIRMED" }}
-{{ with .Params.canceled }}{{ if . }}{{ $status = "CANCELED" }}{{ end -}}{{ end -}}
-
-{{ if and $hasStart (not .Draft) }}
-BEGIN:VEVENT
-ORGANIZER;CN="Schützenverein Buterland-Beckerhook":mailto:Kontakt@Buterland-Beckerhook.de
-SUMMARY:{{ .Title }}
-{{ with .Content }}DESCRIPTION: {{ . | plainify }}{{ end -}}
-UID:{{ sha256 (printf "%s-%s" .Title (dateFormat "01-2006" $start)) }}
-SEQUENCE:{{ $seq }}
-STATUS:{{ $status }}
-DTSTAMP:{{- with .Params.Date }}{{dateFormat "20060102T150405Z" . }}{{ else }}{{dateFormat "20060102T150405Z" now }}{{ end }}
-LAST-MODIFIED:{{- with .Params.lastmod }}{{dateFormat "20060102T150405Z" . }}{{ else }}{{dateFormat "20060102T150405Z" now }}{{ end }}
-{{- if (gt $start.Hour 0) }}
-DTSTART;TZID=Europe/Berlin:{{dateFormat "20060102T150405" $start}}
-DTEND;TZID=Europe/Berlin:{{- if $hasEnd }}{{dateFormat "20060102T150405" $end }}{{ else }}{{ printf "%sT000000" (dateFormat "20060102" ($start.AddDate 0 0 1)) -}}{{- end -}}
-{{ else }}
-DTSTART;VALUE=DATE:{{dateFormat "20060102" $start }}
-DTEND;VALUE=DATE:{{- if $hasEnd }}{{dateFormat "20060102" $end }}{{ else }}{{dateFormat "20060102" $start -}}{{- end }}{{ end }}
-LOCATION:{{ with .Params.location -}}
-  {{- with (index $.Site.Data.locations .) -}}
-  {{- .name }}
-  {{- with .street }}, {{.}}{{ end }}
-  {{- with .zip }}, {{.}}{{ end }}
-  {{- with .city }} {{.}}{{ end }}
-  {{- if and (isset . "lat") (isset . "lng") }}
-GEO:{{ .lat }};{{ .lng }}
-  {{- end -}}
-  {{- else }}
-  {{- . -}}
-  {{- end }}
-  {{- end }}
-URL:{{ .Site.BaseURL }}/termine
-END:VEVENT
-{{ end -}}
+{{- template "termine/calentry.ics" . -}}
 END:VCALENDAR
diff --git a/themes/bb2018/layouts/termine/single.html b/themes/bb2018/layouts/termine/single.html
@@ -21,9 +21,15 @@ <h2>{{ .Title }}</h2>
         {{ if $hasEnd }}
         <br><span class="{{ if $canceled }} text-strikethrough{{ end }}">
     bis <time datetime="{{ $end.String }}">{{ $end.Day }}. {{ index $month.long $end.Month }} {{ $end.Year }}</time>
-</span>{{ end }}
+
+
+    </span>{{ end }}
 
         <p>{{ .Content }}</p>
+        {{ with .OutputFormats.Get "calendar" }}
+        <br>
+        <a class="uk-button uk-button-primary" href="{{ .Permalink | safeURL }}" type="{{ .MediaType.Type }}" >Termin Importieren</a>
+        {{ end }}
     </div>
         {{ with .Params.location }}
         {{ with (index $.Site.Data.locations . ) }}
@@ -39,8 +45,6 @@ <h2>{{ .Title }}</h2>
 
                 if (token !== '') {
 
-                    console.log(token);
-
                     let map = L.map('map').setView([lng, lat], 14);
                     L.tileLayer('https://api.mapbox.com/styles/v1/rverstbb/ckh22s77e1am31amt3ygaiho6/tiles/{z}/{x}/{y}?access_token=' + token, {
                         attribution: '© <a href="https://www.mapbox.com/feedback/">Mapbox</a> © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>',
@@ -68,8 +72,8 @@ <h2>{{ .Title }}</h2>
         {{ end }}
 </div>
 
-<a href="{{ relURL "/termine" }}">Zurück zur Terminübersicht</a>
-
+<br>
+<a class="uk-button uk-button-primary" href="{{ relURL "/termine" }}">Zurück zur Terminübersicht</a>
 
 
 {{ end }}