From e6f30cd691ac9d5cccc3f8651b24bdf8f69d6b01 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 30 Aug 2020 22:25:22 +0200 Subject: [PATCH] Update --- content/german/abiturienten/1992.md | 1 + content/german/abiturienten/1993.md | 1 + content/german/abiturienten/1994.md | 1 + content/german/abiturienten/1995.md | 1 + content/german/abiturienten/1996.md | 1 + content/german/abiturienten/1997.md | 1 + content/german/abiturienten/1998.md | 1 + content/german/abiturienten/2000.md | 1 + content/german/abiturienten/2002.md | 1 + content/german/abiturienten/2003.md | 1 + content/german/abiturienten/2004.md | 1 + content/german/abiturienten/2005.md | 1 + content/german/abiturienten/2006.md | 1 + content/german/abiturienten/2007.md | 1 + content/german/abiturienten/2008.md | 1 + content/german/abiturienten/2009.md | 1 + content/german/abiturienten/2010.md | 1 + content/german/abiturienten/2011.md | 1 + content/german/abiturienten/2012.md | 1 + content/german/abiturienten/2013.md | 1 + content/german/abiturienten/2014.md | 1 + content/german/abiturienten/2016.md | 1 + content/german/abiturienten/2017.md | 1 + content/german/abiturienten/2018.md | 1 + .../german/anmeldung/anmeldung-formular.md | 4 +- data/de/homepage.yml | 8 ++- ...s_f300667da4f5b5f84e1a9e0702b2fdde.content | 6 ++ static/admin/config.yml | 29 ++++++++ .../assets/scss/templates/_homepage.scss | 7 ++ .../educenter-hugo/layouts/contact/list.html | 2 +- themes/educenter-hugo/layouts/index.html | 70 ++++++++++--------- 31 files changed, 112 insertions(+), 38 deletions(-) diff --git a/content/german/abiturienten/1992.md b/content/german/abiturienten/1992.md index fa474376..98c0f71e 100644 --- a/content/german/abiturienten/1992.md +++ b/content/german/abiturienten/1992.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 1992.png" +type: "abiturienten" --- ![Abifoto 2](/media/abiturienten/abi-foto_1992_2.jpg) diff --git a/content/german/abiturienten/1993.md b/content/german/abiturienten/1993.md index 7b2684d5..914967fe 100644 --- a/content/german/abiturienten/1993.md +++ b/content/german/abiturienten/1993.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 1993.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/1994.md b/content/german/abiturienten/1994.md index f2a6a196..f2bcdc95 100644 --- a/content/german/abiturienten/1994.md +++ b/content/german/abiturienten/1994.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 1994.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/1995.md b/content/german/abiturienten/1995.md index d78e0dd3..58adb28d 100644 --- a/content/german/abiturienten/1995.md +++ b/content/german/abiturienten/1995.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 1995.png" +type: "abiturienten" --- ![Abifoto 2](/media/abiturienten/abi-foto_1995a.png) diff --git a/content/german/abiturienten/1996.md b/content/german/abiturienten/1996.md index d79499d6..4e0efe3d 100644 --- a/content/german/abiturienten/1996.md +++ b/content/german/abiturienten/1996.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 1996.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/1997.md b/content/german/abiturienten/1997.md index 3d86279e..17edea15 100644 --- a/content/german/abiturienten/1997.md +++ b/content/german/abiturienten/1997.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 1997.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/1998.md b/content/german/abiturienten/1998.md index ba87d543..bce0a462 100644 --- a/content/german/abiturienten/1998.md +++ b/content/german/abiturienten/1998.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 1998.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/2000.md b/content/german/abiturienten/2000.md index 498aa8b9..8c14c3d5 100644 --- a/content/german/abiturienten/2000.md +++ b/content/german/abiturienten/2000.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2000.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/2002.md b/content/german/abiturienten/2002.md index 475151e2..592748c7 100644 --- a/content/german/abiturienten/2002.md +++ b/content/german/abiturienten/2002.md @@ -6,6 +6,7 @@ bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/image.png" few: true +type: "abiturienten" --- {{< gallery dir="/media/abiturienten/2002" />}}{{< load-photoswipe >}} diff --git a/content/german/abiturienten/2003.md b/content/german/abiturienten/2003.md index 002ab5a5..0aa48c08 100644 --- a/content/german/abiturienten/2003.md +++ b/content/german/abiturienten/2003.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2003.jpg" +type: "abiturienten" --- ## Klasse 13/1 diff --git a/content/german/abiturienten/2004.md b/content/german/abiturienten/2004.md index be6af685..ad7be61e 100644 --- a/content/german/abiturienten/2004.md +++ b/content/german/abiturienten/2004.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2004.jpg" +type: "abiturienten" --- ## Klasse 13/1 diff --git a/content/german/abiturienten/2005.md b/content/german/abiturienten/2005.md index 6871e52f..64bc6ad1 100644 --- a/content/german/abiturienten/2005.md +++ b/content/german/abiturienten/2005.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2005.jpg" +type: "abiturienten" --- ## Klasse 13/1 diff --git a/content/german/abiturienten/2006.md b/content/german/abiturienten/2006.md index 64b4542b..82d385e2 100644 --- a/content/german/abiturienten/2006.md +++ b/content/german/abiturienten/2006.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2006.png" +type: "abiturienten" --- ## Klasse 13/1 diff --git a/content/german/abiturienten/2007.md b/content/german/abiturienten/2007.md index e4c0271f..4199422b 100644 --- a/content/german/abiturienten/2007.md +++ b/content/german/abiturienten/2007.md @@ -6,6 +6,7 @@ bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/image.png" few: true +type: "abiturienten" --- ![Abiturienten 12](/media/abiturienten/abi-foto_2007_12.png) diff --git a/content/german/abiturienten/2008.md b/content/german/abiturienten/2008.md index 1e3e0758..dcd0536c 100644 --- a/content/german/abiturienten/2008.md +++ b/content/german/abiturienten/2008.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2008.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/2009.md b/content/german/abiturienten/2009.md index bceda30f..5ff917b4 100644 --- a/content/german/abiturienten/2009.md +++ b/content/german/abiturienten/2009.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2009.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/2010.md b/content/german/abiturienten/2010.md index cf84e546..34d10bb3 100644 --- a/content/german/abiturienten/2010.md +++ b/content/german/abiturienten/2010.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2010.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/2011.md b/content/german/abiturienten/2011.md index 53b76848..a21a9021 100644 --- a/content/german/abiturienten/2011.md +++ b/content/german/abiturienten/2011.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2011.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/2012.md b/content/german/abiturienten/2012.md index c961f2b5..d027698c 100644 --- a/content/german/abiturienten/2012.md +++ b/content/german/abiturienten/2012.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2012.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/2013.md b/content/german/abiturienten/2013.md index 96ec947d..335f50e0 100644 --- a/content/german/abiturienten/2013.md +++ b/content/german/abiturienten/2013.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2013.png" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/2014.md b/content/german/abiturienten/2014.md index b1251e76..9e4808d8 100644 --- a/content/german/abiturienten/2014.md +++ b/content/german/abiturienten/2014.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto 2014.jpg" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/2016.md b/content/german/abiturienten/2016.md index f88d0987..53525cc7 100644 --- a/content/german/abiturienten/2016.md +++ b/content/german/abiturienten/2016.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abiturienten 15_16.jpg" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/2017.md b/content/german/abiturienten/2017.md index 5f3f145c..65f78dce 100644 --- a/content/german/abiturienten/2017.md +++ b/content/german/abiturienten/2017.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/foto-abi-2017.jpg" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/abiturienten/2018.md b/content/german/abiturienten/2018.md index fe942d65..c7c515f6 100644 --- a/content/german/abiturienten/2018.md +++ b/content/german/abiturienten/2018.md @@ -5,6 +5,7 @@ draft: false bg_image: "media/backgrounds/page-title.png" # course thumbnail image: "media/abiturienten/abi-foto-2018.jpg" +type: "abiturienten" --- ## Klasse 12/1 diff --git a/content/german/anmeldung/anmeldung-formular.md b/content/german/anmeldung/anmeldung-formular.md index 572a1951..b30e9bf6 100644 --- a/content/german/anmeldung/anmeldung-formular.md +++ b/content/german/anmeldung/anmeldung-formular.md @@ -5,9 +5,9 @@ type: "anmeldung" --- Bis zum **11.02.2020** müssen: - * eine [schriftliche Anmeldung](/de/forms/anmeldeformular/) + * eine [schriftliche Anmeldung](/de/forms/anmeldeformular/) oder eine Anmeldung über das [Online-Anmeldeformular](/de/anmeldung/formular) * eine Kopie des Halbjahreszeugnisses - * die Schullaufbahnerklärung + * die Schullaufbahnerklärung am [Georg-Cantor-Gymnasium eingereicht](/de/contact) werden. diff --git a/data/de/homepage.yml b/data/de/homepage.yml index 98a3b470..e37cb6b5 100644 --- a/data/de/homepage.yml +++ b/data/de/homepage.yml @@ -77,7 +77,7 @@ slider: button: enable : true label : "Mehr erfahren" - link : "https://mint-ec.de" + link : "https://www.leistung-macht-schule.de/" # slider item loop - title : "Das Georg-Cantor-Gymnasium" @@ -123,7 +123,11 @@ about: enable : true title : "Website im Aufbau" image : "media/about/about-us.jpg" - content : "* Hier entsteht eine neue Website für das Georg-Cantor-Gymnasium in Halle(Saale). \n* Da die Wesite noch im Aufbau ist fehlen noch viele Inhalte und mehrere Bereiche. \n* **Informationen auf dieser Testwebsite können mit der Realität nicht übereinstimmen.** \n* Der Quellcode der Website ist [hier](https://github.com/lxdb/gcg-website) abrufbar. \n* Hier ist der Deployment-Status der Website sichtbar: ![.github/workflows/workflow.yml](https://github.com/eesev9ie/gcg-website/workflows/.github/workflows/workflow.yml/badge.svg) \n* Dieser Bereich wird in der Zukunft einen Kurztext über die Schule enthalten." + content : "* Hier entsteht eine neue Website für das Georg-Cantor-Gymnasium in Halle(Saale). \n + * Da die Wesite noch im Aufbau ist fehlen noch viele Inhalte und mehrere Bereiche. \n + * Der Quellcode der Website ist [hier](https://github.com/eesev9ie/gcg-website) abrufbar. \n + * Dieser Bereich wird in der Zukunft einen Kurztext über die Schule enthalten.\n + * Weitere Informationen gibt es im [passenden Blogbeitrag](/de/blog/new-site/)" button: enable : true label : "Über die Schule" diff --git a/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content index 4b016782..5122e59c 100644 --- a/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content +++ b/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content @@ -630,6 +630,8 @@ link:focus, display: inline-block; } .feature-blocks { + margin-left: 40px; + margin-right: 40px; padding-left: 70px; padding-top: 80px; padding-right: 30%; } @@ -649,6 +651,10 @@ link:focus, padding: 50px; } .feature-blocks h3 { font-size: 25px; } } + @media (max-width: 575px) { + .feature-blocks { + margin-left: 0px; + margin-right: 0px; } } /* /banner feature */ /* course */ .card-btn { diff --git a/static/admin/config.yml b/static/admin/config.yml index 2c3d4162..a41ee6ea 100644 --- a/static/admin/config.yml +++ b/static/admin/config.yml @@ -233,6 +233,35 @@ collections: - {label: "Website", name: "web_url", widget: "string"} - {label: "Type", name: "type", widget: "hidden", default: "wettbewerbe"} - {label: "Text", name: "body", widget: "markdown"} + - name: "schulchronik" + label: "Deutsch/Schulchronik" + folder: "content/german/schulchronik" + filter: {field: "type", value: "schulchronik"} + create: true + editor: + preview: false + fields: + - {label: "Titel", name: "title", widget: "string"} + - {label: "Entwurf", name: "draft", widget: "boolean", default: "false", required: false} + - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"} + - {label: "Bild", name: "image", widget: "image", default: "/media/image.png", required: false} + - {label: "Type", name: "type", widget: "hidden", default: "schulchronik"} + - {label: "Text", name: "body", widget: "markdown"} + - name: "abiturienten" + label: "Deutsch/Abiturienten" + folder: "content/german/abiturienten" + filter: {field: "type", value: "abiturienten"} + create: true + editor: + preview: false + fields: + - {label: "Titel", name: "title", widget: "string"} + - {label: "Entwurf", name: "draft", widget: "boolean", default: "false", required: false} + - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/media/backgrounds/page-title.png"} + - {label: "Bild", name: "image", widget: "image", default: "/media/image.png", required: false} + - {label: "Mehrere Bilder", name: "few", widget: "boolean", default: "false", required: false} + - {label: "Type", name: "type", widget: "hidden", default: "abiturienten"} + - {label: "Text", name: "body", widget: "markdown"} - name: "pages-de" label: "Deutsch/Seiten" editor: diff --git a/themes/educenter-hugo/assets/scss/templates/_homepage.scss b/themes/educenter-hugo/assets/scss/templates/_homepage.scss index b4cf7586..9e880f6a 100755 --- a/themes/educenter-hugo/assets/scss/templates/_homepage.scss +++ b/themes/educenter-hugo/assets/scss/templates/_homepage.scss @@ -6,6 +6,8 @@ } .feature-blocks { + margin-left: 40px; + margin-right: 40px; padding-left: 70px; padding-top: 80px; padding-right: 30%; @@ -32,6 +34,11 @@ font-size: 25px; } } + + @include mobile { + margin-left: 0px; + margin-right: 0px; + } } /* /banner feature */ diff --git a/themes/educenter-hugo/layouts/contact/list.html b/themes/educenter-hugo/layouts/contact/list.html index 4241dd6d..f2d603f1 100644 --- a/themes/educenter-hugo/layouts/contact/list.html +++ b/themes/educenter-hugo/layouts/contact/list.html @@ -10,7 +10,7 @@
-
+ diff --git a/themes/educenter-hugo/layouts/index.html b/themes/educenter-hugo/layouts/index.html index b61c964d..cb85f57f 100755 --- a/themes/educenter-hugo/layouts/index.html +++ b/themes/educenter-hugo/layouts/index.html @@ -30,37 +30,6 @@ {{ end }} - -{{ if $data.homepage.success_banner.enable }} -{{ with $data.homepage.success_banner }} -
-
-
- -
-
- {{ range .feature_item }} -
- {{ if .img }} - - {{ else }} - - {{ end }} -

{{ .name | markdownify }}

-

{{ .content | markdownify }}

-
- {{ end }} -
-
-
-
-
-{{ end }} -{{ end }} - - {{ if $data.homepage.about.enable }} {{ with $data.homepage.about }} @@ -69,10 +38,12 @@

{{ .title | markdownify }}

-

{{ .content | markdownify }}

+
+ {{ .content | markdownify }} +
{{ if .button.enable }} {{ with .button }} - {{ .label }} + {{ .label }} {{ end }} {{ end }}
@@ -88,6 +59,39 @@ {{ end }} + +{{ if $data.homepage.success_banner.enable }} +{{ with $data.homepage.success_banner }} +
+
+
+ +
+
+ {{ range .feature_item }} +
+ {{ if .img }} + + {{ else }} + + {{ end }} +

{{ .name | markdownify }}

+
+ {{ .content | markdownify }} +
+
+ {{ end }} +
+
+
+
+
+{{ end }} +{{ end }} + + {{ if $data.homepage.ganztagsangebote.enable }}