From bcd98b842b923315ddb9c411265aef210c492698 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 9 Jul 2020 17:16:41 +0000 Subject: [PATCH 1/9] Update from Forestry.io - Updated Forestry configuration --- .forestry/settings.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .forestry/settings.yml diff --git a/.forestry/settings.yml b/.forestry/settings.yml new file mode 100644 index 00000000..e2ff162e --- /dev/null +++ b/.forestry/settings.yml @@ -0,0 +1,36 @@ +--- +new_page_extension: md +auto_deploy: false +admin_path: +webhook_url: +sections: +- type: directory + path: content + label: Pages + create: all + match: "*" +- type: directory + path: content/german + label: German + create: all + match: "**/*" +- type: directory + path: content/english + label: English + create: all + match: "**/*" +upload_dir: static/uploads +public_path: "/uploads" +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 From 59b94b3f89eec48c0b882abaf47642daf5ce57bf Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 9 Jul 2020 17:18:28 +0000 Subject: [PATCH 2/9] Update from Forestry.io - Updated Forestry configuration --- .forestry/front_matter/templates/teacher.yml | 47 ++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .forestry/front_matter/templates/teacher.yml diff --git a/.forestry/front_matter/templates/teacher.yml b/.forestry/front_matter/templates/teacher.yml new file mode 100644 index 00000000..74972d67 --- /dev/null +++ b/.forestry/front_matter/templates/teacher.yml @@ -0,0 +1,47 @@ +--- +label: Teacher +hide_body: false +fields: +- type: text + name: title + label: title +- type: file + name: bg_image + label: bg_image +- type: text + name: description + label: description +- type: file + name: image + label: image +- type: text + name: course + label: course +- type: textarea + name: bio + label: bio +- type: list + name: interest + label: interest +- type: field_group_list + name: contact + label: contact + fields: + - type: text + name: name + label: name + - type: text + name: icon + label: icon + - type: text + name: link + label: link +- type: boolean + name: clubs + label: clubs +- type: text + name: type + label: type +- type: text + name: forestry_link + label: forestry_link From 059b0d58401aedbe6bd18e6d1e8670ccd1ccfbf4 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 9 Jul 2020 17:42:23 +0000 Subject: [PATCH 3/9] Update from Forestry.io - Updated Forestry configuration --- .forestry/front_matter/templates/teacher.yml | 26 +++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.forestry/front_matter/templates/teacher.yml b/.forestry/front_matter/templates/teacher.yml index 74972d67..49104024 100644 --- a/.forestry/front_matter/templates/teacher.yml +++ b/.forestry/front_matter/templates/teacher.yml @@ -4,44 +4,46 @@ hide_body: false fields: - type: text name: title - label: title + label: Name - type: file name: bg_image label: bg_image - type: text name: description - label: description + label: Untertitel - type: file name: image - label: image + label: Image - type: text name: course - label: course + label: Fachbereich - type: textarea name: bio - label: bio + label: Biografie - type: list name: interest - label: interest + label: Fächer - type: field_group_list name: contact - label: contact + label: Kontaktdaten fields: - type: text name: name - label: name + label: Titel - type: text name: icon - label: icon + label: Symbol - type: text name: link - label: link + label: Link - type: boolean name: clubs - label: clubs + label: AG-Leiter ? - type: text name: type label: type + default: teacher + hidden: true - type: text name: forestry_link - label: forestry_link + label: Kontaktformular-Link From 9a9113c54c91a7cfae78533ebf72e5a23906b0e1 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 9 Jul 2020 17:43:28 +0000 Subject: [PATCH 4/9] Update from Forestry.io - Updated Forestry configuration --- .forestry/front_matter/templates/bolgpost.yml | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .forestry/front_matter/templates/bolgpost.yml diff --git a/.forestry/front_matter/templates/bolgpost.yml b/.forestry/front_matter/templates/bolgpost.yml new file mode 100644 index 00000000..bb8a733a --- /dev/null +++ b/.forestry/front_matter/templates/bolgpost.yml @@ -0,0 +1,31 @@ +--- +label: Bolgpost +hide_body: false +fields: +- type: text + name: title + label: title +- type: datetime + name: date + label: date +- type: file + name: bg_image + label: bg_image +- type: text + name: description + label: description +- type: file + name: image + label: image +- type: text + name: author + label: author +- type: list + name: categories + label: categories +- type: list + name: tags + label: tags +- type: text + name: type + label: type From e8d82b89ac66fc5460ffb9b5e9dbb8b02e4c1f28 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 9 Jul 2020 17:45:02 +0000 Subject: [PATCH 5/9] Update from Forestry.io - Updated Forestry configuration --- .forestry/front_matter/templates/bolgpost.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.forestry/front_matter/templates/bolgpost.yml b/.forestry/front_matter/templates/bolgpost.yml index bb8a733a..3390cb8c 100644 --- a/.forestry/front_matter/templates/bolgpost.yml +++ b/.forestry/front_matter/templates/bolgpost.yml @@ -4,28 +4,30 @@ hide_body: false fields: - type: text name: title - label: title + label: Titel - type: datetime name: date - label: date + label: Datum - type: file name: bg_image label: bg_image - type: text name: description - label: description + label: Untertitel - type: file name: image - label: image + label: Bild - type: text name: author - label: author + label: Autor - type: list name: categories - label: categories + label: Kategorien - type: list name: tags - label: tags + label: Tags - type: text name: type label: type + default: blog + hidden: true From 6565ce93b2bcd4d750a9556ef829f5117be562b5 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 9 Jul 2020 17:46:36 +0000 Subject: [PATCH 6/9] Update from Forestry.io Denys Konovalov updated content/german/blog/_index.md --- content/german/blog/_index.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/content/german/blog/_index.md b/content/german/blog/_index.md index 9c16e3d8..dece0dcd 100644 --- a/content/german/blog/_index.md +++ b/content/german/blog/_index.md @@ -1,8 +1,6 @@ --- -title: "Dernières nouvelles" -draft: false -# page title background image -bg_image: "images/backgrounds/page-title.jpg" -# meta description -description : "ceci est une description meta" ---- \ No newline at end of file +title: Aktuelles +bg_image: images/backgrounds/page-title.jpg +description: Hier finden sie die aktuelen Beiträge aus dem Schulblog. + +--- From 4218815cb3624116cdc1e49de3a585f03f121df6 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 9 Jul 2020 17:47:36 +0000 Subject: [PATCH 7/9] Update from Forestry.io - Updated Forestry configuration --- .forestry/settings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forestry/settings.yml b/.forestry/settings.yml index e2ff162e..a2e24b45 100644 --- a/.forestry/settings.yml +++ b/.forestry/settings.yml @@ -19,8 +19,8 @@ sections: label: English create: all match: "**/*" -upload_dir: static/uploads -public_path: "/uploads" +upload_dir: static/images +public_path: "/images" front_matter_path: '' use_front_matter_path: false file_template: ":filename:" From aeb9c8311c2e6c71e6c5ed7236b9a73fc44d141a Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 9 Jul 2020 17:49:51 +0000 Subject: [PATCH 8/9] Update from Forestry.io - Updated Forestry configuration --- .forestry/settings.yml | 2 +- static/admin/index.html | 55 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 static/admin/index.html diff --git a/.forestry/settings.yml b/.forestry/settings.yml index a2e24b45..973492ac 100644 --- a/.forestry/settings.yml +++ b/.forestry/settings.yml @@ -1,7 +1,7 @@ --- new_page_extension: md auto_deploy: false -admin_path: +admin_path: "/static/admin" webhook_url: sections: - type: directory diff --git a/static/admin/index.html b/static/admin/index.html new file mode 100644 index 00000000..46c5fc13 --- /dev/null +++ b/static/admin/index.html @@ -0,0 +1,55 @@ + + + + + + + + Admin + + + + + + + + + + + + + + + +
+ +
+ + + + From 750edf1e34371cec689f347b687eaec1802b4787 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 9 Jul 2020 17:50:31 +0000 Subject: [PATCH 9/9] Update from Forestry.io - Updated Forestry configuration --- .forestry/settings.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.forestry/settings.yml b/.forestry/settings.yml index 973492ac..c2449ca1 100644 --- a/.forestry/settings.yml +++ b/.forestry/settings.yml @@ -4,11 +4,6 @@ auto_deploy: false admin_path: "/static/admin" webhook_url: sections: -- type: directory - path: content - label: Pages - create: all - match: "*" - type: directory path: content/german label: German