From f03ed0bac65bd7451bb0023c0ac7354e05b14aae Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Wed, 5 Apr 2023 16:15:00 +0200 Subject: [PATCH] =?UTF-8?q?Autoren-Status/einfache=20bzw.=20erweiterte=20A?= =?UTF-8?q?utoren=20(schlie=C3=9Ft=20#217)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/german/author/cantortechnik-ag.md | 20 ------------------- .../german/author/chiamaka-michelle-okoro.md | 3 +++ content/german/author/denys-konovalov.md | 3 +++ content/german/author/erik-zschoche.md | 3 +++ content/german/author/franziska-berner.md | 2 ++ content/german/author/frau-bachran.md | 5 ++++- content/german/author/frau-felke.md | 7 ++++--- content/german/author/frau-krug.md | 3 +++ content/german/author/frau-opel-fritzlar.md | 3 +++ content/german/author/frau-schapitz.md | 3 +++ content/german/author/frau-schulz.md | 3 +++ content/german/author/frau-tuppack.md | 3 +++ content/german/author/herr-berger.md | 3 +++ content/german/author/herr-dr-gorsler.md | 3 +++ content/german/author/schulleitung.md | 3 +++ ...ergebnisse-3-runde-der-ipho-bundesrunde.md | 2 +- layouts/_default/card.html | 10 ++++++++-- layouts/_default/single.html | 8 +++++++- layouts/author/list.html | 2 ++ layouts/index.html | 8 +++++++- 20 files changed, 68 insertions(+), 29 deletions(-) delete mode 100644 content/german/author/cantortechnik-ag.md diff --git a/content/german/author/cantortechnik-ag.md b/content/german/author/cantortechnik-ag.md deleted file mode 100644 index 38daefa..0000000 --- a/content/german/author/cantortechnik-ag.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: CantorTechnik AG -bg_image: /media/backgrounds/page-title.webp -description: "" -email: technik@cantor-gymnasium.de -image: /media/people/gcg.webp -social: - - title: YouTube - icon: mdi mdi-youtube - link: https://www.youtube.com/channel/UCFCJdxg2D9RXH0qjZ8MMw1g - - title: Gitea - icon: mdi mdi-gitea - link: https://git.cantorgymnasium.de/cantortechnik/ - - title: E-Mail - icon: mdi mdi-at - link: mailto:technik@cantor-gymnasium.de ---- -Wir sind eine AG am Georg-Cantor-Gymnasium, welche sich mit allen Themen rund um die digitale Welt am Georg-Cantor-Gymnasium beschäftigt. Des Weiteren betreiben wir die Schulwebsite des GCG. - -Mehr Informationen [hier](/ganztagsangebote/cantortechnik/) diff --git a/content/german/author/chiamaka-michelle-okoro.md b/content/german/author/chiamaka-michelle-okoro.md index f85f538..16bab73 100644 --- a/content/german/author/chiamaka-michelle-okoro.md +++ b/content/german/author/chiamaka-michelle-okoro.md @@ -3,5 +3,8 @@ title: Chiamaka Michelle Okoro bg_image: /media/backgrounds/page-title.webp description: "" image: /media/people/gcg.webp +type: author +simplified: true +active: true --- Schülerin (Abiturjahrgang 2024) diff --git a/content/german/author/denys-konovalov.md b/content/german/author/denys-konovalov.md index 979013a..8788356 100644 --- a/content/german/author/denys-konovalov.md +++ b/content/german/author/denys-konovalov.md @@ -7,6 +7,9 @@ social: - title: E-Mail icon: mdi mdi-at link: mailto:kontakt@denyskon.de +type: author +simplified: false +active: true --- Ich bin ein Schüler der 9. Klasse am Georg-Cantor-Gymnasium in Halle (Saale) und Schülersprecher im Schuljahr 2022/2023. diff --git a/content/german/author/erik-zschoche.md b/content/german/author/erik-zschoche.md index 3727bfb..7356b4d 100644 --- a/content/german/author/erik-zschoche.md +++ b/content/german/author/erik-zschoche.md @@ -3,5 +3,8 @@ title: Erik Zschoche bg_image: /media/backgrounds/page-title.webp description: "" image: /media/people/gcg.webp +type: author +simplified: true +active: true --- Schüler (Abiturjahrgang 2023) diff --git a/content/german/author/franziska-berner.md b/content/german/author/franziska-berner.md index 665ab75..3eb3b8a 100644 --- a/content/german/author/franziska-berner.md +++ b/content/german/author/franziska-berner.md @@ -3,5 +3,7 @@ title: Franziska Berner bg_image: /media/backgrounds/page-title.webp description: "" image: /media/people/gcg.webp +simplified: true +active: true --- Schülerin \ No newline at end of file diff --git a/content/german/author/frau-bachran.md b/content/german/author/frau-bachran.md index a4fb2ff..1e1bfdf 100644 --- a/content/german/author/frau-bachran.md +++ b/content/german/author/frau-bachran.md @@ -1,7 +1,10 @@ --- -title: "Frau Bachran " +title: Frau Bachran bg_image: /media/backgrounds/page-title.webp description: "" image: /media/people/gcg.webp +type: author +simplified: true +active: true --- Lehrerin diff --git a/content/german/author/frau-felke.md b/content/german/author/frau-felke.md index ea03940..07734f4 100644 --- a/content/german/author/frau-felke.md +++ b/content/german/author/frau-felke.md @@ -3,10 +3,11 @@ title: Frau Felke bg_image: /media/backgrounds/page-title.webp description: "" image: /media/people/gcg.webp +type: author +simplified: false +active: true --- -Koordinatorin für den inhaltlichen Schwerpunkt - -Lehrerin +Koordinatorin für den inhaltlichen Schwerpunkt, Lehrerin diff --git a/content/german/author/frau-krug.md b/content/german/author/frau-krug.md index ee5e431..23eef84 100644 --- a/content/german/author/frau-krug.md +++ b/content/german/author/frau-krug.md @@ -3,5 +3,8 @@ title: Frau Krug bg_image: /media/backgrounds/page-title.webp description: "" image: /media/people/gcg.webp +type: author +simplified: true +active: true --- Lehrerin für Musik und Geschichte \ No newline at end of file diff --git a/content/german/author/frau-opel-fritzlar.md b/content/german/author/frau-opel-fritzlar.md index 280e729..7fa4748 100644 --- a/content/german/author/frau-opel-fritzlar.md +++ b/content/german/author/frau-opel-fritzlar.md @@ -3,5 +3,8 @@ title: Frau Opel-Fritzlar bg_image: /media/backgrounds/page-title.webp description: "" image: /media/people/gcg.webp +type: author +simplified: true +active: true --- Lehrerin diff --git a/content/german/author/frau-schapitz.md b/content/german/author/frau-schapitz.md index e77d382..5acdedc 100644 --- a/content/german/author/frau-schapitz.md +++ b/content/german/author/frau-schapitz.md @@ -7,5 +7,8 @@ social: - title: E-Mail icon: mdi mdi-at link: schapitz@cantor-gymnasium.de +type: author +simplified: false +active: true --- Stellvertretende Schulleiterin \ No newline at end of file diff --git a/content/german/author/frau-schulz.md b/content/german/author/frau-schulz.md index 3081db6..bfb2631 100644 --- a/content/german/author/frau-schulz.md +++ b/content/german/author/frau-schulz.md @@ -3,5 +3,8 @@ title: Frau Schulz bg_image: /media/backgrounds/page-title.webp description: "" image: /media/people/gcg.webp +type: author +simplified: true +active: true --- Lehrerin diff --git a/content/german/author/frau-tuppack.md b/content/german/author/frau-tuppack.md index 79dcccd..122792b 100644 --- a/content/german/author/frau-tuppack.md +++ b/content/german/author/frau-tuppack.md @@ -3,5 +3,8 @@ title: Frau Tuppack bg_image: /media/backgrounds/page-title.webp description: "" image: /media/people/gcg.webp +type: author +simplified: true +active: true --- Lehrerin diff --git a/content/german/author/herr-berger.md b/content/german/author/herr-berger.md index c2c118c..6cc7c57 100644 --- a/content/german/author/herr-berger.md +++ b/content/german/author/herr-berger.md @@ -8,5 +8,8 @@ social: - link: mailto:berger@cantor-gymnasium.de icon: mdi mdi-at title: E-Mail +type: author +simplified: false +active: true --- Web-Admin, Lehrer Informatik & Deutsch diff --git a/content/german/author/herr-dr-gorsler.md b/content/german/author/herr-dr-gorsler.md index 2b05481..1bd932f 100644 --- a/content/german/author/herr-dr-gorsler.md +++ b/content/german/author/herr-dr-gorsler.md @@ -7,5 +7,8 @@ social: - title: E-Mail icon: mdi mdi-at link: mailto:gorsler@cantor-gymnasium.de +type: author +simplified: false +active: true --- Schulleiter diff --git a/content/german/author/schulleitung.md b/content/german/author/schulleitung.md index 0aa9383..b88f0d9 100644 --- a/content/german/author/schulleitung.md +++ b/content/german/author/schulleitung.md @@ -7,5 +7,8 @@ social: - icon: mdi mdi-at title: Mail link: mailto:schulleitung@cantor-gymnasium.de +type: author +simplified: true +active: true --- Die Schulleitung des Georg-Cantor-Gymnasiums diff --git a/content/german/blog/ergebnisse-3-runde-der-ipho-bundesrunde.md b/content/german/blog/ergebnisse-3-runde-der-ipho-bundesrunde.md index 9222092..15155a0 100644 --- a/content/german/blog/ergebnisse-3-runde-der-ipho-bundesrunde.md +++ b/content/german/blog/ergebnisse-3-runde-der-ipho-bundesrunde.md @@ -5,7 +5,7 @@ draft: false bg_image: /media/backgrounds/page-title.webp description: "" image: /media/blog/IPhO.webp -author: "Frau Bachran " +author: Frau Bachran categories: - Naturwissenschaften - Wettbewerbe diff --git a/layouts/_default/card.html b/layouts/_default/card.html index d0ebdae..c88a8f9 100644 --- a/layouts/_default/card.html +++ b/layouts/_default/card.html @@ -3,9 +3,15 @@
{{ time.Format "02. Jan 2006" .PublishDate }}
-
+
- {{ .Params.author | title }} + {{ range where (where .Site.RegularPages "Type" "author") "Title" .Params.author }} + {{ if .Params.simplified }} + {{ .Title }} + {{ else }} + {{ .Title }} + {{ end }} + {{ end }}

{{ .Title }}

diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 4958f46..d972e6c 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -12,7 +12,13 @@
{{ i18n "posted_by" }}: - {{ .Params.author | title }} + {{ range where (where .Site.RegularPages "Type" "author") "Title" .Params.author }} + {{ if .Params.simplified }} + {{ .Title }} + {{ else }} + {{ .Title }} + {{ end }} + {{ end }}
{{ i18n "date" }}: diff --git a/layouts/author/list.html b/layouts/author/list.html index 021dcd0..543e088 100644 --- a/layouts/author/list.html +++ b/layouts/author/list.html @@ -21,7 +21,9 @@
{{ .Title }}

{{ .Summary }}

+ {{ if not .Params.simplified }} {{ i18n "read_more"}} + {{ end }}
diff --git a/layouts/index.html b/layouts/index.html index 95a34c2..ab7217d 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -124,7 +124,13 @@
- {{ $data.ausblick.author | title }} + {{ range where (where .Site.RegularPages "Type" "author") "Title" $data.ausblick.author }} + {{ if .Params.simplified }} + {{ .Title }} + {{ else }} + {{ .Title }} + {{ end }} + {{ end }}

{{ $data.ausblick.title }}