From e2157a0a6b8a39857264e484a6c5946af562f041 Mon Sep 17 00:00:00 2001 From: teldra Date: Wed, 8 Jun 2022 06:09:50 +0200 Subject: [PATCH] small fixes --- content/misc/tools/generator.de.md | 8 ++- .../index.de.md | 2 + themes/buha/assets/scss/generator.scss | 19 +++++++ .../layouts/partials/layout/generator.html | 7 --- .../partials/layout/generator/form.html | 52 ++++++++++++++++--- .../buha/layouts/partials/snippets/head.html | 4 +- themes/buha/static/js/generator.js | 31 ++++++++--- 7 files changed, 101 insertions(+), 22 deletions(-) create mode 100644 themes/buha/assets/scss/generator.scss diff --git a/content/misc/tools/generator.de.md b/content/misc/tools/generator.de.md index 59c6343..5e95ec9 100644 --- a/content/misc/tools/generator.de.md +++ b/content/misc/tools/generator.de.md @@ -15,6 +15,11 @@ forms: name: "Titel" required: true placeholder: "Untitled Band \"Rocken in Häusern\"-Tour" + - title: summary + input_type: text + name: "Beschreibung/Summary" + placeholder: "Wir feiern die 300jährige Tour und können das mit ca 30 Worten umreissen." + - title: headline input_type: buttons name: "Überschrift" @@ -43,13 +48,14 @@ forms: input_type: buttons name: "More" target: "content" + - title: content input_type: textarea name: "Inhalt" required: true placeholder: "Einfach losschreiben. Der erste Absatz wird die Zusammenfassung in Artikelübersichten. Denke an die Formatierungshilfe hinter dem Link oben." - title: categories - input_type: mc + input_type: rb name: "Kategorie" expanded: true new: "Neue Kategorie" diff --git a/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md b/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md index b7f34d7..1e1997f 100644 --- a/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md +++ b/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md @@ -1,7 +1,9 @@ --- title: "Katzengejammer" date: "2022-04-04T23:16:00+02:00" +summary: "sdadasdasdasd" when: "Montag, 04.04.2022, 23.23 Uhr" +categories: ["Pressemitteilung"] events: ["Konzert"] price: "free" foundations: ["rote_hilfe"] diff --git a/themes/buha/assets/scss/generator.scss b/themes/buha/assets/scss/generator.scss new file mode 100644 index 0000000..a24e200 --- /dev/null +++ b/themes/buha/assets/scss/generator.scss @@ -0,0 +1,19 @@ +fieldset { + display: flex; flex-wrap: wrap; flex-direction: row; padding: 0; border: none; margin: 0 0 .3rem .5rem; +} + +.w100 { + width: 100%; +} + +.column { + flex-direction: column; +} + +#result { + white-space: pre; display: none; background: var(--background-body); + padding: 1rem 0 1rem 1rem; + margin-top: 1rem; + -webkit-user-select: all; + user-select: all; +} diff --git a/themes/buha/layouts/partials/layout/generator.html b/themes/buha/layouts/partials/layout/generator.html index 21a8581..b7717ce 100644 --- a/themes/buha/layouts/partials/layout/generator.html +++ b/themes/buha/layouts/partials/layout/generator.html @@ -1,9 +1,3 @@ -{{ define "css" }} - -{{ end }} - - -
{{ .context.Content }}
@@ -12,6 +6,5 @@ {{ partial "layout/generator/form" (dict "context" .context "form" 0) }} {{ end }} -
diff --git a/themes/buha/layouts/partials/layout/generator/form.html b/themes/buha/layouts/partials/layout/generator/form.html index 02ce7ff..d35e063 100644 --- a/themes/buha/layouts/partials/layout/generator/form.html +++ b/themes/buha/layouts/partials/layout/generator/form.html @@ -53,7 +53,6 @@ {{ else if eq .input_type "mc" }} {{ $in0 := .title }} - {{- $finale := slice -}} {{ $pages := where site.RegularPages "Type" "in" site.Params.searchSections }} {{ if eq .title "tags" }} @@ -75,15 +74,11 @@ {{ end }} {{ end }} {{- $finale = $finale | uniq -}} -
{{ .name }} {{ if ne .expanded true }}{{ partial "layout/generator/expand" (dict "name" (printf "%scat" $in0)) }}{{ end }}{{- if .required -}}{{- " *" -}}{{- end -}}
- - -
@@ -97,8 +92,51 @@ {{ end }}
- -
+ + + {{ else if eq .input_type "rb" }} + {{ $in0 := .title }} + {{- $finale := slice -}} + {{ $pages := where site.RegularPages "Type" "in" site.Params.searchSections }} + {{ if eq .title "tags" }} + {{ range $pages }} + {{- with .Params.tags -}} + {{- $finale = $finale | append . -}} + {{ end }} + {{ end }} + {{ else if eq .title "foundations" }} + {{ range resources.Match "/images/foundations/*" }} + {{ $n := path.Base (strings.TrimSuffix (path.Ext .Name) .Name) }} + {{- $finale = $finale | append $n -}} + {{ end }} + {{ else }} + {{ range $pages }} + {{ range .Param $in0 }} + {{- $finale = $finale | append . -}} + {{ end }} + {{ end }} + {{ end }} + {{- $finale = $finale | uniq -}} +
+
+ {{ .name }} + {{ if ne .expanded true }}{{ partial "layout/generator/expand" (dict "name" (printf "%scat" $in0)) }}{{ end }}{{- if .required -}}{{- " *" -}}{{- end -}} +
+
+
+
+ + {{ range sort $finale }} + + {{ end }} +
+ {{ if .new }} + + + {{ end }} +
+
+
{{ else }} diff --git a/themes/buha/layouts/partials/snippets/head.html b/themes/buha/layouts/partials/snippets/head.html index b856012..dfddfe9 100644 --- a/themes/buha/layouts/partials/snippets/head.html +++ b/themes/buha/layouts/partials/snippets/head.html @@ -11,8 +11,10 @@ {{ $main := resources.Get "scss/main.scss" | resources.ToCSS }} {{ $pagination := resources.Get "scss/pagination.scss" | resources.ToCSS }} {{ $footer := resources.Get "scss/footer.scss" | resources.ToCSS }} -{{ $allcss := slice $water $font $container $header $banner $main $pagination $footer | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }} +{{ $generator := resources.Get "scss/generator.scss" | resources.ToCSS }} +{{ $allcss := slice $water $font $container $header $banner $main $pagination $footer $generator | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }} + {{ $title := print .Site.Title " | " .Title }} {{ if .IsHome }}{{ $title = .Site.Title }}{{ end }} diff --git a/themes/buha/static/js/generator.js b/themes/buha/static/js/generator.js index e5126b1..10844a6 100644 --- a/themes/buha/static/js/generator.js +++ b/themes/buha/static/js/generator.js @@ -2,7 +2,7 @@ function check_checkboxes(name) { const checkboxes = document.querySelectorAll(`input[name="${name}"]:checked`); let values = []; checkboxes.forEach((checkbox) => { - values.push("\"" + checkbox.value + "\""); + values.push("\"" + checkbox.value + "\""); }); if (values) { return values; @@ -11,6 +11,18 @@ function check_checkboxes(name) { } } +function Clear(name) + { + clearRadioGroup(name); + } + + function clearRadioGroup(name) + { + var ele = document.getElementsByName(name); + for(var i=0;i"; } + if (summary) { + display.innerHTML += "summary: \"" + summary + "\"
"; + } + if (featured != '') { display.innerHTML += "featured: true
"; }