From 31f377d861fabd7a1db8388767d5c68b9a789c8a Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 2 Oct 2021 12:49:12 +0200 Subject: [PATCH 1/3] Update theme --- themes/slick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/slick b/themes/slick index f3574b8..9907e93 160000 --- a/themes/slick +++ b/themes/slick @@ -1 +1 @@ -Subproject commit f3574b8c76c7f8a5d8d2a3beaa4b43075ec62bca +Subproject commit 9907e93f47a56c63858389a323936aa94432d776 -- 2.39.2 From 5ad48a8888d724ada19d882a9bc5ce527fd62982 Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 2 Oct 2021 12:53:29 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Move=20imprint=20to=20footer=20and=20rename?= =?UTF-8?q?=20that=20long=20datenschutzerkl=C3=A4rung=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/{datenschutzerklaerung.md => datenschutz.md} | 8 +++++--- content/impressum.md | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) rename content/{datenschutzerklaerung.md => datenschutz.md} (96%) diff --git a/content/datenschutzerklaerung.md b/content/datenschutz.md similarity index 96% rename from content/datenschutzerklaerung.md rename to content/datenschutz.md index a88036c..9ed23bb 100644 --- a/content/datenschutzerklaerung.md +++ b/content/datenschutz.md @@ -1,14 +1,16 @@ --- -title: Datenschutzerklärung -slug: datenschutzerklaerung +title: Datenschutz +slug: datenschutz description: Datenschutzerklärung draft: false menu: footer -weight: 10 +weight: 11 categories: - General showmetadates: false showmetalinks: false +aliases: +- /datenschutzerklaerung --- Die Nutzung unserer Seite ist ohne eine Angabe von personenbezogenen Daten diff --git a/content/impressum.md b/content/impressum.md index 8fe0f4d..07abe94 100644 --- a/content/impressum.md +++ b/content/impressum.md @@ -3,8 +3,8 @@ title: Impressum slug: impressum description: Impressum draft: false -menu: main -weight: 90 +menu: footer +weight: 10 categories: - General showmetadates: false -- 2.39.2 From 3151a60a876c714b19049c5414cf354cf48d1ce1 Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 2 Oct 2021 13:21:30 +0200 Subject: [PATCH 3/3] Implement some shortcode to safely include critical images instead of using raw html --- {static => assets}/img/das_gebaeude.jpg | Bin {static => assets}/img/der_verein.jpg | Bin {static => assets}/img/die_raeume.jpg | Bin {static => assets}/img/kitty.jpg | Bin {static => assets}/logo.png | Bin content/dezentrale.md | 4 +--- content/konto.md | 6 +++--- content/ueber-uns.md | 12 +++++++++--- layouts/shortcodes/resource_image.html | 12 ++++++++++++ 9 files changed, 25 insertions(+), 9 deletions(-) rename {static => assets}/img/das_gebaeude.jpg (100%) rename {static => assets}/img/der_verein.jpg (100%) rename {static => assets}/img/die_raeume.jpg (100%) rename {static => assets}/img/kitty.jpg (100%) rename {static => assets}/logo.png (100%) create mode 100644 layouts/shortcodes/resource_image.html diff --git a/static/img/das_gebaeude.jpg b/assets/img/das_gebaeude.jpg similarity index 100% rename from static/img/das_gebaeude.jpg rename to assets/img/das_gebaeude.jpg diff --git a/static/img/der_verein.jpg b/assets/img/der_verein.jpg similarity index 100% rename from static/img/der_verein.jpg rename to assets/img/der_verein.jpg diff --git a/static/img/die_raeume.jpg b/assets/img/die_raeume.jpg similarity index 100% rename from static/img/die_raeume.jpg rename to assets/img/die_raeume.jpg diff --git a/static/img/kitty.jpg b/assets/img/kitty.jpg similarity index 100% rename from static/img/kitty.jpg rename to assets/img/kitty.jpg diff --git a/static/logo.png b/assets/logo.png similarity index 100% rename from static/logo.png rename to assets/logo.png diff --git a/content/dezentrale.md b/content/dezentrale.md index 5d01bd6..e0da90c 100644 --- a/content/dezentrale.md +++ b/content/dezentrale.md @@ -11,9 +11,7 @@ showmetadates: false showmetalinks: false --- -Logo - -
+{{< resource_image src="logo.png" alt="Logo" >}}
diff --git a/content/konto.md b/content/konto.md index 3d88307..2889ca6 100644 --- a/content/konto.md +++ b/content/konto.md @@ -42,10 +42,10 @@ Bitte dazu an den Kassenwart wenden: --- -{{% figure - src="/img/kitty.jpg" +{{< resource_image + src="img/kitty.jpg" alt="Kleine süße Katze - erhöht die Spendenbereitschaft!" -%}} +>}} [kitty]: https://www.flickr.com/photos/pargon/2527422080/in/album-72157605279479377/ diff --git a/content/ueber-uns.md b/content/ueber-uns.md index 8778655..85f4743 100644 --- a/content/ueber-uns.md +++ b/content/ueber-uns.md @@ -22,7 +22,9 @@ und an Projekten zu basteln.

Das Gebäude

-
Das Gebäude
+
+ {{< resource_image src="img/das_gebaeude.jpg" alt="Das Gebäude" >}} +
Die dezentrale befindet sich im Hinterhaus der {{< value "address" "street_number" >}}. @@ -32,7 +34,9 @@ zu erreichen.

Die Räume

-
Die Räume
+
+ {{< resource_image src="img/die_raeume.jpg" alt="Die Räume" >}} +
Die dezentrale setzt sich aus mehreren Räumen zusammen — dem Hauptraum mit großer Elektronik-Werkstatt, Arbeitsplätzen, und einem @@ -44,7 +48,9 @@ Projektraum.

Der Verein

-
Der Verein
+
+ {{< resource_image src="img/der_verein.jpg" alt="Der Verein" >}} +
Die dezentrale wird von dem Verein {{< value "global" "full_name" >}} verwaltet. Wir freuen uns immer über Neuzugänge! Schau doch einfach mal vorbei diff --git a/layouts/shortcodes/resource_image.html b/layouts/shortcodes/resource_image.html new file mode 100644 index 0000000..295d85f --- /dev/null +++ b/layouts/shortcodes/resource_image.html @@ -0,0 +1,12 @@ +{{- $src := default (.Get 0) (.Get "src") }} +{{- if not $src }} +{{- errorf "missing value for 'src': %s" .Position }} +{{- end }} +{{- $alt := default (.Get 1) (.Get "alt") }} +{{- if not $alt }} +{{- errorf "missing value for 'alt': %s" .Position }} +{{- end }} +{{- $img := resources.Get $src | resources.Fingerprint }} +

+ {{ $alt }} +

-- 2.39.2