From ca447bd5e6c2f8819eee8c4bec88b6b72663e26d Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 31 Dec 2022 20:10:27 +0100 Subject: [PATCH 1/9] Update theme to latest version --- themes/slick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/slick b/themes/slick index 663cc39..a4683dc 160000 --- a/themes/slick +++ b/themes/slick @@ -1 +1 @@ -Subproject commit 663cc39d4cb51e6c6b25983967363f93d717145a +Subproject commit a4683dcfc63694ffa101ee4b23566568f81326d7 From c02ca38d0c6ae91561b75058d9da68466fd145c1 Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 31 Dec 2022 20:41:10 +0100 Subject: [PATCH 2/9] Use definition lists on 'impressum' page (looks way better) --- content/impressum.md | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/content/impressum.md b/content/impressum.md index 07abe94..0d2d1f3 100644 --- a/content/impressum.md +++ b/content/impressum.md @@ -13,24 +13,16 @@ showmetalinks: false ## {{< value "global" "full_name" >}} -### Anschrift - -> {{< value "address" "street_number" >}} -> -> {{< value "address" "annotation" >}} -> -> {{< value "address" "zip_city" >}} -> -> {{< value "address" "country" >}} +Anschrift +: {{< value "address" "street_number" >}} ({{< value "address" "annotation" >}}) +: {{< value "address" "zip_city" >}} +: {{< value "address" "country" >}} -### Vertretung - -> {{< value "mail" "vorstand" >}} +Vertretung +: {{< value "mail" "vorstand" >}} -### Registergericht - -> {{< value "court" "name" >}} -> -> Registernummer {{< value "court" "number" >}} +Registergericht +: {{< value "court" "name" >}} +: Registernummer {{< value "court" "number" >}} From 190d87a83629cbbf9aefde070964d05db86d0c4c Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 31 Dec 2022 20:41:48 +0100 Subject: [PATCH 3/9] Use definition lists on 'datenschutz' page --- content/datenschutz.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/content/datenschutz.md b/content/datenschutz.md index 9ed23bb..85fd610 100644 --- a/content/datenschutz.md +++ b/content/datenschutz.md @@ -25,13 +25,14 @@ rechtlichen Grundlagen des Datenschutzes finden Sie im Bundesdatenschutzgesetz insoweit über die Art, den Umfang und Zweck der Erhebung, die Nutzung und die Verarbeitung von personenbezogenen Daten durch den Anbieter -> {{< value "global" "full_name" >}} -> -> {{< value "address" "street_number" >}} -> -> {{< value "address" "zip_city" >}} -> {{< value "mail" "vorstand" >}} +{{< value "global" "full_name" >}} +: {{< value "address" "street_number" >}} +: {{< value "address" "zip_city" >}} +: {{< value "address" "country" >}} + +Vertretung +: {{< value "mail" "vorstand" >}} Wir weisen darauf hin, dass die internetbasierte Datenübertragung Sicherheitslücken aufweist, ein lückenloser Schutz vor Zugriffen durch Dritte From a9f47c8d961e84e8fb699bb059c44946db037e5f Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 31 Dec 2022 20:42:08 +0100 Subject: [PATCH 4/9] Use definition lists on 'konto' page and adjust texts --- content/konto.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/content/konto.md b/content/konto.md index 2889ca6..79b3e4e 100644 --- a/content/konto.md +++ b/content/konto.md @@ -15,30 +15,30 @@ aliases: - /spenden --- -### Empfänger +Mitgliedsbeiträge und Spenden bitte an folgende Bankverbindung überweisen: -> `{{< value "global" "full_name" >}}` +Empfänger +: {{< value "global" "full_name" >}} -### Institut +Institut +: {{< value "account" "institution" >}} -> `{{< value "account" "institution" >}}` +IBAN +: `{{< value "account" "iban" >}}` -### IBAN - -> `{{< value "account" "iban" >}}` - -### BIC - -> `{{< value "account" "bic" >}}` +BIC +: `{{< value "account" "bic" >}}` Für Spenden oder Mitgliedsbeiträge stellen wir gerne eine steuerabzugsfähige Zuwendungsbestätigung (Spendenquittung) aus. Für Sachspenden nur in Ausnahmefällen. -Bitte dazu an den Kassenwart wenden: +Bei Spenden unter 100€ reicht dem Finanzamt in der Regel eine Kopie des +Kontoauszuges, dann müsst ihr uns nicht mal eure Adresse geben. -> {{< value "mail" "kasse" >}} +Kontakt +: {{< value "mail" "kasse" >}} --- From 44fa00ec529c02faacd4c7eaebfca119dafc3cc6 Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 31 Dec 2022 20:44:00 +0100 Subject: [PATCH 5/9] Remove final slash in alias forwarding --- content/posts/2022/11/localverse2022-call-for-participation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/posts/2022/11/localverse2022-call-for-participation.md b/content/posts/2022/11/localverse2022-call-for-participation.md index d5ea3ce..114240c 100644 --- a/content/posts/2022/11/localverse2022-call-for-participation.md +++ b/content/posts/2022/11/localverse2022-call-for-participation.md @@ -11,7 +11,7 @@ tags: - localverse2022 - cfp aliases: -- /posts/2022/11/localverse2022-call-for-participation-20221118/ +- /posts/2022/11/localverse2022-call-for-participation-20221118 author: Vorstand --- From 1f1a220e7d9098a401a6dcaeb0ba719011eb0cf8 Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 31 Dec 2022 20:46:44 +0100 Subject: [PATCH 6/9] Add canonical URL and noindex when using full page redirection --- layouts/partials/head.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index d95fed0..d2291e9 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -5,5 +5,7 @@ {{- if not $url }} {{- errorf "missing, empty or null value at 'values.redirect.url': %s" .Position }} {{- end }} + + {{- end }} From bcd1bbb24311f3f087ec0972f7254643d6322b8a Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 31 Dec 2022 21:03:31 +0100 Subject: [PATCH 7/9] Add hint to link into git repo as it displays a 404 page if not logged in --- content/dokumente.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/dokumente.md b/content/dokumente.md index 2baecda..051a327 100644 --- a/content/dokumente.md +++ b/content/dokumente.md @@ -26,3 +26,4 @@ showmetalinks: false * [Hygienekonzept](/docs/dezentrale-hygienekonzept.pdf) * [{{< value "links" "documents_name" >}}]({{< value "links" "documents_href" >}}) + (Link funktioniert nur nach Login) From b1dcda3dd7a03febbecca441d5623c158e3b1f0c Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 31 Dec 2022 21:06:32 +0100 Subject: [PATCH 8/9] Directly link onto 'leipzig' entry on CCC chaostreff page --- data/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/values.yaml b/data/values.yaml index fb64f8e..4945f4b 100644 --- a/data/values.yaml +++ b/data/values.yaml @@ -33,7 +33,7 @@ chat: links: ccc_href: https://www.ccc.de ccc_name: Chaos Computer Club - chaostreff_href: https://www.ccc.de/de/club/chaostreffs + chaostreff_href: https://www.ccc.de/de/club/chaostreffs#leipzig chaostreff_name: Chaostreff Leipzig documents_href: https://git.dezentrale.cloud/members/dezentrale_doc documents_name: Interne Dokumente From 5304f01a3a482ee597099ae1ca685a439db1f23c Mon Sep 17 00:00:00 2001 From: Frieder Griesshammer Date: Sat, 31 Dec 2022 21:43:04 +0100 Subject: [PATCH 9/9] Unify spacing in css for definition lists --- assets/custom.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/assets/custom.css b/assets/custom.css index 1252305..6a417c5 100644 --- a/assets/custom.css +++ b/assets/custom.css @@ -17,10 +17,7 @@ padding: .5em; } -dl dt { - margin-bottom: .5em; -} - +dl dt, dl dd { - margin-bottom: 1em; + margin-bottom: .25em; }