From b9a30e3175ca8da4034b036c1ed21674da7b29d6 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Wed, 5 Apr 2023 14:16:33 +0200 Subject: [PATCH] Layout-Anpassungen nach BS v5 Migration (#222) --- assets/js/script.js | 6 +- assets/scss/_common.scss | 16 ++-- assets/scss/_variables.scss | 2 +- config.yml | 2 +- content/german/chronikseiten/traditionen.md | 2 +- content/german/kontakt/_index.md | 31 ++++--- content/german/schulchronik/_index.md | 23 +++--- .../superhaufen/30-jahriges-jubilaum.md | 3 - layouts/_default/card-btn-ni.html | 2 +- layouts/_default/card-btn.html | 10 ++- layouts/_default/card-ct.html | 2 +- layouts/_default/card.html | 6 +- layouts/_default/ganztag.html | 2 +- layouts/_default/list.html | 4 +- layouts/anmeldung/list.html | 2 +- layouts/cantorfora/list.html | 2 +- layouts/forms/list.html | 4 +- layouts/forms/single.html | 9 +- layouts/index.html | 65 +++++++-------- layouts/kontakt/list.html | 43 ++++++---- layouts/partials/card-icon.html | 2 +- layouts/partials/collapsible.html | 8 ++ layouts/partials/download.html | 8 ++ layouts/partials/footer.html | 2 +- layouts/partials/head.html | 3 - layouts/partials/header.html | 12 +-- layouts/partials/modal.html | 13 +-- layouts/partials/pagination.html | 67 +++++++++++++++ layouts/partials/termin.html | 15 ++++ layouts/schulchronik/list.html | 2 +- layouts/schulchronik/single.html | 44 +++++++--- layouts/shortcodes/collapsible-lite.html | 4 - layouts/shortcodes/collapsible.html | 11 +-- layouts/shortcodes/download.html | 9 +- layouts/shortcodes/slider.html | 82 ++++++++++--------- layouts/termine/list.html | 22 ++--- 36 files changed, 308 insertions(+), 232 deletions(-) create mode 100644 layouts/partials/collapsible.html create mode 100644 layouts/partials/download.html create mode 100644 layouts/partials/pagination.html create mode 100644 layouts/partials/termin.html delete mode 100644 layouts/shortcodes/collapsible-lite.html diff --git a/assets/js/script.js b/assets/js/script.js index 24e8f1f3..0810dc37 100644 --- a/assets/js/script.js +++ b/assets/js/script.js @@ -57,7 +57,8 @@ // venobox popup $(document).ready(function () { new VenoBox({ - selector: '.vb-video' + selector: '.vb-video', + spinner: 'grid' }); new VenoBox({ selector: '.vb-gallery', @@ -76,7 +77,8 @@ new Filterizr( '.filtr-container', { - layout: 'sameWidth' + layout: 'sameWidth', + gutterPixels: 10 } ); } diff --git a/assets/scss/_common.scss b/assets/scss/_common.scss index 3797255c..ba3520e8 100644 --- a/assets/scss/_common.scss +++ b/assets/scss/_common.scss @@ -218,7 +218,6 @@ textarea.form-control { justify-content: center; .page-item { - margin: 0 10px; &.active { .page-link { @@ -228,11 +227,6 @@ textarea.form-control { } } - &:first-child .page-link, - &:last-child .page-link { - border-radius: 0; - } - .page-link { color: $text-color; } @@ -376,11 +370,6 @@ details[open] summary { } } -#wc-canvas { - width: 100%; - height: 400px; -} - .top-banner { padding-top: 160px !important; } @@ -402,4 +391,9 @@ details[open] summary { .fb-tile-icon { font-size: 96px; +} + +.wc-canvas { + width: 100%; + height: 600px; } \ No newline at end of file diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss index 80d6e45c..2c691d82 100644 --- a/assets/scss/_variables.scss +++ b/assets/scss/_variables.scss @@ -14,4 +14,4 @@ $gray: #f8f8f8; // Font Variables $primary-font: 'Fira Sans', sans-serif; $secondary-font: 'Fira Sans', sans-serif; -$icon-font: 'Material Design Icons'; +$icon-font: 'Material Design Icons'; \ No newline at end of file diff --git a/config.yml b/config.yml index 94c06074..6028923f 100644 --- a/config.yml +++ b/config.yml @@ -36,7 +36,7 @@ params: - https://assets.cantorgymnasium.de/fonts/fira/fira.css - https://assets.cantorgymnasium.de/fonts/tilt-warp/tilt-warp.css js: - - https://assets.cantorgymnasium.de/bootstrap/v5/js/bootstrap.min.js + - https://assets.cantorgymnasium.de/bootstrap/v5/js/bootstrap.bundle.min.js - https://assets.cantorgymnasium.de/slick/v1.8/slick.min.js - https://assets.cantorgymnasium.de/lazyload/v17/dist/lazyload.min.js head_js: diff --git a/content/german/chronikseiten/traditionen.md b/content/german/chronikseiten/traditionen.md index e353df94..4abd1bbf 100644 --- a/content/german/chronikseiten/traditionen.md +++ b/content/german/chronikseiten/traditionen.md @@ -12,7 +12,7 @@ aliases: Seit 1995, dem Jahr des 150. Geburtstages Georg Cantors, wird jährlich ein herausragender Schüler bzw. eine herausragende Schülerin mit dem Cantorpreis geehrt. Die Preisträger erhalten einen vom Förderverein des Georg-Cantor-Gymnasiums gestifteten Zinnbecher mit Motiven der Stadt Halle und 150€ Preisgeld. Mit diesem Preis werden Schüler für besondere Leistungen und Engagement für unsere Schule ausgezeichnet. In den einzelnen Jahren unser Chronik werden die Cantorpreisträger vorgestellt -{{< image src="/media/about/cantorpreis.webp" >}} +{{< image src="/media/schulchronik/1995/cantorpreis.webp" >}} ## 2. Die Kultur- und Wissenschaftswoche diff --git a/content/german/kontakt/_index.md b/content/german/kontakt/_index.md index 2c8f6b6f..c44b387f 100644 --- a/content/german/kontakt/_index.md +++ b/content/german/kontakt/_index.md @@ -2,18 +2,27 @@ title: Kontakt draft: false bg_image: media/backgrounds/page-title.webp -description: Eine Nachricht schreiben. +description: Wenn Sie noch weitere Fragen haben, können Sie hier eine Nachricht an die Schulleitung schreiben. +kontaktdaten: + - name: Herr OStD Dr. Bernd Gorsler + position: Schulleiter + email: gorsler@cantor-gymnasium.de + - name: Frau StD Claudia Schapitz + position: stellv. Schulleiterin + email: schapitz@cantor-gymnasium.de + - name: Herr Dr. Andreas Koch + position: Oberstufenkoordinator + email: koch@cantor-gymnasium.de + - name: Herr Falko Plinke + position: Koordinator für Planung + email: plinke@cantor-gymnasium.de + - name: Frau Gabriele Felke + position: Koordinatorin für den inhaltlichen Schwerpunkt + email: felke@cantor-gymnasium.de + - name: Frau S. Kretzschmar / Frau J.-M. Jaschak + position: Sekretariat + email: schulleitung@cantor-gymnasium.de --- -Wenn Sie noch weitere Fragen haben, können Sie hier eine Nachricht an die Schulleitung schreiben. - -| | | | -|---|---|---| -|Schulleiter|Herr OStD Dr. Bernd Gorsler|[gorsler(at)cantor-gymnasium.de](mailto:gorsler@cantor-gymnasium.de)| -|stellv. Schulleiterin|Frau StD Claudia Schapitz|[schapitz(at)cantor-gymnasium.de](mailto:schapitz@cantor-gymnasium.de)| -|Oberstufenkoordinator|Herr Dr. Andreas Koch|[koch(at)cantor-gymnasium.de](mailto:koch@cantor-gymnasium.de)| -|Koordinator für Planung|Herr Falko Plinke|[plinke(at)cantor-gymnasium.de](mailto:plinke@cantor-gymnasium.de)| -|Koordinatorin für den inhaltlichen Schwerpunkt|Frau Gabriele Felke|[felke(at)cantor-gymnasium.de](mailto:felke@cantor-gymnasium.de)| -|Sekretariat|Frau S. Kretzschmar / Frau J.-M. Jaschak|[schulleitung(at)cantor-gymnasium.de](mailto:schulleitung@cantor-gymnasium.de), Tel.: [+49-0345/6903156](tel:+493456903156), Fax.: [+49-0345/6903157](tel:+493456903157)| diff --git a/content/german/schulchronik/_index.md b/content/german/schulchronik/_index.md index fb058037..a3f47b22 100644 --- a/content/german/schulchronik/_index.md +++ b/content/german/schulchronik/_index.md @@ -13,18 +13,19 @@ analogen Schulchronik gesammelt sind. Seit 2011 sind wir vom Digitalisierungswah befallen und haben eine eigene Homepage erstellt, die als Teil der Schulhomepage jedem Interessierten die wechselvolle Geschichte des GCG präsentiert. ---- -
-
- +
+
+
+ ... +
+
+
+

"Aus dem Paradies, das Cantor uns geschaffen, soll uns niemand vertreiben können."

+

aus 'David Hilbert, Über das Unendliche', Math. Ann. 95

+
+
+
-
-

"Aus dem Paradies, das Cantor uns geschaffen, soll uns niemand vertreiben können."

-aus 'David Hilbert, Über das Unendliche', Math. Ann. 95 -
-
- ---- ## Statistische Daten diff --git a/content/german/superhaufen/30-jahriges-jubilaum.md b/content/german/superhaufen/30-jahriges-jubilaum.md index ce5ff43e..c3a40f59 100644 --- a/content/german/superhaufen/30-jahriges-jubilaum.md +++ b/content/german/superhaufen/30-jahriges-jubilaum.md @@ -306,9 +306,6 @@ tiles: bg_color: "#0051e5" icon: mdi mdi-all-inclusive content: > - ## **Flashmob** - - Unser geliebtes Gymnasium feierte im Jahr 2018 sein 30-jähriges Jubiläum. Nach reichlicher Überlegung kam unserem Schuldirektor Herrn Gorsler diff --git a/layouts/_default/card-btn-ni.html b/layouts/_default/card-btn-ni.html index 4eb96dd0..39f6ddc1 100644 --- a/layouts/_default/card-btn-ni.html +++ b/layouts/_default/card-btn-ni.html @@ -1,6 +1,6 @@
-

{{ .Title | truncate 30 }}

+

{{ .Title }}

{{ i18n "show_more"}}
diff --git a/layouts/_default/card-btn.html b/layouts/_default/card-btn.html index d665bacc..2438357e 100644 --- a/layouts/_default/card-btn.html +++ b/layouts/_default/card-btn.html @@ -1,7 +1,9 @@
- {{ .Title }} -
-

{{ .Title }}

- {{ i18n "read_more"}} + {{ .Title }} +
+

{{ .Title }}

+ {{ i18n + "read_more"}}
\ No newline at end of file diff --git a/layouts/_default/card-ct.html b/layouts/_default/card-ct.html index bbf30b21..90ba9688 100644 --- a/layouts/_default/card-ct.html +++ b/layouts/_default/card-ct.html @@ -2,7 +2,7 @@ {{ .Title }}
{{ .Params.category }}
-

{{ .Title | truncate 30 }}

+

{{ .Title }}

{{ i18n "read_more"}}
diff --git a/layouts/_default/card.html b/layouts/_default/card.html index aa0dc25d..d0ebdae9 100644 --- a/layouts/_default/card.html +++ b/layouts/_default/card.html @@ -1,6 +1,6 @@
{{ .Title }} -
+
{{ time.Format "02. Jan 2006" .PublishDate }}
@@ -8,8 +8,8 @@ {{ .Params.author | title }}
-

{{ .Title | truncate 30 }}

+

{{ .Title }}

{{ .Summary | truncate 100 }}

- {{ i18n "read_more" }} + {{ i18n "read_more" }}
diff --git a/layouts/_default/ganztag.html b/layouts/_default/ganztag.html index 52d7cd2c..60a88f20 100644 --- a/layouts/_default/ganztag.html +++ b/layouts/_default/ganztag.html @@ -5,7 +5,7 @@
{{ .Params.schedule }}
{{ .Params.class }}
-

{{ .Title | truncate 20 }}

+

{{ .Title }}

{{ i18n "show_more"}}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 5748c498..428543b7 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -7,12 +7,12 @@
{{ $paginator := .Paginate ( where .Data.Pages "Type" "post") }} {{ range $paginator.Pages }} -
+
{{ .Render "card" }}
{{ end }}
- {{ template "_internal/pagination.html" . }} + {{ partial "pagination" . }}
diff --git a/layouts/anmeldung/list.html b/layouts/anmeldung/list.html index 43bd181d..046ce3d1 100644 --- a/layouts/anmeldung/list.html +++ b/layouts/anmeldung/list.html @@ -9,7 +9,7 @@
{{ range .Params.elements }} -
+

{{ .title }}

diff --git a/layouts/cantorfora/list.html b/layouts/cantorfora/list.html index 7697b3d2..ab604303 100644 --- a/layouts/cantorfora/list.html +++ b/layouts/cantorfora/list.html @@ -13,7 +13,7 @@
{{ range sort .Data.Pages ".Params.index" }} -
+
{{ .Render "card-btn" }}
{{ end }} diff --git a/layouts/forms/list.html b/layouts/forms/list.html index 76a99f5c..507542cf 100644 --- a/layouts/forms/list.html +++ b/layouts/forms/list.html @@ -6,9 +6,9 @@
{{ range .Data.Pages }} -
+
- {{ .Title }} + {{ .Title }}

{{ .Summary | truncate 100 }}

{{ i18n "read_more"}}
diff --git a/layouts/forms/single.html b/layouts/forms/single.html index 7ca60046..3cd303da 100644 --- a/layouts/forms/single.html +++ b/layouts/forms/single.html @@ -10,14 +10,7 @@
{{ range .Params.files }} -
-
-
-

{{ .title }}

- Download -
-
-
+ {{ partial "download" . }} {{ end }} {{ .Content }}
diff --git a/layouts/index.html b/layouts/index.html index a156b10f..95a34c27 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -104,29 +104,40 @@
-

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

+
+

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

+
+ +
-
-
- {{ $data.ausblick.title }} -
- -

{{ $data.ausblick.title }}

-

{{ $data.ausblick.content | truncate 100 }}

-
{{ range first 2 (where .Site.RegularPages "Type" "post")}} -
+
{{ .Render "card" }} -
+
{{ end }}
@@ -217,7 +228,7 @@ {{ end }} {{ if $data.homepage.termine.enable }} -
+
@@ -242,27 +253,7 @@ {{ end }} {{ range first 3 $events }} -
  • -
    - {{ time.Format "2" .date}} - {{ time.Format "Jan 2006" .date}} - {{ with .enddate }} -
    - bis {{ time.Format "2 Jan 2006" . }} - {{ end }} -
    -
    -

    {{ .title }}

    -
    - {{ with .location }} -
    -

    - - {{ . | markdownify }} -

    -
    - {{ end }} -
    • + {{ partial "termin" . }} {{ end }} {{ end }} @@ -308,7 +299,7 @@ {{ with $data.homepage.footer_logos }}
    -
    +
    {{ range .logos }}
    diff --git a/layouts/kontakt/list.html b/layouts/kontakt/list.html index f7e94879..97a27ff0 100644 --- a/layouts/kontakt/list.html +++ b/layouts/kontakt/list.html @@ -8,14 +8,6 @@ crossorigin=""/> integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==" crossorigin=""> - -
    @@ -25,15 +17,32 @@ crossorigin=""/> - - - - + + + +
    -
    - {{ .Content }} +
    +
    +
    + Kontaktdaten +
    + +
    @@ -41,8 +50,10 @@ crossorigin=""/>
    -
    - +
    +
    + +
    diff --git a/layouts/partials/card-icon.html b/layouts/partials/card-icon.html index e1fc2779..33e0ce16 100644 --- a/layouts/partials/card-icon.html +++ b/layouts/partials/card-icon.html @@ -3,7 +3,7 @@
    -

    {{ .title | truncate 55 }}

    +

    {{ .title }}

    diff --git a/layouts/partials/collapsible.html b/layouts/partials/collapsible.html new file mode 100644 index 00000000..fb6959cf --- /dev/null +++ b/layouts/partials/collapsible.html @@ -0,0 +1,8 @@ +
    +
    +
    + {{ .title }} +
    {{ .content | markdownify }}
    +
    +
    +
    \ No newline at end of file diff --git a/layouts/partials/download.html b/layouts/partials/download.html new file mode 100644 index 00000000..731ce0b0 --- /dev/null +++ b/layouts/partials/download.html @@ -0,0 +1,8 @@ +
    +
    +
    +

    {{ .title }}

    + Download +
    +
    +
    \ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 4315ac45..acf4b5d0 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -34,7 +34,7 @@ {{ end }}
    -
    +

    Aktuelles

      {{ range first 5 (where .Site.RegularPages "Type" "post")}} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index fae7f3ce..17ceb2a5 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -37,8 +37,6 @@ {{ end }} - - - {{ partial "opengraph" . }} {{ partial "twitter" . }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 1585acc2..e3160c9a 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -33,7 +33,7 @@ {{ .Site.Title }} - @@ -46,17 +46,17 @@ {{ range .Site.Menus.main }} {{ if .HasChildren }}
    • - + {{ .Name }} -
      +
      +
    {{ else }}
  • diff --git a/layouts/partials/modal.html b/layouts/partials/modal.html index 2ef8b07d..31f7946b 100644 --- a/layouts/partials/modal.html +++ b/layouts/partials/modal.html @@ -10,17 +10,8 @@ {{ .content | markdownify }}
    • {{ range .unterhaufen }} -
    -
    -
    -
    - {{ .title }} -

    {{ .content | markdownify }}

    -
    -
    -
    -
    - {{ end }} + {{ partial "collapsible" . }} + {{ end }}
    diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html new file mode 100644 index 00000000..1f456781 --- /dev/null +++ b/layouts/partials/pagination.html @@ -0,0 +1,67 @@ +{{ $paginator := .Paginator }} +{{ $adjacent_links := 2 }} +{{ $max_links := (add (mul $adjacent_links 2) 1) }} +{{ $lower_limit := (add $adjacent_links 1) }} +{{ $upper_limit := (sub $paginator.TotalPages $adjacent_links) }} +{{ if gt $paginator.TotalPages 1 }} + + +{{ end }} \ No newline at end of file diff --git a/layouts/partials/termin.html b/layouts/partials/termin.html new file mode 100644 index 00000000..cc79858e --- /dev/null +++ b/layouts/partials/termin.html @@ -0,0 +1,15 @@ +
    +
    + {{ time.Format "2" .date}} + {{ time.Format "Jan 2006" .date}} + {{ with .enddate }}
    bis {{ time.Format "2 Jan 2006" . }}{{ end }} +
    +
    +

    {{ .title }}

    +
    + {{ with .location }} +
    +

    {{ . | markdownify }}

    +
    + {{ end }} +
    \ No newline at end of file diff --git a/layouts/schulchronik/list.html b/layouts/schulchronik/list.html index fbfc01b8..1f363d37 100644 --- a/layouts/schulchronik/list.html +++ b/layouts/schulchronik/list.html @@ -7,7 +7,7 @@
    {{ range (where .Data.Pages "Params.type" "schulchronik") }} -
    +
    {{ .Render "card-btn-ni" }}
    {{ end }} diff --git a/layouts/schulchronik/single.html b/layouts/schulchronik/single.html index 21c17ba4..520ffd48 100644 --- a/layouts/schulchronik/single.html +++ b/layouts/schulchronik/single.html @@ -4,21 +4,41 @@
    - {{ if .Params.Cantorpreisträger }} + {{ if or .Params.Cantorpreisträger (where (where .Site.RegularPages "Title" (print "Abiturienten " .Params.Title ) ) "Type" "=" "abiturienten") }}
    -

    {{ i18n "cantorpreisträger" }}

    - {{ range where (where .Site.RegularPages "Title" .Params.Title ) "Type" "=" "cantorpreis" }} -
    -
    - {{ .Title }} -
    -

    {{ .Params.Name }}

    - {{ .Description }} +
    + {{ 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 }}
    - {{ end }} -
    {{ end }} {{ range .Params.topics }} @@ -27,7 +47,7 @@ {{ if and .Params.pretext (ne .Params.pretext "\n\n\n") }} {{ partial "modal" (dict "title" .Title "content" .Params.pretext) }} {{ end }} -
    +
    {{ $topics := slice }} {{ if .Params.pretext }} {{ $topics = $topics | append (slice (slice .Params.Title 200 (md5 .Title))) }} diff --git a/layouts/shortcodes/collapsible-lite.html b/layouts/shortcodes/collapsible-lite.html deleted file mode 100644 index e8240fbb..00000000 --- a/layouts/shortcodes/collapsible-lite.html +++ /dev/null @@ -1,4 +0,0 @@ -
    -{{ .Get "title" }} -

    {{ .Inner }}

    -
    diff --git a/layouts/shortcodes/collapsible.html b/layouts/shortcodes/collapsible.html index bebcfb0d..c5712462 100644 --- a/layouts/shortcodes/collapsible.html +++ b/layouts/shortcodes/collapsible.html @@ -1,10 +1 @@ -
    -
    -
    -
    - {{ .Get "title" }} -

    {{ .Inner }}

    -
    -
    -
    -
    +{{ partial "collapsible" (dict "title" (.Get "title") "content" .Inner )}} \ No newline at end of file diff --git a/layouts/shortcodes/download.html b/layouts/shortcodes/download.html index 72cbccf9..401622ad 100644 --- a/layouts/shortcodes/download.html +++ b/layouts/shortcodes/download.html @@ -1,8 +1 @@ -
    -
    -
    -

    {{ .Get "title" }}

    - Download -
    -
    -
    +{{ partial "download" (dict "link" (.Get "link") "title" (.Get "title"))}} \ No newline at end of file diff --git a/layouts/shortcodes/slider.html b/layouts/shortcodes/slider.html index bf1c517c..9c4004dc 100644 --- a/layouts/shortcodes/slider.html +++ b/layouts/shortcodes/slider.html @@ -1,44 +1,46 @@ -