diff --git a/config.toml b/config.toml index 5d17f18..c6ae12f 100755 --- a/config.toml +++ b/config.toml @@ -70,7 +70,7 @@ hasChildren = true [[menu.main]] parent = "Schule" - name = "(UMSTRITTEN)Lehrer und AG-Leiter" + name = "Lehrer und AG-Leiter" URL = "teacher" weight = 4 @@ -86,6 +86,12 @@ hasChildren = true URL = "cantorpreis" weight = 6 + [[menu.main]] + parent = "Schule" + name = "Anmeldung" + URL = "anmeldung" + weight = 7 + [[menu.main]] weight = 2 name = "Digitale Angebote" @@ -156,6 +162,7 @@ description = "This is meta description" author = "Themefisher" # contact info address = "Georg-Canot-Gymnasium Halle, Torstraße 13, 06110 Halle(Saale)" +route_link = "https://maps.openrouteservice.org/directions?n1=51.473292&n2=11.965606&n3=18&a=null,null,51.473292,11.965606&b=0&c=0&k1=de&k2=km" mobile = "+49345 6903156" email = "schulleitung@cantor-gymnasium.de" # contact form action diff --git a/content/german/about/_index.md b/content/german/about/_index.md index 0bf909a..eb7acb2 100644 --- a/content/german/about/_index.md +++ b/content/german/about/_index.md @@ -2,9 +2,9 @@ title: "Über die Schule" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # about image -image: "images/slide1.jpg" +image: "images/banner/banner-2.png" # meta description description : "Das Georg-Cantor-Gymnasium - ein mathematisch-naturwissenschaftlich-technisches Gymnasium in Halle(Saale)" --- diff --git a/content/german/anmeldung/_index.md b/content/german/anmeldung/_index.md index e9c5f2a..5201579 100644 --- a/content/german/anmeldung/_index.md +++ b/content/german/anmeldung/_index.md @@ -2,7 +2,7 @@ title: "Anmeldung" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # image image: "images/about/about-page.jpg" # meta description diff --git a/content/german/anmeldung/anmeldung-formular.md b/content/german/anmeldung/anmeldung-formular.md index 3dbfb01..b1e1600 100644 --- a/content/german/anmeldung/anmeldung-formular.md +++ b/content/german/anmeldung/anmeldung-formular.md @@ -2,7 +2,7 @@ title: "Anmeldung" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # scholarship image image: "images/scholarship/scholarship-item-1.jpg" # meta description diff --git a/content/german/anmeldung/aufnahmeprüfung.md b/content/german/anmeldung/aufnahmeprüfung.md index ad26c79..9a48140 100644 --- a/content/german/anmeldung/aufnahmeprüfung.md +++ b/content/german/anmeldung/aufnahmeprüfung.md @@ -2,7 +2,7 @@ title: "Aufnahmeprüfung" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # scholarship image image: "images/scholarship/scholarship-item-2.jpg" # meta description diff --git a/content/german/anmeldung/ergebnisse.md b/content/german/anmeldung/ergebnisse.md index 62a8165..75a2b7a 100644 --- a/content/german/anmeldung/ergebnisse.md +++ b/content/german/anmeldung/ergebnisse.md @@ -2,7 +2,7 @@ title: "Ergebnisse" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # scholarship image image: "images/scholarship/scholarship-item-3.jpg" # meta description diff --git a/content/german/blog/_index.md b/content/german/blog/_index.md index dece0dc..ea12460 100644 --- a/content/german/blog/_index.md +++ b/content/german/blog/_index.md @@ -1,6 +1,6 @@ --- title: Aktuelles -bg_image: images/backgrounds/page-title.jpg +bg_image: images/backgrounds/page-title.png description: Hier finden sie die aktuelen Beiträge aus dem Schulblog. --- diff --git a/content/german/blog/new-site.md b/content/german/blog/new-site.md index 092a5d3..711817c 100644 --- a/content/german/blog/new-site.md +++ b/content/german/blog/new-site.md @@ -3,7 +3,7 @@ title: "Entwicklung neuer Website" date: 2019-07-06T15:27:17+01:00 draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "Seit mehreren Tagen ist die neue Schulwebsite in Entwicklung." # post thumbnail diff --git a/content/german/cantorpreis/_index.md b/content/german/cantorpreis/_index.md new file mode 100644 index 0000000..cc6dd45 --- /dev/null +++ b/content/german/cantorpreis/_index.md @@ -0,0 +1,8 @@ +--- +title: "CantorPreis-Träger" +draft: false +# page title background image +bg_image: "images/backgrounds/page-title.png" +# meta description +description : "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. Hier werden die CantorPreis-Träger der einzelnen Jahre vorgestellt" +--- diff --git a/content/german/cantorpreis/tobias-beschauner.md b/content/german/cantorpreis/tobias-beschauner.md new file mode 100644 index 0000000..b29033a --- /dev/null +++ b/content/german/cantorpreis/tobias-beschauner.md @@ -0,0 +1,28 @@ +--- +title: "Tobias Beschauner" +draft: false +# page title background image +bg_image: "images/backgrounds/page-title.png" +# meta description +description : "Biochemie-Studium Heidelberg" +# teacher portrait +image: "images/cantorpreis/tobias-beschauner-2019.jpg" +# course +year: "2019" +# biography +bio: "" +# interest +interest: ["Englisch","Französisch"] +# contact info +contact: + # contact item loop + #- name : "schapitz@cantor-gymnasium.de" + # icon : "ti-email" # icon pack : https://themify.me/themify-icons + # link : "mailto:schapitz@cantor-gymnasium.de" + +# clubs ? +clubs: false +# type +type: "cantorpreis" +forestry_link: "" +--- diff --git a/content/german/contact/_index.md b/content/german/contact/_index.md index 447535e..625e1e2 100644 --- a/content/german/contact/_index.md +++ b/content/german/contact/_index.md @@ -2,7 +2,7 @@ title: "Kontakt" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "Eine Nachricht schreiben." --- diff --git a/content/german/event/_index.md b/content/german/event/_index.md index 62474f9..fca594d 100644 --- a/content/german/event/_index.md +++ b/content/german/event/_index.md @@ -2,7 +2,7 @@ title: "Termine" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "Hier sind alle Termine für das Laufende bzw. nächste Schuljahr aufgelistet." --- diff --git a/content/german/event/vorstellung-website.md b/content/german/event/vorstellung-website.md index e675d30..94b577b 100644 --- a/content/german/event/vorstellung-website.md +++ b/content/german/event/vorstellung-website.md @@ -5,7 +5,7 @@ publishDate: "2019-01-01T00:00:00Z" date: 2020-07-15T15:00:00+01:00 draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "" # Event image diff --git a/content/german/forms/_index.md b/content/german/forms/_index.md index c59db68..2916665 100644 --- a/content/german/forms/_index.md +++ b/content/german/forms/_index.md @@ -2,7 +2,7 @@ title: "Formulare" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "Hier finden sie schulische Unterlagen und Anmeldeformulare als PDF zum Download." --- diff --git a/content/german/forms/anmeldeformular.md b/content/german/forms/anmeldeformular.md index 6296aae..516a1a6 100644 --- a/content/german/forms/anmeldeformular.md +++ b/content/german/forms/anmeldeformular.md @@ -3,7 +3,7 @@ title: "Aufnahmeantrag" date: 2020-07-12T15:27:17+06:00 draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "" # Research image @@ -16,7 +16,7 @@ Hier kann das Anmeldeformular für die Aufnahmeprüfung am Georg-Cantor-Gymnasiu ## Download -[Aufnahmeantrag](/forms/Aufnahmeantrag.pdf) +[Aufnahmeantrag](/images/forms/Aufnahmeantrag.pdf) ## Datenschutzhinweise diff --git a/content/german/forms/gesundheitsbogen.md b/content/german/forms/gesundheitsbogen.md index 3fa6a56..031508d 100644 --- a/content/german/forms/gesundheitsbogen.md +++ b/content/german/forms/gesundheitsbogen.md @@ -3,7 +3,7 @@ title: "Gesundheitsbogen Coronavirus" date: 2020-07-09T15:27:17+06:00 draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "" # Research image @@ -18,7 +18,7 @@ Bei Anfrage können die Informationen an die Gesundheitsbehörden weitergegeben ## Download -Der Gesundheitsbogen kann [hier](/forms/Gesundheitsbogen_Coronavirus.pdf) heruntergeladen werden. +Der Gesundheitsbogen kann [hier](/images/forms/Gesundheitsbogen_Coronavirus.pdf) heruntergeladen werden. ## Datenschutzhinweise diff --git a/content/german/ganztagsangebote/_index.md b/content/german/ganztagsangebote/_index.md index 5c31577..d828f21 100644 --- a/content/german/ganztagsangebote/_index.md +++ b/content/german/ganztagsangebote/_index.md @@ -2,7 +2,7 @@ title: "Unsere Ganztagsangebote" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "Unsere Schule stellt allen Schülern viele Ganztagsangebote zur Verfügung. Diese sing hier aufgelistet." --- diff --git a/content/german/ganztagsangebote/blendergame.md b/content/german/ganztagsangebote/blendergame.md index cffd004..c2cdc51 100644 --- a/content/german/ganztagsangebote/blendergame.md +++ b/content/german/ganztagsangebote/blendergame.md @@ -3,7 +3,7 @@ title: "Blender Game" date: 2019-07-06T15:27:17+06:00 draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "desc" # course thumbnail diff --git a/content/german/ganztagsangebote/cantortechnik.md b/content/german/ganztagsangebote/cantortechnik.md index c682e46..918a5dd 100644 --- a/content/german/ganztagsangebote/cantortechnik.md +++ b/content/german/ganztagsangebote/cantortechnik.md @@ -3,7 +3,7 @@ title: "CantorTechnik" date: 2019-07-06T15:27:17+06:00 draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "desc" # course thumbnail diff --git a/content/german/impressum/index.md b/content/german/impressum/index.md index ffca2d9..c80f331 100644 --- a/content/german/impressum/index.md +++ b/content/german/impressum/index.md @@ -2,7 +2,7 @@ title: "Impressum" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" type: "pages" layout: "single.html" --- diff --git a/content/german/notice/_index.md b/content/german/notice/_index.md index edb8835..1a228c4 100644 --- a/content/german/notice/_index.md +++ b/content/german/notice/_index.md @@ -2,7 +2,7 @@ title: "Hinweise" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "Hier erscheinen wichtige Hinweise von der Schulleitung." --- diff --git a/content/german/notice/notice-1.md b/content/german/notice/notice-1.md index 1a6e6ad..bf9c0ed 100644 --- a/content/german/notice/notice-1.md +++ b/content/german/notice/notice-1.md @@ -3,7 +3,7 @@ title: "Website im Entwicklungsstadium" date: 2019-07-06T15:27:17 MEST draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "" # notice download link diff --git a/content/german/teacher/_index.md b/content/german/teacher/_index.md index 3ce161d..3d3bba9 100644 --- a/content/german/teacher/_index.md +++ b/content/german/teacher/_index.md @@ -2,7 +2,7 @@ title: "Lehrer und AG-Leiter" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "In diesem Bereich sind alle Lehrer und AG-Leiter aufgelistet, die an unserer Schule arbeiten. Die Liste ist nach Fachbereichen sortiert." --- diff --git a/content/german/teacher/cschapitz.md b/content/german/teacher/cschapitz.md index 17dc112..619a2cb 100644 --- a/content/german/teacher/cschapitz.md +++ b/content/german/teacher/cschapitz.md @@ -2,7 +2,7 @@ title: "Frau Schapitz" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "" # teacher portrait diff --git a/content/german/teacher/yves-bauer.md b/content/german/teacher/yves-bauer.md index e405efb..fb4003a 100644 --- a/content/german/teacher/yves-bauer.md +++ b/content/german/teacher/yves-bauer.md @@ -2,7 +2,7 @@ title: "Yves Bauer" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "Herr Bauer ist der Leiter der Arbeitsgemeinschaften CantorTechnik und Blender Game am Georg-Cantor-Gymnasium." # teacher portrait diff --git a/content/german/wettbewerbe/_index.md b/content/german/wettbewerbe/_index.md index 0a93d28..d07ac06 100644 --- a/content/german/wettbewerbe/_index.md +++ b/content/german/wettbewerbe/_index.md @@ -2,7 +2,7 @@ title: "Wettbewerbe am GCG" draft: false # page title background image -bg_image: "images/backgrounds/page-title.jpg" +bg_image: "images/backgrounds/page-title.png" # meta description description : "Unsere Schüler nehmen jedes Jahr an vielen Wettbewerben teil. Die meisten davon sind hier aufgelistet. Die Liste ist nach Fächern sortiert." --- diff --git a/data/de/homepage.yml b/data/de/homepage.yml index d503cd2..71386c7 100644 --- a/data/de/homepage.yml +++ b/data/de/homepage.yml @@ -1,7 +1,7 @@ ################################# Slider ##################################### slider: enable : true - bg_image : "images/slide1.jpg" + bg_image : "images/banner/banner-2.png" slider_item: # slider item loop - title : "Das Georg-Cantor-Gymnasium" diff --git a/static/images/backgrounds/page-title.png b/static/images/backgrounds/page-title.png new file mode 100644 index 0000000..258c352 Binary files /dev/null and b/static/images/backgrounds/page-title.png differ diff --git a/static/images/backgrounds/page-title.xcf b/static/images/backgrounds/page-title.xcf new file mode 100644 index 0000000..55698a5 Binary files /dev/null and b/static/images/backgrounds/page-title.xcf differ diff --git a/static/images/cantorpreis/tobias-beschauner-2019.jpg b/static/images/cantorpreis/tobias-beschauner-2019.jpg new file mode 100644 index 0000000..fbdc4ad Binary files /dev/null and b/static/images/cantorpreis/tobias-beschauner-2019.jpg differ diff --git a/static/forms/Aufnahmeantrag.pdf b/static/images/forms/Aufnahmeantrag.pdf similarity index 100% rename from static/forms/Aufnahmeantrag.pdf rename to static/images/forms/Aufnahmeantrag.pdf diff --git a/static/forms/Gesundheitsbogen_Coronavirus.pdf b/static/images/forms/Gesundheitsbogen_Coronavirus.pdf similarity index 100% rename from static/forms/Gesundheitsbogen_Coronavirus.pdf rename to static/images/forms/Gesundheitsbogen_Coronavirus.pdf diff --git a/static/images/logo.png b/static/images/logo.png index 253e1cf..f1c57f7 100644 Binary files a/static/images/logo.png and b/static/images/logo.png differ