diff --git a/assets/css/style.css b/assets/css/style.css index ea3e9c9f..e14f34d8 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -414,6 +414,12 @@ details[open] summary { color: var(--gcg-color-primary); } +.tag-list { + display: flex; + flex-wrap: wrap; + gap: 8px; +} + .tag-list a { display: block; padding: 5px 10px; @@ -531,7 +537,7 @@ details[open] summary { .intro-video .play-btn { position: absolute; top: 50%; - left: 0; + left: calc(50% - 40px); transform: translateY(-50%); } @@ -908,12 +914,6 @@ link:focus, } } -@media (min-width: 768px) { - .termin-tc { - width: 25%; - } -} - @media (max-width: 991px) { .navigation { background: var(--gcg-color-secondary); @@ -976,3 +976,15 @@ link:focus, padding-right: 10%; } } + +#map { + height: 50vh; +} + +.object-cover { + object-fit: cover; +} + +.min-w-0 { + min-width: 0; +} \ No newline at end of file diff --git a/layouts/404.html b/layouts/404.html index 8d3ef15b..e26611cd 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -2,13 +2,9 @@
-
-
-
-

Hier geht es leider nicht weiter.

- Zurück zur Startseite -
-
+
+

Hier geht es leider nicht weiter.

+ Zurück zur Startseite
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 037e1350..27b9b674 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -3,12 +3,12 @@
-
+
{{ $paginator := .Paginate ( where .Data.Pages "Type" "post") }} {{ range $paginator.Pages }}
- {{ partial "card" . }} + {{ partial "card-article" . }}
{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index e949df1c..24f8dc9c 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -3,46 +3,31 @@
-
-
-
- {{ .Title }} +
+ {{ .Title }} +
+
+ Geschrieben von: + {{ partial "authors" (dict "Site" .Site "author" .Params.author )}}
-
-
-
- Geschrieben von: - {{ range $index, $elements := where (where .Site.RegularPages "Type" "author") "File.BaseFileName" "in" .Params.author }} - {{ if ne $index 0 }}, {{ end }} - {{ if .Params.simplified }} - {{ .Title }} - {{ else }} - {{ .Title }} - {{ end }} - {{ end }} -
-
- Datum: - {{ time.Format "02. Jan 2006" .PublishDate }} -
+
+ Datum: + {{ time.Format "02. Jan 2006" .PublishDate }}
-
-
+
Kategorien: {{ range $index, $elements := .Params.categories }} {{ if ne $index 0 }}, {{ end }} {{ . | title }} {{ end }} -
-
-
-
-
-
-
- {{ .Content }}
+
+
+
+
+ {{ .Content }} +
{{ partial "blog-sidebar.html" . }}
diff --git a/layouts/abiturienten/list.html b/layouts/abiturienten/list.html index 1931ee33..bffee6d1 100644 --- a/layouts/abiturienten/list.html +++ b/layouts/abiturienten/list.html @@ -4,9 +4,7 @@
{{ range .Pages }} -
- {{ partial "card-btn" . }} -
+ {{ partial "card-btn" . }} {{ end }}
diff --git a/layouts/abiturienten/single.html b/layouts/abiturienten/single.html index 6406a47d..771c4a4b 100644 --- a/layouts/abiturienten/single.html +++ b/layouts/abiturienten/single.html @@ -2,13 +2,9 @@
-
-
- -
-
- {{ .Content }} -
+ +
+ {{ .Content }}
diff --git a/layouts/about/list.html b/layouts/about/list.html index f132e77d..26ddbab3 100644 --- a/layouts/about/list.html +++ b/layouts/about/list.html @@ -2,13 +2,11 @@
-
-
- {{ with .Params.image }} - about image - {{ end }} - {{ .Content }} -
+ {{ with .Params.image }} + Foto der Schule + {{ end }} +
+ {{ .Content }}
@@ -32,6 +30,6 @@ {{ end }} {{ end }} -{{ partial "info.html" . }} +{{ partial "info" . }} {{ end }} diff --git a/layouts/alumninetzwerk/list.html b/layouts/alumninetzwerk/list.html index 223beb18..697934c1 100644 --- a/layouts/alumninetzwerk/list.html +++ b/layouts/alumninetzwerk/list.html @@ -2,91 +2,86 @@
-
-
{{ .Content }}
-
-
- - -
- - -
- - - -
-
- -
-

- Ich willige hiermit ein, dass meine E-Mail-Adresse zur - Kontaktaufnahme eingesetzt wird. -

-
-
-
- -
-

- Meine E-Mail-Adresse darf für andere Adressaten sichtbar sein. -

-
- -
+
+ + -
+
+ + +
+ + + +
+
+ +
+

+ Ich willige hiermit ein, dass meine E-Mail-Adresse zur + Kontaktaufnahme eingesetzt wird. +

+
+
+
+ +
+

+ Meine E-Mail-Adresse darf für andere Adressaten sichtbar sein. +

+
+ +
diff --git a/layouts/anmeldeformular/list.html b/layouts/anmeldeformular/list.html index c34d6b8c..dfafc53e 100644 --- a/layouts/anmeldeformular/list.html +++ b/layouts/anmeldeformular/list.html @@ -1,6 +1,6 @@ {{ define "main" }} -
+
diff --git a/layouts/anmeldung/list.html b/layouts/anmeldung/list.html index fa7e6543..dbe29120 100644 --- a/layouts/anmeldung/list.html +++ b/layouts/anmeldung/list.html @@ -2,10 +2,8 @@
-
-
- {{ .Content }} -
+
+ {{ .Content }}
{{ range .Params.elements }} @@ -13,7 +11,7 @@

{{ .title }}

-
{{ .content | markdownify }}
+
{{ .content | markdownify }}
diff --git a/layouts/author/list.html b/layouts/author/list.html index e97dc9f9..5ee51d4b 100644 --- a/layouts/author/list.html +++ b/layouts/author/list.html @@ -2,36 +2,29 @@
-
-
-
- {{ range .Pages }} -
-
-
- {{ if .Params.image }} - - {{ else if .Params.email }} - - {{ end }} -
-
-
-
{{ .Title }}
-

{{ .Summary }}

- {{ if not .Params.simplified }} - Mehr anzeigen - {{ end }} -
-
-
-
+ {{ range .Pages }} +
+
+
+ {{ if .Params.image }} + + {{ else if .Params.email }} + {{ end }}
+
+
+
{{ .Title }}
+

{{ partial "summary" .Content }}

+ {{ if not .Params.simplified }} + Mehr anzeigen + {{ end }} +
+
+ {{ end }}
diff --git a/layouts/author/single.html b/layouts/author/single.html index 4625687c..620871f7 100644 --- a/layouts/author/single.html +++ b/layouts/author/single.html @@ -2,44 +2,32 @@
-
-
-
- {{ if .Params.image }} - + {{ if .Params.image }} + {{ else if .Params.email}} {{ end }} -
-

{{ .Title }}

-
-
+

{{ .Title }}

{{ .Content }}
-
    - {{ with .Params.email }} -
    • - {{ end }} -
+ {{ with .Params.email }} + + {{ end }}
-
-
-
+
-
-
-
+

Geschrieben von {{ .Title }}

-
+
{{ range where .Site.RegularPages "Params.author" "intersect" (slice .File.BaseFileName) }} -
- {{ partial "card" . }} +
+ {{ partial "card-article" . }}
{{ end }}
diff --git a/layouts/begabte/list.html b/layouts/begabte/list.html index ce5e4ac7..6be622c3 100644 --- a/layouts/begabte/list.html +++ b/layouts/begabte/list.html @@ -3,14 +3,9 @@
- {{ .Content }} -
-
- {{ range .Pages }} -
- {{ partial "card-btn" . }} -
- {{ end }} + {{ range .Pages }} + {{ partial "card-btn" . }} + {{ end }}
diff --git a/layouts/begabte/single.html b/layouts/begabte/single.html index edefb84a..d81be7c8 100644 --- a/layouts/begabte/single.html +++ b/layouts/begabte/single.html @@ -1,22 +1,14 @@ {{ define "main" }} -{{ partial "header-cl-url" (dict "Params" .Params "Content" .Content) }} - +{{ partial "header-contest" . }}
-
-
-

Weitere Begabtenförderungsangebote

-
-
+

Weitere Begabtenförderungsangebote

- {{ $related := (where .Site.RegularPages "Type" "begabte") | intersect (where .Site.Pages ".Title" "!=" .Title) | union (.Site.RegularPages.Related . ) | shuffle | first 3}} - {{ range first 3 $related }} -
- {{ partial "card-btn" . }} -
- {{ end }} + {{ range partial "related" . }} + {{ partial "card-btn" . }} + {{ end }}
diff --git a/layouts/cantorfora/list.html b/layouts/cantorfora/list.html index bea607f0..1d790896 100644 --- a/layouts/cantorfora/list.html +++ b/layouts/cantorfora/list.html @@ -2,21 +2,13 @@
-
-
-
- {{ .Content }} -
-
+
+ {{ .Content }}
-
-
- {{ range sort .Data.Pages ".Params.index" }} -
- {{ partial "card-btn" . }} -
- {{ end }} + {{ range sort .Data.Pages ".Params.index" }} + {{ partial "card-btn" . }} + {{ end }}
diff --git a/layouts/cantorfora/single.html b/layouts/cantorfora/single.html index 64809b0e..e6d493fb 100644 --- a/layouts/cantorfora/single.html +++ b/layouts/cantorfora/single.html @@ -2,13 +2,9 @@
-
-
- -
-
- {{ .Content }} -
+ +
+ {{ .Content }}
diff --git a/layouts/cantorpreis/list.html b/layouts/cantorpreis/list.html index e8838c7b..1416f22a 100644 --- a/layouts/cantorpreis/list.html +++ b/layouts/cantorpreis/list.html @@ -4,11 +4,11 @@
{{ range .Pages }} -
+
{{ .Title }} -
-

{{ .Title }}

+
+

{{ .Title }}

{{ .Params.name }}

diff --git a/layouts/cantorpreis/single.html b/layouts/cantorpreis/single.html index 57f94d8d..5e00df8e 100644 --- a/layouts/cantorpreis/single.html +++ b/layouts/cantorpreis/single.html @@ -3,14 +3,14 @@
-
- {{ .Title }} +
+ {{ .Title }}
-
+

{{ .Params.Name }}

{{ .Title }}
-
- {{ .Content | markdownify }} +
+ {{ .Content }}
diff --git a/layouts/forms/list.html b/layouts/forms/list.html index d9439716..1e30dd18 100644 --- a/layouts/forms/list.html +++ b/layouts/forms/list.html @@ -2,21 +2,15 @@
-
-
-
- {{ range .Data.Pages }} -
-
- {{ .Title }} -

{{ .Summary | truncate 100 }}

-
-
Mehr anzeigen
-
- {{ end }} + {{ range .Data.Pages }} +
+
+ {{ .Title }} +

{{ partial "summary" .Content }}

+
Mehr anzeigen
-
+ {{ end }}
diff --git a/layouts/forms/single.html b/layouts/forms/single.html index 9dd01e1c..01338d17 100644 --- a/layouts/forms/single.html +++ b/layouts/forms/single.html @@ -2,18 +2,12 @@
-
-
-

{{ .Title }}

-
-
-
-
- {{ range .Params.files }} - {{ partial "download" . }} - {{ end }} - {{ .Content }} -
+

{{ .Title }}

+
+ {{ range .Params.files }} + {{ partial "download" . }} + {{ end }} + {{ .Content }}
diff --git a/layouts/ganztagsangebote/list.html b/layouts/ganztagsangebote/list.html index 07a7f262..717c8c50 100644 --- a/layouts/ganztagsangebote/list.html +++ b/layouts/ganztagsangebote/list.html @@ -3,13 +3,13 @@
{{ partial "filter-controls" . }} -
- {{ range .Data.Pages }} -
- {{ partial "ganztag" . }} -
- {{ end }} -
+
+ {{ range .Data.Pages }} +
+ {{ partial "ganztag" . }} +
+ {{ end }} +
diff --git a/layouts/ganztagsangebote/single.html b/layouts/ganztagsangebote/single.html index beb4f588..b00918f6 100644 --- a/layouts/ganztagsangebote/single.html +++ b/layouts/ganztagsangebote/single.html @@ -2,75 +2,26 @@
-
-
- -
+ +

{{ .Title }}

+
+ {{ partial "icon-element" (dict "size" 3 "icon" "mdi-calendar-today-outline" "title" "Zeit" "content" .Params.schedule) }} + {{ partial "icon-element" (dict "size" 3 "icon" "mdi-timer-sand" "title" "Dauer" "content" .Params.duration) }} + {{ partial "icon-element" (dict "size" 3 "icon" "mdi-crowd" "title" "Klassen" "content" .Params.class) }} + {{ partial "icon-element" (dict "size" 3 "icon" "mdi-map-marker-radius-outline" "title" "Raum" "content" .Params.room) }}
-

{{ .Title }}

-
-
-
-
-
- -
-
Zeit
-

{{ .Params.schedule }}

-
-
-
-
-
- -
-
Dauer
-

{{ .Params.duration }}

-
-
-
-
-
- -
-
Klassen
-

{{ .Params.class }}

-
-
-
-
-
- -
-
Raum
-

{{ .Params.room }}

-
-
-
-
-
-
-
-
-
-
-
+
+
{{ .Content }} -
+

Andere Arbeitsgemeinschaften

-
-

Andere Arbeitsgemeinschaften

-
-
-
- {{ $related := (where .Site.RegularPages "Type" "ganztagsangebote") | intersect (where .Site.Pages ".Title" "!=" .Title) | union (.Site.RegularPages.Related . ) | shuffle | first 3}} - {{ range first 3 $related }} + {{ range partial "related" . }}
{{ partial "ganztag" . }}
diff --git a/layouts/index.html b/layouts/index.html index 09374e51..0401e452 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -6,20 +6,20 @@ {{ with $data.homepage.slider }}
-
-
-

{{ $data.homepage.slider.title | markdownify }}

-
- {{ range .slider_item }} -
-

{{ .content | markdownify }}

- {{ if .button.enable }} - {{ .button.label }} - {{ end }} -
+
+
+

{{ $data.homepage.slider.title | markdownify }}

+
+ {{ range .slider_item }} +
+

{{ .content | markdownify }}

+ {{ if .button.enable }} + {{ .button.label }} {{ end }} -
+ {{ end }} +
+
@@ -56,7 +56,7 @@
{{ range .logos }} -
+
{{ end }} @@ -73,7 +73,7 @@

{{ .title | markdownify }}

-
+
{{ .content | markdownify }}
{{ if .button.enable }} @@ -102,42 +102,29 @@ {{ if $data.homepage.blog.enable }}
-
-
-
-

{{ $data.homepage.blog.title }}

-
- -
+
+

{{ $data.homepage.blog.title }}

+
+
{{ if $data.ausblick.enable }} {{ with $data.ausblick }}
-
- +
+ Angeheftet {{ .title }}
-
-
- - {{ range $index, $elements := where (where $.Site.RegularPages "Type" "author") "File.BaseFileName" "in" .author }} - {{ if ne $index 0 }}, {{ end }} - {{ if .Params.simplified }} - {{ .Title }} - {{ else }} - {{ .Title }} - {{ end }} - {{ end }} -
-
+ + + {{ partial "authors" (dict "Site" $.Site "author" .author )}} +

{{ .title }}

-

{{ .content | markdownify | plainify | truncate 100 }}

+

{{ partial "summary" .content }}

@@ -146,7 +133,7 @@ {{ end }} {{ range first (cond $data.ausblick.enable (int $data.homepage.blog.number) (add $data.homepage.blog.number 1)) (where .Site.RegularPages "Type" "post")}}
- {{ partial "card" . }} + {{ partial "card-article" . }}
{{ end }}
@@ -158,25 +145,21 @@ {{ with $data.homepage.success_banner }}
-
-
-
- {{ range .feature_item }} -
- {{ with .image }} - - {{ end }} - {{ with .icon }} - - {{ end }} -

{{ .name | markdownify }}

-
- {{ .content | markdownify }} -
-
- {{ end }} +
+ {{ range .feature_item }} +
+ {{ with .image }} + + {{ end }} + {{ with .icon }} + + {{ end }} +

{{ .name | markdownify }}

+
+ {{ .content | markdownify }}
+ {{ end }}
@@ -186,15 +169,11 @@ {{ if $data.homepage.ganztagsangebote.enable }}
-
-
-
-

{{ $data.homepage.ganztagsangebote.title }}

-
- -
+
+

{{ $data.homepage.ganztagsangebote.title }}

+
+
@@ -204,11 +183,6 @@
{{ end }}
-
-
- Alle anzeigen -
-
{{ end }} @@ -216,18 +190,14 @@ {{ if $data.homepage.cta.enable }} {{ with $data.homepage.cta }}
-
-
-
-

{{ .title | markdownify }}

-
{{ .subtitle | markdownify }}
- {{ if .button.enable }} - {{ with .button }} - {{ .label }} - {{ end }} - {{ end }} -
-
+
+

{{ .title | markdownify }}

+
{{ .subtitle | markdownify }}
+ {{ if .button.enable }} + {{ with .button }} + {{ .label }} + {{ end }} + {{ end }}
{{ end }} @@ -240,15 +210,11 @@ {{ if $data.homepage.termine.enable }}
-
-
-
-

{{ $data.homepage.termine.title }}

-
- -
+
+

{{ $data.homepage.termine.title }}

+
+
@@ -311,7 +277,7 @@
{{ range .logos }} -
+
{{ end }} diff --git a/layouts/kontakt/list.html b/layouts/kontakt/list.html index aa7eb357..3ab7b970 100644 --- a/layouts/kontakt/list.html +++ b/layouts/kontakt/list.html @@ -1,14 +1,10 @@ {{ define "main" }} - + - + -
+
@@ -48,28 +44,22 @@ crossorigin=""/>
-
-
-
-
- -
-
-
-
+ map.on('click', (e) => { + marker.bindPopup('Georg-Cantor-Gymnasium
Torstraße 13
06110 Halle (Saale)
Route').openPopup(); + }); + +
{{ end }} diff --git a/layouts/pages/single.html b/layouts/pages/single.html index 996f630f..289b95ab 100644 --- a/layouts/pages/single.html +++ b/layouts/pages/single.html @@ -2,12 +2,8 @@
-
-
-
- {{ .Content | safeHTML }} -
-
+
+ {{ .Content }}
diff --git a/layouts/partials/authors.html b/layouts/partials/authors.html new file mode 100644 index 00000000..9f1c9f22 --- /dev/null +++ b/layouts/partials/authors.html @@ -0,0 +1,8 @@ +{{ range $index, $elements := where (where .Site.RegularPages "Type" "author") "File.BaseFileName" "in" .author }} + {{ if ne $index 0 }}, {{ end }} + {{ if .Params.simplified }} + {{ .Title }} + {{ else }} + {{ .Title }} + {{ end }} +{{ end }} \ No newline at end of file diff --git a/layouts/partials/blog-sidebar.html b/layouts/partials/blog-sidebar.html index 0f6e3218..c3a026b0 100644 --- a/layouts/partials/blog-sidebar.html +++ b/layouts/partials/blog-sidebar.html @@ -1,37 +1,37 @@ -