From 53312c6b12d36bef7ab1de2b168357cd98f35cc0 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Tue, 28 Feb 2023 08:37:51 +0100 Subject: [PATCH 1/3] WIP --- assets/scss/_common.scss | 2 +- content/german/schulchronik/2018.md | 2 + content/german/superhaufen/30-jahre-gcg.md | 32 +++++++++++++++ content/german/superhaufen/_index.md | 7 ++++ layouts/partials/head.html | 2 + layouts/schulchronik/single.html | 37 +++++++++++++---- layouts/superhaufen/list.html | 15 +++++++ layouts/superhaufen/single.html | 48 ++++++++++++++++++++++ 8 files changed, 137 insertions(+), 8 deletions(-) create mode 100644 content/german/superhaufen/30-jahre-gcg.md create mode 100644 content/german/superhaufen/_index.md create mode 100644 layouts/superhaufen/list.html create mode 100644 layouts/superhaufen/single.html diff --git a/assets/scss/_common.scss b/assets/scss/_common.scss index 80f005f..497ff4c 100644 --- a/assets/scss/_common.scss +++ b/assets/scss/_common.scss @@ -432,7 +432,7 @@ details[open] summary { #wc-canvas { width: 100%; - height: 600px; + height: 400px; } .top-banner { diff --git a/content/german/schulchronik/2018.md b/content/german/schulchronik/2018.md index d6849a7..4af7379 100644 --- a/content/german/schulchronik/2018.md +++ b/content/german/schulchronik/2018.md @@ -16,6 +16,8 @@ pretext: >+ topics: - title: 30-jähriges Jubiläum + superhaufen: true + superlink: 30-jahre-gcg content: | Inhalt - title: 'Projekt: "4 smarte Rallyes in Halle"' diff --git a/content/german/superhaufen/30-jahre-gcg.md b/content/german/superhaufen/30-jahre-gcg.md new file mode 100644 index 0000000..1bc66f0 --- /dev/null +++ b/content/german/superhaufen/30-jahre-gcg.md @@ -0,0 +1,32 @@ +--- +title: 30-jähriges Jubiläum +draft: "false" +bg_image: /media/backgrounds/page-title.webp +description: 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 +image: /media/image.webp +type: superhaufen +gallery: false +tiles: + - title: Lorem-1 + image: /media/image.webp + bg_color: \#990000 + icon: mdi mdi-pillar + font_color: white + content: | + 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. + - title: Lorem-2 + image: /media/image.webp + bg_color: \#99ffff + icon: mdi mdi-head-cog-outline + font_color: black + content: | + 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. + - title: Lorem-3 + image: /media/image.webp + bg_color: \#cc9966 + icon: mdi mdi-fireplace + font_color: black + content: | + 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. +--- +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 \ No newline at end of file diff --git a/content/german/superhaufen/_index.md b/content/german/superhaufen/_index.md new file mode 100644 index 0000000..c5291ce --- /dev/null +++ b/content/german/superhaufen/_index.md @@ -0,0 +1,7 @@ +--- +title: Superhaufen +draft: false +bg_image: media/backgrounds/page-title.webp +description: 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. +type: "superhaufen" +--- \ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html index af6ba4a..32221be 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -16,6 +16,8 @@ + + diff --git a/layouts/schulchronik/single.html b/layouts/schulchronik/single.html index 84dcba5..ebf98d5 100644 --- a/layouts/schulchronik/single.html +++ b/layouts/schulchronik/single.html @@ -28,9 +28,18 @@ {{ partial "chronik-modal" (dict "id" "pretext" "title" .Title "content" .Params.pretext) }} {{ end }}
- {{ $topics := slice (slice .Params.Title 100 "pretext") }} + {{ $topics := slice }} + {{ if .Params.pretext }} + {{ $topics = $topics | append (slice (slice .Params.Title 200 "pretext")) }} + {{ else }} + {{ $topics = $topics | append (slice (slice .Params.Title 200)) }} + {{ end }} {{ range .Params.topics }} - {{ $topics = $topics | append (slice (slice .title 40 (md5 .title) )) }} + {{ if .superhaufen }} + {{ $topics = $topics | append (slice (slice .title 30 .superlink "superhaufen" )) }} + {{ else }} + {{ $topics = $topics | append (slice (slice .title 30 (md5 .title) )) }} + {{ end }} {{ end }} {{ $topics = $topics | jsonify }} diff --git a/layouts/superhaufen/list.html b/layouts/superhaufen/list.html new file mode 100644 index 0000000..65793de --- /dev/null +++ b/layouts/superhaufen/list.html @@ -0,0 +1,15 @@ +{{ define "main" }} + +
+
+
+ {{ range .Data.Pages }} +
+ {{ .Render "fach" }} +
+ {{ end }} +
+
+
+ +{{ end }} diff --git a/layouts/superhaufen/single.html b/layouts/superhaufen/single.html new file mode 100644 index 0000000..2a10a30 --- /dev/null +++ b/layouts/superhaufen/single.html @@ -0,0 +1,48 @@ +{{ define "main" }} + +
+
+
+
+ {{ .Content }} +
+
+
+
+
+ {{ range .Params.tiles }} + +
+
+
+ +
+
+

{{ .title | truncate 55 }}

+ +
+
+
+ {{ end }} +
+
+
+ +{{ end }} \ No newline at end of file From 97adac6d01ef482cdc2c3e13e394b28905b40d73 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Tue, 28 Feb 2023 09:33:57 +0100 Subject: [PATCH 2/3] unterhaufen + ui --- assets/scss/_common.scss | 11 +++++ config.yml | 1 + content/german/superhaufen/30-jahre-gcg.md | 32 -------------- content/german/superhaufen/_index.md | 3 +- layouts/_default/superhaufen.html | 7 ++++ layouts/schulchronik/single.html | 6 +-- layouts/superhaufen/list.html | 2 +- layouts/superhaufen/single.html | 12 ++++++ static/schulchronik/admin/config.yml | 49 +++++++++++++++++++++- static/schulchronik/admin/index.html | 2 +- 10 files changed, 85 insertions(+), 40 deletions(-) delete mode 100644 content/german/superhaufen/30-jahre-gcg.md create mode 100644 layouts/_default/superhaufen.html diff --git a/assets/scss/_common.scss b/assets/scss/_common.scss index 497ff4c..d3148dc 100644 --- a/assets/scss/_common.scss +++ b/assets/scss/_common.scss @@ -445,4 +445,15 @@ details[open] summary { .content-justify { text-align: justify; +} + +.fb-tile-color { + display: flex; + justify-content: center; + align-items: center; + height: 195px; +} + +.fb-tile-icon { + font-size: 96px; } \ No newline at end of file diff --git a/config.yml b/config.yml index 2e23211..1f0731b 100644 --- a/config.yml +++ b/config.yml @@ -7,6 +7,7 @@ defaultContentLanguage: de enableEmoji: true enableRobotsTxt: true timeZone: Europe/Berlin +removePathAccents: true markup: defaultMarkdownHandler: goldmark goldmark: diff --git a/content/german/superhaufen/30-jahre-gcg.md b/content/german/superhaufen/30-jahre-gcg.md deleted file mode 100644 index 1bc66f0..0000000 --- a/content/german/superhaufen/30-jahre-gcg.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -title: 30-jähriges Jubiläum -draft: "false" -bg_image: /media/backgrounds/page-title.webp -description: 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 -image: /media/image.webp -type: superhaufen -gallery: false -tiles: - - title: Lorem-1 - image: /media/image.webp - bg_color: \#990000 - icon: mdi mdi-pillar - font_color: white - content: | - 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. - - title: Lorem-2 - image: /media/image.webp - bg_color: \#99ffff - icon: mdi mdi-head-cog-outline - font_color: black - content: | - 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. - - title: Lorem-3 - image: /media/image.webp - bg_color: \#cc9966 - icon: mdi mdi-fireplace - font_color: black - content: | - 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. ---- -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 \ No newline at end of file diff --git a/content/german/superhaufen/_index.md b/content/german/superhaufen/_index.md index c5291ce..b7e34f8 100644 --- a/content/german/superhaufen/_index.md +++ b/content/german/superhaufen/_index.md @@ -2,6 +2,5 @@ title: Superhaufen draft: false bg_image: media/backgrounds/page-title.webp -description: 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. -type: "superhaufen" +description: null --- \ No newline at end of file diff --git a/layouts/_default/superhaufen.html b/layouts/_default/superhaufen.html new file mode 100644 index 0000000..0ec4ac1 --- /dev/null +++ b/layouts/_default/superhaufen.html @@ -0,0 +1,7 @@ +
+
+

{{ .Title | truncate 20 }}

+ {{ i18n "show_more"}} +
+
+ \ No newline at end of file diff --git a/layouts/schulchronik/single.html b/layouts/schulchronik/single.html index ebf98d5..575caff 100644 --- a/layouts/schulchronik/single.html +++ b/layouts/schulchronik/single.html @@ -35,8 +35,8 @@ {{ $topics = $topics | append (slice (slice .Params.Title 200)) }} {{ end }} {{ range .Params.topics }} - {{ if .superhaufen }} - {{ $topics = $topics | append (slice (slice .title 30 .superlink "superhaufen" )) }} + {{ if .superhaufen.enable }} + {{ $topics = $topics | append (slice (slice .title 30 (.superhaufen.link | urlize) "superhaufen" )) }} {{ else }} {{ $topics = $topics | append (slice (slice .title 30 (md5 .title) )) }} {{ end }} @@ -49,7 +49,7 @@ click: function (item) { if (item[1] != 200 || (item[1] == 200 && item[2] == "pretext")) { if( item[3] == "superhaufen" ) { - window.location.href = "/superhaufen/" + item[2]; + window.location.href = "{{ `/superhaufen/` | relLangURL }}" + item[2]; } else { $('#' + item[2]).modal('show'); } diff --git a/layouts/superhaufen/list.html b/layouts/superhaufen/list.html index 65793de..503437d 100644 --- a/layouts/superhaufen/list.html +++ b/layouts/superhaufen/list.html @@ -5,7 +5,7 @@
{{ range .Data.Pages }}
- {{ .Render "fach" }} + {{ .Render "superhaufen" }}
{{ end }}
diff --git a/layouts/superhaufen/single.html b/layouts/superhaufen/single.html index 2a10a30..172bf70 100644 --- a/layouts/superhaufen/single.html +++ b/layouts/superhaufen/single.html @@ -24,6 +24,18 @@
{{ .content | markdownify }}
+ {{ range .unterhaufen }} +
+
+
+
+ {{ .title }} +

{{ .content }}

+
+
+
+
+ {{ end }} diff --git a/static/schulchronik/admin/config.yml b/static/schulchronik/admin/config.yml index 92fc10b..bd8dc97 100644 --- a/static/schulchronik/admin/config.yml +++ b/static/schulchronik/admin/config.yml @@ -136,6 +136,39 @@ collections: - {label: "Type", name: "type", widget: "hidden", default: "cantorpreis"} - {label: "Gallerie-Komponente", name: "gallery", widget: "boolean", default: false, required: false, hint: "Benötigt für Gallerie bzw. Bildeinbettung"} - {label: "Text", name: "body", widget: "markdown", required: false} + - name: "superhaufen" + icon: "superhaufen" + label: "Superhaufen" + label_singular: "Superhaufen" + folder: "content/german/superhaufen" + filter: {field: "type", value: "superhaufen"} + create: true + editor: + preview: false + media_folder: '/static/media/schulchronik/superhaufen' + public_folder: '/media/schulchronik/superhaufen' + 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.webp"} + - {label: "Type", name: "type", widget: "hidden", default: "superhaufen"} + - label: "Kacheln" + name: "tiles" + widget: "list" + required: false + fields: + - {label: "Titel", name: "title", widget: "string", required: true} + - {label: "Hintergrundfarbe", name: "bg_color", widget: "color", required: true} + - {label: "Symbol", name: "icon", widget: "string", required: true} + - {label: "Symbolfarbe", name: "font_color", widget: "color", required: true} + - {label: "Inhalt", name: "content", widget: "markdown", required: true} + - label: "Unter-Unterhaufen" + name: "unterhaufen" + widget: "list" + required: false + fields: + - {label: "Titel", name: "title", widget: "string", required: false} + - {label: "Inhalt", name: "content", widget: "markdown", required: true} - name: "schulchronik" icon: "pillar" label: "Schulchronik" @@ -156,10 +189,24 @@ collections: - label: "Kreative Haufen" name: "topics" widget: "list" + required: false fields: - {label: "Titel", name: "title", widget: "string", required: true} - {label: "Inhalt", name: "content", widget: "markdown", required: true} - required: false + - label: "Superhaufen" + name: "superhaufen" + widget: "object" + required: false + fields: + - {label: "Aktiviert", name: "enable", widget: "boolean", required: false} + - label: "Superhaufen" + name: "link" + widget: "relation" + collection: "superhaufen" + search_fields: ["title"] + value_field: "title" + required: false + collapsed: true - label: "Cantorpreisträger" name: "cantorpreisträger" widget: "relation" diff --git a/static/schulchronik/admin/index.html b/static/schulchronik/admin/index.html index 8c0d609..308c25f 100644 --- a/static/schulchronik/admin/index.html +++ b/static/schulchronik/admin/index.html @@ -21,7 +21,7 @@ CMS.init();