From be15a4aeabf93510c285e2d85f5b93d42f4279f4 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 17 Jul 2020 20:01:45 +0200 Subject: [PATCH] Update 17.07.2020:20.00 --- .forestry/front_matter/templates/bolgpost.yml | 33 ---- .forestry/front_matter/templates/teacher.yml | 49 ------ .forestry/settings.yml | 30 ---- .../german/anmeldung/anmeldung-formular.md | 6 - content/german/anmeldung/aufnahmeprüfung.md | 6 - content/german/anmeldung/ergebnisse.md | 6 - content/german/event/vorstellung-website.md | 12 +- .../german/ganztagsangebote/cantortechnik.md | 1 - content/german/notice/notice-1.md | 2 - content/german/teacher/cschapitz.md | 4 +- content/german/teacher/yves-bauer.md | 4 +- static/admin/config.yml | 162 +++++++++++++++++- 12 files changed, 167 insertions(+), 148 deletions(-) delete mode 100644 .forestry/front_matter/templates/bolgpost.yml delete mode 100644 .forestry/front_matter/templates/teacher.yml delete mode 100644 .forestry/settings.yml diff --git a/.forestry/front_matter/templates/bolgpost.yml b/.forestry/front_matter/templates/bolgpost.yml deleted file mode 100644 index 3390cb8..0000000 --- a/.forestry/front_matter/templates/bolgpost.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -label: Bolgpost -hide_body: false -fields: -- type: text - name: title - label: Titel -- type: datetime - name: date - label: Datum -- type: file - name: bg_image - label: bg_image -- type: text - name: description - label: Untertitel -- type: file - name: image - label: Bild -- type: text - name: author - label: Autor -- type: list - name: categories - label: Kategorien -- type: list - name: tags - label: Tags -- type: text - name: type - label: type - default: blog - hidden: true diff --git a/.forestry/front_matter/templates/teacher.yml b/.forestry/front_matter/templates/teacher.yml deleted file mode 100644 index 4910402..0000000 --- a/.forestry/front_matter/templates/teacher.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -label: Teacher -hide_body: false -fields: -- type: text - name: title - label: Name -- type: file - name: bg_image - label: bg_image -- type: text - name: description - label: Untertitel -- type: file - name: image - label: Image -- type: text - name: course - label: Fachbereich -- type: textarea - name: bio - label: Biografie -- type: list - name: interest - label: Fächer -- type: field_group_list - name: contact - label: Kontaktdaten - fields: - - type: text - name: name - label: Titel - - type: text - name: icon - label: Symbol - - type: text - name: link - label: Link -- type: boolean - name: clubs - label: AG-Leiter ? -- type: text - name: type - label: type - default: teacher - hidden: true -- type: text - name: forestry_link - label: Kontaktformular-Link diff --git a/.forestry/settings.yml b/.forestry/settings.yml deleted file mode 100644 index 34de3a3..0000000 --- a/.forestry/settings.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -new_page_extension: md -auto_deploy: false -webhook_url: -sections: -- type: directory - path: content/german - label: German - create: all - match: "**/*" -- type: directory - path: content/english - label: English - create: all - match: "**/*" -upload_dir: static/images -public_path: "/images" -front_matter_path: '' -use_front_matter_path: false -file_template: ":filename:" -build: - preview_env: - - HUGO_ENV=staging - - HUGO_VERSION=0.71.1 - preview_output_directory: public - preview_docker_image: forestryio/hugo:latest - mount_path: "/srv" - working_dir: "/srv" - instant_preview_command: hugo server -D -E -F --renderToDisk -d public -version: 0.71.1 diff --git a/content/german/anmeldung/anmeldung-formular.md b/content/german/anmeldung/anmeldung-formular.md index b1e1600..7954afe 100644 --- a/content/german/anmeldung/anmeldung-formular.md +++ b/content/german/anmeldung/anmeldung-formular.md @@ -1,12 +1,6 @@ --- title: "Anmeldung" draft: false -# page title background image -bg_image: "images/backgrounds/page-title.png" -# scholarship image -image: "images/scholarship/scholarship-item-1.jpg" -# meta description -description : "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore. dolore magna aliqua. Ut enim ad minim veniam, quis nostrud." --- Bis zum **11.02.2020** müssen: diff --git a/content/german/anmeldung/aufnahmeprüfung.md b/content/german/anmeldung/aufnahmeprüfung.md index 9a48140..04f9e2d 100644 --- a/content/german/anmeldung/aufnahmeprüfung.md +++ b/content/german/anmeldung/aufnahmeprüfung.md @@ -1,12 +1,6 @@ --- title: "Aufnahmeprüfung" draft: false -# page title background image -bg_image: "images/backgrounds/page-title.png" -# scholarship image -image: "images/scholarship/scholarship-item-2.jpg" -# meta description -description : "" --- Zur Aufnahme am Georg-Cantor-Gymnasium muss eine Aufnahmeprüfung absolviert werden, die aus: * kognitivem Fähigkeitstest(90 Minuten) diff --git a/content/german/anmeldung/ergebnisse.md b/content/german/anmeldung/ergebnisse.md index 75a2b7a..19d448b 100644 --- a/content/german/anmeldung/ergebnisse.md +++ b/content/german/anmeldung/ergebnisse.md @@ -1,12 +1,6 @@ --- title: "Ergebnisse" draft: false -# page title background image -bg_image: "images/backgrounds/page-title.png" -# scholarship image -image: "images/scholarship/scholarship-item-3.jpg" -# meta description -description : "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore. dolore magna aliqua. Ut enim ad minim veniam, quis nostrud." --- Bis zum 20.04.2020 werden ihnen die Ergebnisse der Aufnahmeprüfung schriftlich mitgeteilt. diff --git a/content/german/event/vorstellung-website.md b/content/german/event/vorstellung-website.md index 94b577b..06e51d9 100644 --- a/content/german/event/vorstellung-website.md +++ b/content/german/event/vorstellung-website.md @@ -13,14 +13,14 @@ image: "images/image.png" # location location: "Georg-Cantor-Gymnasium, Halle(Saale)" # entry fee -fee: "keine" +#fee: "keine" # apply url -apply_url : "#" -speaker: +#apply_url : "#" +#speaker: # speaker loop - - name : "Jack Mastio" - image : "images/event-speakers/speaker-1.jpg" - designation : "Teacher" + #- name : "Jack Mastio" + # image : "images/event-speakers/speaker-1.jpg" + # designation : "Teacher" # type type: "event" --- diff --git a/content/german/ganztagsangebote/cantortechnik.md b/content/german/ganztagsangebote/cantortechnik.md index 918a5dd..7b82d5b 100644 --- a/content/german/ganztagsangebote/cantortechnik.md +++ b/content/german/ganztagsangebote/cantortechnik.md @@ -14,7 +14,6 @@ category: "Digitalität und Technik" teacher: "Yves Bauer" # duration duration: "Donnerstag, 6.- 7. Stunde" -days: "Donnerstag, 6. - 7. Stunde" # weekly weekly: "2 Stunden" # course fee diff --git a/content/german/notice/notice-1.md b/content/german/notice/notice-1.md index bf9c0ed..d24379e 100644 --- a/content/german/notice/notice-1.md +++ b/content/german/notice/notice-1.md @@ -6,8 +6,6 @@ draft: false bg_image: "images/backgrounds/page-title.png" # meta description description : "" -# notice download link -download_link : "#" # type type: "notice" --- diff --git a/content/german/teacher/cschapitz.md b/content/german/teacher/cschapitz.md index bd600b3..d2d262a 100644 --- a/content/german/teacher/cschapitz.md +++ b/content/german/teacher/cschapitz.md @@ -24,11 +24,9 @@ contact: clubs: false # type type: "teacher" -#forestry_link: "" +forestry_link: "" --- ### Claudia Schapitz Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. - -## Kontakt diff --git a/content/german/teacher/yves-bauer.md b/content/german/teacher/yves-bauer.md index d01df59..deb11ec 100644 --- a/content/german/teacher/yves-bauer.md +++ b/content/german/teacher/yves-bauer.md @@ -29,10 +29,8 @@ contact: clubs: true # type type: "teacher" -forestry_link: "" +formspree_link: "" --- ### Biografie Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. - -### Kontakt diff --git a/static/admin/config.yml b/static/admin/config.yml index 3256b6e..e9a8268 100644 --- a/static/admin/config.yml +++ b/static/admin/config.yml @@ -21,7 +21,7 @@ collections: preview: false fields: # The fields for each document, usually in front matter - {label: "Name", name: "title", widget: "string"} - - {label: "Hintergrundbild", name: "bg_image", widget: "image", default: "/images/slide1.jpg"} + - {label: "Hintergrundbild", name: "bg_image", widget: "image", default: "/images/backgrounds/page-title.png"} - {label: "Metabeschreibung", name: "description", widget: "text", default: "", required: false} - {label: "Gravatar-E-Mail", name: "email", widget: "string"} - {label: "Foto", name: "image", widget: "image"} @@ -44,10 +44,10 @@ collections: - {label: "Titel", name: "title", widget: "string"} - {label: "Datum", name: "date", widget: "datetime"} - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false} - - {label: "Hintergrundbild", name: "bg_image", widget: "image", default: "/images/slide1.jpg"} + - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/images/backgrounds/page-title.png"} - {label: "Metabeschreibung", name: "description", widget: "text", default: "", required: false} - {label: "Beitragsbild", name: "image", widget: "image", default: "/images/image.png"} - - label: "Post Author" + - label: "Beitragsautor" name: "author" widget: "relation" collection: "author-de" @@ -58,3 +58,159 @@ collections: - {label: "Tags", name: "tags", widget: "string", required: false, hint: '["Tag 1", "Tag 2"]'} - {label: "Type", name: "type", widget: "hidden", default: "post"} - {label: "Text", name: "body", widget: "markdown"} + - name: "teacher-de" + label: "Deutsch/Lehrer|AG-Leiter" + folder: "content/german/teacher" + create: true + slug: "{{slug}}" + editor: + preview: false + fields: + - {label: "Name", name: "title", widget: "string"} + - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false} + - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/images/backgrounds/page-title.png"} + - {label: "Metabeschreibung", name: "description", widget: "text", required: false} + - {label: "Bild", name: "image", widget: "image", default: "/images/teachers/image.png", required: false} + - {label: "Fachbereich", name: "course", widget: "string", hint: "Bei Ganztagsangeboten Ganztagsangebote/Bereich"} + - {label: "Beschreibung", name: "bio", widget: "text"} + - label: "Fächer/Arbeitsgemeinschaften" + name: "interest" + widget: "list" + field: {label: "Fach/AG", name: "interest", widget: "string"} + - label: "Kontaktdaten/Soz. Netzwerke" + name: "contact" + widget: "list" + fields: + - {label: "Name/Adresse/Telefonnummer", name: "name", widget: "string"} + - {label: "Symbol", name: "icon", widget: "string", hint: "Symbolname von https://themify.me/themify-icons"} + - {label: "Link", name: "link", widget: "string"} + required: false + - {label: "AG-Leiter", name: "clubs", widget: "boolean", default: false, required: false} + - {label: "Type", name: "type", widget: "hidden", default: "teacher"} + - {label: "Formspree-Kontaktformular", name: "formspree_link", widget: "string", hint: "[Nur für AG-Leiter]Für ein Kontaktformular kann man sich auf der Website https://formspree.io registrieren und ein Formular erstellen.", required: false} + - {label: "Text", name: "body", widget: "markdown"} + - name: "events-de" + label: "Deutsch/Termine" + folder: "content/german/event" + create: true + slug: "{{slug}}" + editor: + preview: false + fields: + - {label: "Titel", name: "title", widget: "string"} + - {label: "Veröffentlichungsdatum", name: "publishDate", widget: "datetime"} + - {label: "Datum", name: "date", widget: "datetime"} + - {label: "Entwurf", name: "draft", widget: "boolean", default: "false", required: false} + - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/images/backgrounds/page-title.png"} + - {label: "Metabeschreibung", name: "description", widget: "text", required: false} + - {label: "Bild", name: "image", widget: "image", default: "/images/image.png", required: false} + - {label: "Ort", name: "location", widget: "string", default: "Georg-Cantor-Gymnasium, Halle(Saale)"} + - {label: "Type", name: "type", widget: "hidden", default: "event"} + - {label: "Text", name: "body", widget: "markdown"} + - name: "forms-de" + label: "Deutsch/Formulare|Vorlagen" + folder: "content/german/forms" + create: true + slug: "{{slug}}" + editor: + preview: false + fields: + - {label: "Titel", name: "title", widget: "string"} + - {label: "Veröffentlichungsdatum", name: "date", widget: "datetime"} + - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false} + - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/images/backgrounds/page-title.png"} + - {label: "Metabeschreibung", name: "description", widget: "text", required: false} + - {label: "Bild", name: "image", widget: "image", default: "/images/image.png", required: false} + - {label: "Type", name: "type", widget: "hidden", default: "forms"} + - {label: "Text", name: "body", widget: "markdown"} + - name: "anmeldung-de" + label: "Deutsch/Anmeldung" + folder: "content/german/anmeldung" + create: true + editor: + preview: false + fields: + - {label: "Titel", name: "title", widget: "string"} + - {label: "Entwurf", name: "draft", widget: "boolean", default: false, required: false} + - {label: "Text", name: "body", widget: "markdown"} + - name: "cantorpreis-de" + label: "Deutsch/CantorPreis" + folder: "content/german/cantorpreis" + 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: "/images/backgrounds/page-title.png"} + - {label: "Metabeschreibung", name: "description", widget: "text", required: false} + - {label: "Bild", name: "image", widget: "image", default: "/images/image.png", required: false} + - {label: "Jahr", name: "year", widget: "string"} + - {label: "Beschreibung", name: "bio", widget: "text"} + - label: "Kontaktdaten/Soz. Netzwerke" + name: "contact" + widget: "list" + fields: + - {label: "Name/Adresse/Telefonnummer", name: "name", widget: "string"} + - {label: "Symbol", name: "icon", widget: "string", hint: "Symbolname von https://themify.me/themify-icons"} + - {label: "Link", name: "link", widget: "string"} + - {label: "Type", name: "type", widget: "hidden", default: "cantorpreis"} + - {label: "Text", name: "body", widget: "markdown"} + - name: "ganztagsangebote-de" + label: "Deutsch/Ganztagsangebote" + folder: "content/german/ganztagsangebote" + create: true + editor: + preview: false + fields: + - {label: "Titel", name: "title", widget: "string"} + - {label: "Veröffentlichungsdatum", name: "date", widget: "datetime"} + - {label: "Entwurf", name: "draft", widget: "boolean", default: "false", required: false} + - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/images/backgrounds/page-title.png"} + - {label: "Metabeschreibung", name: "description", widget: "text", required: false} + - {label: "Bild", name: "image", widget: "image", default: "/images/image.png", required: false} + - {label: "Kategorie", name: "category", widget: "string"} + - label: "Leiter" + name: "teacher" + widget: "relation" + collection: "teacher-de" + searchFields: ["title"] + valueField: "title" + displayFields: ["title"] + - {label: "Tag/Stunden", name: "duration", widget: "string"} + - {label: "Dauer", name: "weekly", widget: "string"} + - {label: "Klassenstufen", name: "class", widget: "string"} + - {label: "Anmeldelink", name: "apply_url", widget: "hidden", default: "https://moodle.bildung-lsa.de/gcg/mod/choice/view.php?id=828"} + - {label: "Type", name: "type", widget: "hidden", default: "ganztagsangebote"} + - {label: "Text", name: "body", widget: "markdown"} + - name: "notice-de" + label: "Deutsch/Hinweise" + folder: "content/german/notice" + create: true + editor: + preview: false + fields: + - {label: "Titel", name: "title", widget: "string"} + - {label: "Veröffentlichungsdatum", name: "date", widget: "datetime"} + - {label: "Entwurf", name: "draft", widget: "boolean", default: "false", required: false} + - {label: "Hintergrundbild", name: "bg_image", widget: "hidden", default: "/images/backgrounds/page-title.png"} + - {label: "Metabeschreibung", name: "description", widget: "text", required: false} + - {label: "Type", name: "type", widget: "hidden", default: "notice"} + - {label: "Text", name: "body", widget: "markdown"} + - name: "wettbewerbe-de" + label: "Deutsch/Wettbewerbe" + folder: "content/german/wettbewerbe" + 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: "/images/backgrounds/page-title.png"} + - {label: "Metabeschreibung", name: "description", widget: "text", required: false} + - {label: "Bild", name: "image", widget: "image", default: "/images/image.png", required: false} + - {label: "Fach", name: "category", widget: "string"} + - {label: "Klassenstufen", name: "class", widget: "string"} + - {label: "Website", name: "web_url", widget: "string"} + - {label: "Type", name: "type", widget: "hidden", default: "wettbewerbe"} + - {label: "Text", name: "body", widget: "markdown"}