From 18a823cb6a76fa4fbdd74bae2b0c3a12488ea0f2 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Mon, 24 Jul 2023 12:02:51 +0200 Subject: [PATCH 1/3] cleanup templates: - move out shared functions to shared templates - remove useless classes - simplify - various cleanups & enhancements --- assets/css/style.css | 18 +++ layouts/_default/list.html | 2 +- layouts/_default/single.html | 47 +++----- layouts/abiturienten/list.html | 4 +- layouts/abiturienten/single.html | 10 +- layouts/about/list.html | 14 +-- layouts/alumninetzwerk/list.html | 163 +++++++++++++-------------- layouts/anmeldung/list.html | 6 +- layouts/author/list.html | 45 ++++---- layouts/author/single.html | 32 ++---- layouts/begabte/list.html | 11 +- layouts/begabte/single.html | 18 +-- layouts/cantorfora/list.html | 18 +-- layouts/cantorfora/single.html | 10 +- layouts/cantorpreis/list.html | 6 +- layouts/cantorpreis/single.html | 8 +- layouts/forms/list.html | 20 ++-- layouts/forms/single.html | 18 +-- layouts/ganztagsangebote/list.html | 14 +-- layouts/ganztagsangebote/single.html | 3 +- layouts/index.html | 11 +- layouts/kontakt/list.html | 28 ++--- layouts/partials/authors.html | 8 ++ layouts/partials/blog-sidebar.html | 16 +-- layouts/partials/card-btn-ni.html | 12 +- layouts/partials/card-btn.html | 14 ++- layouts/partials/card-icon.html | 9 -- layouts/partials/card.html | 19 +--- layouts/partials/related.html | 2 + layouts/partials/summary.html | 1 + layouts/partials/tile-modals.html | 27 +++++ layouts/projektwoche/list.html | 4 +- layouts/projektwoche/single.html | 20 +--- layouts/schulchronik/list.html | 6 +- layouts/schulchronik/single.html | 22 ++-- layouts/superhaufen/single.html | 20 +--- layouts/wettbewerbe/single.html | 5 +- 37 files changed, 298 insertions(+), 393 deletions(-) create mode 100644 layouts/partials/authors.html delete mode 100644 layouts/partials/card-icon.html create mode 100644 layouts/partials/related.html create mode 100644 layouts/partials/summary.html create mode 100644 layouts/partials/tile-modals.html diff --git a/assets/css/style.css b/assets/css/style.css index ea3e9c9f..9b709b1b 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; @@ -976,3 +982,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/_default/list.html b/layouts/_default/list.html index 037e1350..b2a001ca 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -3,7 +3,7 @@
-
+
{{ $paginator := .Paginate ( where .Data.Pages "Type" "post") }} {{ range $paginator.Pages }} 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..c0b5af98 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/anmeldung/list.html b/layouts/anmeldung/list.html index fa7e6543..25ea17f1 100644 --- a/layouts/anmeldung/list.html +++ b/layouts/anmeldung/list.html @@ -2,10 +2,8 @@
-
-
- {{ .Content }} -
+
+ {{ .Content }}
{{ range .Params.elements }} 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..f6a27829 100644 --- a/layouts/author/single.html +++ b/layouts/author/single.html @@ -2,43 +2,31 @@
-
-
-
- {{ 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" . }}
{{ 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..77fd36c5 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-cl-url" . }}
-
-
-

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..462c19b7 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..5fdf0301 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..454e1793 100644 --- a/layouts/ganztagsangebote/single.html +++ b/layouts/ganztagsangebote/single.html @@ -69,8 +69,7 @@
- {{ $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..11db97f4 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -126,18 +126,11 @@
- {{ 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 }}

diff --git a/layouts/kontakt/list.html b/layouts/kontakt/list.html index aa7eb357..4d1844ae 100644 --- a/layouts/kontakt/list.html +++ b/layouts/kontakt/list.html @@ -51,22 +51,24 @@ crossorigin=""/>
-
- + map.on('click', (e) => { + marker.bindPopup('Georg-Cantor-Gymnasium
Torstraße 13
06110 Halle (Saale)
Route').openPopup(); + }); + +
diff --git a/layouts/partials/authors.html b/layouts/partials/authors.html new file mode 100644 index 00000000..df404707 --- /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..26487cbd 100644 --- a/layouts/partials/blog-sidebar.html +++ b/layouts/partials/blog-sidebar.html @@ -1,14 +1,14 @@ -
@@ -16,11 +16,11 @@

Tags

{{- if isset .Site.Taxonomies "tags" }} {{- if not (eq (len .Site.Taxonomies.tags) 0) }} - +
{{- end }} {{- end }}
@@ -31,7 +31,7 @@
-
{{ .Title }}
+
{{ .Title }}
 {{ time.Format "02. Jan 2006" .PublishDate }}
diff --git a/layouts/partials/card-btn-ni.html b/layouts/partials/card-btn-ni.html index 8a9aeb5e..d28697ce 100644 --- a/layouts/partials/card-btn-ni.html +++ b/layouts/partials/card-btn-ni.html @@ -1,7 +1,9 @@ -
-
-

{{ .title }}

- Mehr anzeigen -
+
+
+
+

{{ .title }}

+ Mehr anzeigen +
+
\ No newline at end of file diff --git a/layouts/partials/card-btn.html b/layouts/partials/card-btn.html index d5924918..c133e8bf 100644 --- a/layouts/partials/card-btn.html +++ b/layouts/partials/card-btn.html @@ -1,8 +1,10 @@ -
- {{ .Title }} -
-

{{ .Title }}

- Mehr anzeigen +
+
+ {{ .Title }} +
+

{{ .Title }}

+ Mehr anzeigen +
\ No newline at end of file diff --git a/layouts/partials/card-icon.html b/layouts/partials/card-icon.html deleted file mode 100644 index 2250ac13..00000000 --- a/layouts/partials/card-icon.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
- -
-
-

{{ .title }}

- -
-
\ No newline at end of file diff --git a/layouts/partials/card.html b/layouts/partials/card.html index c6ad5504..e4cd2afd 100644 --- a/layouts/partials/card.html +++ b/layouts/partials/card.html @@ -1,22 +1,15 @@
{{ .Title }}
-
-
{{ time.Format "02. Jan 2006" .PublishDate }}
-
+
+ {{ time.Format "02. Jan 2006" .PublishDate }} + - {{ 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 }} -
+ {{ partial "authors" (dict "Site" .Site "author" .Params.author )}} +

{{ .Title }}

-

{{ .Summary | truncate 100 }}

+

{{ partial "summary" .Summary }}

Mehr anzeigen
diff --git a/layouts/partials/related.html b/layouts/partials/related.html new file mode 100644 index 00000000..6d16a26e --- /dev/null +++ b/layouts/partials/related.html @@ -0,0 +1,2 @@ +{{ $related := (where .Site.RegularPages "Type" .Type) | intersect (where .Site.Pages ".Title" "!=" .Title) | union (.Site.RegularPages.Related . ) | shuffle | first 3 }} +{{ return $related }} \ No newline at end of file diff --git a/layouts/partials/summary.html b/layouts/partials/summary.html new file mode 100644 index 00000000..b7078d58 --- /dev/null +++ b/layouts/partials/summary.html @@ -0,0 +1 @@ +{{ . | markdownify | plainify | truncate 100 }} \ No newline at end of file diff --git a/layouts/partials/tile-modals.html b/layouts/partials/tile-modals.html new file mode 100644 index 00000000..5564531b --- /dev/null +++ b/layouts/partials/tile-modals.html @@ -0,0 +1,27 @@ +
+
+
+
+ {{ .Content }} +
+
+
+
+
+ {{ range .Params.tiles }} + {{ partial "modal" . }} +
+
+
+ +
+
+

{{ .title }}

+ +
+
+
+ {{ end }} +
+
+
\ No newline at end of file diff --git a/layouts/projektwoche/list.html b/layouts/projektwoche/list.html index 316e2e7f..c20a24f9 100644 --- a/layouts/projektwoche/list.html +++ b/layouts/projektwoche/list.html @@ -4,9 +4,7 @@
{{ range .Pages }} -
- {{ partial "card-btn-ni" (dict "title" .Title "link" .Permalink) }} -
+ {{ partial "card-btn-ni" (dict "title" .Title "link" .Permalink) }} {{ end }}
diff --git a/layouts/projektwoche/single.html b/layouts/projektwoche/single.html index 645d29d6..a50442c2 100644 --- a/layouts/projektwoche/single.html +++ b/layouts/projektwoche/single.html @@ -1,23 +1,5 @@ {{ define "main" }} -
-
-
-
- {{ .Content }} -
-
-
-
-
- {{ range .Params.tiles }} - {{ partial "modal" . }} -
- {{ partial "card-icon" . }} -
- {{ end }} -
-
-
+{{ partial "tile-modals" . }} {{ end }} \ No newline at end of file diff --git a/layouts/schulchronik/list.html b/layouts/schulchronik/list.html index 816d58e9..8a8d4c22 100644 --- a/layouts/schulchronik/list.html +++ b/layouts/schulchronik/list.html @@ -27,9 +27,7 @@

Informationsseiten

{{ range .Params.links }} -
- {{ partial "card-btn-ni" . }} -
+ {{ partial "card-btn-ni" . }} {{ end }}
@@ -37,9 +35,7 @@

Chronik

{{ range (where .Data.Pages "Params.type" "schulchronik") }} -
{{ partial "card-btn-ni" (dict "title" .Title "link" .Permalink) }} -
{{ end }}
diff --git a/layouts/schulchronik/single.html b/layouts/schulchronik/single.html index 395bc71c..0bf18f03 100644 --- a/layouts/schulchronik/single.html +++ b/layouts/schulchronik/single.html @@ -4,38 +4,34 @@
- {{ if or .Params.Cantorpreisträger (where (where .Site.RegularPages "Title" (print "Abiturienten " .Params.Title ) ) "Type" "=" "abiturienten") }} + {{ if or .Params.cantorpreisträger (where (where .Site.RegularPages "Title" (print "Abiturienten " .Params.Title ) ) "Type" "=" "abiturienten") }}
{{ range where (where .Site.RegularPages "Title" .Params.Title ) "Type" "=" "cantorpreis" }} -
-
-
- +
+
+
-
+

Cantorpreisträger:in

{{ .Params.name }}
-
{{ end }} {{ range where (where .Site.RegularPages "Title" (print "Abiturienten " .Params.Title ) ) "Type" "=" "abiturienten" }} -
-
-
+
+

{{ .Title }}

 {{ $abiturdurchschnitte := getJSON "static/data/abiturdurchschnitte.json" }} {{ range $abiturdurchschnitte.abiturdurchschnitte }} {{ if eq (string (index . "jahr")) "2008" }}

Abiturdurchschnitt: {{ .schnitt }}

{{ end }} {{ end }}
-
+ -
{{ end }}
diff --git a/layouts/superhaufen/single.html b/layouts/superhaufen/single.html index 478ab11d..a50442c2 100644 --- a/layouts/superhaufen/single.html +++ b/layouts/superhaufen/single.html @@ -1,23 +1,5 @@ {{ define "main" }} -
-
-
-
- {{ .Content }} -
-
-
-
-
- {{ range .Params.tiles }} - {{ partial "modal" . }} -
- {{ partial "card-icon" . }} -
- {{ end }} -
-
-
+{{ partial "tile-modals" . }} {{ end }} \ No newline at end of file diff --git a/layouts/wettbewerbe/single.html b/layouts/wettbewerbe/single.html index d6f40b0d..66cd9bda 100644 --- a/layouts/wettbewerbe/single.html +++ b/layouts/wettbewerbe/single.html @@ -1,6 +1,6 @@ {{ define "main" }} -{{ partial "header-cl-url" (dict "Params" .Params "Content" .Content) }} +{{ partial "header-cl-url" . }}
@@ -10,8 +10,7 @@
- {{ $related := (where .Site.RegularPages "Type" "wettbewerbe") | intersect (where .Site.Pages ".Title" "!=" .Title) | union (.Site.RegularPages.Related . ) | shuffle | first 3}} - {{ range first 3 $related }} + {{ range partial "related" 3 }}
{{ partial "card-category" . }}
From 93fb7f1b1a2055d74c8cf993781546e7349da4cd Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 29 Jul 2023 13:16:25 +0200 Subject: [PATCH 2/3] WIP --- assets/css/style.css | 8 +- layouts/404.html | 10 +- layouts/_default/list.html | 2 +- layouts/abiturienten/single.html | 2 +- layouts/anmeldeformular/list.html | 2 +- layouts/anmeldung/list.html | 4 +- layouts/author/single.html | 2 +- layouts/begabte/single.html | 2 +- layouts/cantorfora/list.html | 2 +- layouts/cantorpreis/single.html | 2 +- layouts/ganztagsangebote/single.html | 68 ++------ layouts/index.html | 28 +-- layouts/kontakt/list.html | 46 ++--- layouts/pages/single.html | 8 +- layouts/partials/authors.html | 4 +- layouts/partials/blog-sidebar.html | 34 ++-- .../partials/{card.html => card-article.html} | 2 +- layouts/partials/card-btn-ni.html | 9 - layouts/partials/card-btn.html | 10 +- layouts/partials/card-category.html | 6 +- layouts/partials/collapsible.html | 14 +- layouts/partials/download.html | 14 +- layouts/partials/filter-controls.html | 31 ++-- layouts/partials/footer.html | 24 +-- layouts/partials/ganztag.html | 8 +- layouts/partials/header-cl-url.html | 35 ---- layouts/partials/header-contest.html | 23 +++ layouts/partials/icon-element.html | 9 + layouts/partials/info.html | 4 +- layouts/partials/modal.html | 2 +- layouts/partials/termin.html | 22 ++- layouts/partials/tile-modals.html | 20 +-- layouts/projektwoche/list.html | 2 +- layouts/schulchronik/list.html | 4 +- layouts/schulchronik/single.html | 165 +++++++++--------- layouts/shortcodes/audio.html | 2 +- layouts/shortcodes/card.html | 10 +- layouts/wettbewerbe/list.html | 5 +- layouts/wettbewerbe/single.html | 10 +- 39 files changed, 274 insertions(+), 381 deletions(-) rename layouts/partials/{card.html => card-article.html} (93%) delete mode 100644 layouts/partials/card-btn-ni.html delete mode 100644 layouts/partials/header-cl-url.html create mode 100644 layouts/partials/header-contest.html create mode 100644 layouts/partials/icon-element.html diff --git a/assets/css/style.css b/assets/css/style.css index 9b709b1b..e14f34d8 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -537,7 +537,7 @@ details[open] summary { .intro-video .play-btn { position: absolute; top: 50%; - left: 0; + left: calc(50% - 40px); transform: translateY(-50%); } @@ -914,12 +914,6 @@ link:focus, } } -@media (min-width: 768px) { - .termin-tc { - width: 25%; - } -} - @media (max-width: 991px) { .navigation { background: var(--gcg-color-secondary); 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 b2a001ca..27b9b674 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -8,7 +8,7 @@ {{ $paginator := .Paginate ( where .Data.Pages "Type" "post") }} {{ range $paginator.Pages }}
- {{ partial "card" . }} + {{ partial "card-article" . }}
{{ end }}
diff --git a/layouts/abiturienten/single.html b/layouts/abiturienten/single.html index c0b5af98..771c4a4b 100644 --- a/layouts/abiturienten/single.html +++ b/layouts/abiturienten/single.html @@ -3,7 +3,7 @@
-
+
{{ .Content }}
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 25ea17f1..dbe29120 100644 --- a/layouts/anmeldung/list.html +++ b/layouts/anmeldung/list.html @@ -2,7 +2,7 @@
-
+
{{ .Content }}
@@ -11,7 +11,7 @@

{{ .title }}

-
{{ .content | markdownify }}
+
{{ .content | markdownify }}
diff --git a/layouts/author/single.html b/layouts/author/single.html index f6a27829..620871f7 100644 --- a/layouts/author/single.html +++ b/layouts/author/single.html @@ -27,7 +27,7 @@
{{ range where .Site.RegularPages "Params.author" "intersect" (slice .File.BaseFileName) }}
- {{ partial "card" . }} + {{ partial "card-article" . }}
{{ end }}
diff --git a/layouts/begabte/single.html b/layouts/begabte/single.html index 77fd36c5..d81be7c8 100644 --- a/layouts/begabte/single.html +++ b/layouts/begabte/single.html @@ -1,6 +1,6 @@ {{ define "main" }} -{{ partial "header-cl-url" . }} +{{ partial "header-contest" . }}
diff --git a/layouts/cantorfora/list.html b/layouts/cantorfora/list.html index 462c19b7..1d790896 100644 --- a/layouts/cantorfora/list.html +++ b/layouts/cantorfora/list.html @@ -2,7 +2,7 @@
-
+
{{ .Content }}
diff --git a/layouts/cantorpreis/single.html b/layouts/cantorpreis/single.html index 5fdf0301..5e00df8e 100644 --- a/layouts/cantorpreis/single.html +++ b/layouts/cantorpreis/single.html @@ -9,7 +9,7 @@

{{ .Params.Name }}

{{ .Title }}
-
+
{{ .Content }}
diff --git a/layouts/ganztagsangebote/single.html b/layouts/ganztagsangebote/single.html index 454e1793..b00918f6 100644 --- a/layouts/ganztagsangebote/single.html +++ b/layouts/ganztagsangebote/single.html @@ -2,72 +2,24 @@
-
-
- -
+ +

{{ .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

{{ range partial "related" . }}
diff --git a/layouts/index.html b/layouts/index.html index 11db97f4..b3c3617d 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 }} +
+
@@ -73,7 +73,7 @@

{{ .title | markdownify }}

-
+
{{ .content | markdownify }}
{{ if .button.enable }} @@ -139,7 +139,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 }}
diff --git a/layouts/kontakt/list.html b/layouts/kontakt/list.html index 4d1844ae..3ab7b970 100644 --- a/layouts/kontakt/list.html +++ b/layouts/kontakt/list.html @@ -1,14 +1,10 @@ {{ define "main" }} - + - + -
+
@@ -48,30 +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 index df404707..9f1c9f22 100644 --- a/layouts/partials/authors.html +++ b/layouts/partials/authors.html @@ -1,8 +1,8 @@ {{ range $index, $elements := where (where .Site.RegularPages "Type" "author") "File.BaseFileName" "in" .author }} {{ if ne $index 0 }}, {{ end }} {{ if .Params.simplified }} - {{ .Title }} + {{ .Title }} {{ else }} - {{ .Title }} + {{ .Title }} {{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/partials/blog-sidebar.html b/layouts/partials/blog-sidebar.html index 26487cbd..c3a026b0 100644 --- a/layouts/partials/blog-sidebar.html +++ b/layouts/partials/blog-sidebar.html @@ -1,37 +1,37 @@