From 81fe45bd1b3811dc3626672702f7f6a2b13a0a68 Mon Sep 17 00:00:00 2001 From: teldra Date: Wed, 6 Apr 2022 17:51:02 +0200 Subject: [PATCH] small fixes --- content/misc/generator.de.md | 55 +++++++ content/news/cafe/index.de.md | 1 + content/news/plenum/index.de.md | 3 +- themes/buha/assets/css/layout.css | 31 +--- themes/buha/layouts/_default/baseof.html | 2 +- themes/buha/layouts/_default/single.html | 4 +- .../partials/contentlayouts/article.html | 1 + themes/buha/layouts/partials/form.html | 141 ++++++++++++++++++ themes/buha/layouts/partials/misc/expand.html | 3 + .../buha/layouts/partials/misc/generator.html | 33 +--- themes/buha/static/js/generator.js | 29 +++- 11 files changed, 243 insertions(+), 60 deletions(-) create mode 100644 themes/buha/layouts/partials/form.html create mode 100644 themes/buha/layouts/partials/misc/expand.html diff --git a/content/misc/generator.de.md b/content/misc/generator.de.md index 0f4efd95..cbb6ad3f 100644 --- a/content/misc/generator.de.md +++ b/content/misc/generator.de.md @@ -4,6 +4,61 @@ date: 2021-06-22T23:00:00+02:00 description: "generator" type: "tools" tool: "generator" +forms: + - to: info@bunteshaus.de + placeholders: false + fields: + - name: title + input_type: text + placeholder: Title + required: true + - name: content + input_type: textarea + placeholder: Content + required: true + - name: categories + input_type: mc + placeholder: Kategorien + new: true + collapsed: true + - name: when + group: event + input_type: text + placeholder: Datum des Events + - name: price + group: event + input_type: text + placeholder: Preis + - name: contact + group: event + input_type: text + placeholder: Kontakt + - name: events + group: event + input_type: mc + placeholder: Eventkategorien + new: true + - name: featured + group: misc + input_type: checkbox + placeholder: featured + required: true + - name: about + group: misc + input_type: checkbox + placeholder: about + required: true + - name: tags + group: misc + input_type: mc + placeholder: Tags + new: true + - name: results + input_type: results + - name: submit + input_type: submit + placeholder: Generate + required: true --- Hier kannst du einen neuen Artikel generieren. diff --git a/content/news/cafe/index.de.md b/content/news/cafe/index.de.md index 586727b8..1b4f9434 100644 --- a/content/news/cafe/index.de.md +++ b/content/news/cafe/index.de.md @@ -4,5 +4,6 @@ date: "2021-10-20T17:00:00+02:00" about: true when: "Mittwochs 16.00-19.00Uhr und Sonntags 14.00-17.00Uhr" events: ["Regelmäßig"] +tags: ["lala"] --- Seit August gibt es im Bunten Haus das "Offene Café" immer Mittwochs 16.00 - 19.00 Uhr und Sonntags 14.00 - 17.00 Uhr: Wir haben leckeren Kaffee, Espresso, Tee und weitere Getränke und manchmal auch Kuchen. Wir freuen uns, wenn ihr vorbeischaut. Wir sehen uns dort! diff --git a/content/news/plenum/index.de.md b/content/news/plenum/index.de.md index 6beb3278..fad2a841 100644 --- a/content/news/plenum/index.de.md +++ b/content/news/plenum/index.de.md @@ -3,6 +3,7 @@ title: "Plenum" date: "1993-09-04T19:00:00+02:00" when: "jeden Monat am ersten und dritten Donnerstag, 19:00Uhr" about: true +categories: ["Buha"] events: ["Regelmäßig"] tags: [ "Plenum" ] covid: "3g" @@ -10,4 +11,4 @@ price: "free" --- Das Plenum des Bunten Hauses findet jeden Donnerstag um 19.00 Uhr statt. Das Plenum ist offen für alle, die sich im Bunten Haus einbringen möchten. -An jedem ersten Donnerstag im Monat findet ein Delegierten-Plenum statt, an dem von jedem Arbeitsbereich und jeder im Bunten Haus aktiven Gruppe mindestens eine delegierte Person teilnimmt. \ No newline at end of file +An jedem ersten Donnerstag im Monat findet ein Delegierten-Plenum statt, an dem von jedem Arbeitsbereich und jeder im Bunten Haus aktiven Gruppe mindestens eine delegierte Person teilnimmt. diff --git a/themes/buha/assets/css/layout.css b/themes/buha/assets/css/layout.css index 9c7348c5..988fda9e 100644 --- a/themes/buha/assets/css/layout.css +++ b/themes/buha/assets/css/layout.css @@ -5,18 +5,7 @@ flex-direction: row; flex-wrap: wrap; background-color: #741e94; - background: url(/images/logo_back_full.png); -} - - - -form label { - display: inline-block; - width: 100px; -} - -form div { - margin-bottom: 10px; + background: url(/images/logo_back_full.svg); } .container { @@ -191,17 +180,6 @@ article { user-select: all; } -label,textarea,#label { - width: 100%; -} - -fieldset{ - display: flex; - flex-direction: column; - max-width: 58.5rem; - border-color: var(--background-alt); -} - input, textarea { background-color: var(--background-body); } @@ -236,6 +214,13 @@ input, textarea { list-style: none; text-align: right; } +.margin_left_1rem { + margin-left: 1rem; +} +.margin_top_1rem { + margin-top: 1rem; +} + /* Extra small devices (phones, 600px and down) */ @media only screen and (max-width: 600px) {...} diff --git a/themes/buha/layouts/_default/baseof.html b/themes/buha/layouts/_default/baseof.html index 1d705bed..c940aa5f 100644 --- a/themes/buha/layouts/_default/baseof.html +++ b/themes/buha/layouts/_default/baseof.html @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html index b185b1f0..3b004cbe 100644 --- a/themes/buha/layouts/_default/single.html +++ b/themes/buha/layouts/_default/single.html @@ -39,5 +39,7 @@ {{ define "sidebar" }} - {{- partial "contentlayouts/menu.html" . }} + {{ if ne .Type "tools" }} + {{- partial "contentlayouts/menu.html" . }} + {{ end }} {{ end }} diff --git a/themes/buha/layouts/partials/contentlayouts/article.html b/themes/buha/layouts/partials/contentlayouts/article.html index d7c786fb..b0097e4a 100644 --- a/themes/buha/layouts/partials/contentlayouts/article.html +++ b/themes/buha/layouts/partials/contentlayouts/article.html @@ -75,6 +75,7 @@ {{- $thumb = $img.Resize "2048x" }} {{ end }} {{ end }} +
{{ if ne $img "" }}
diff --git a/themes/buha/layouts/partials/form.html b/themes/buha/layouts/partials/form.html new file mode 100644 index 00000000..b805af79 --- /dev/null +++ b/themes/buha/layouts/partials/form.html @@ -0,0 +1,141 @@ +{{ $pageform := (index .context.Page.Params.forms .form) }} +{{ $group := slice }} + +
+ + +{{ range $pageform.fields }} + + {{ if .required }}{{ .Scratch.Set "requiredstar" "" }}{{ else }}{{ .Scratch.Set "requiredstar" " (optioneel)" }}{{ end }} + {{ if .required }}{{ .Scratch.Set "requiredtext" "required" }}{{ else }}{{ .Scratch.Set "requiredtext" "" }}{{ end }} + + {{ if and .group (not (in $group .group))}} +
+ {{ .group }} + {{ partial "misc/expand" (dict "name" (printf "%sgroup" .group)) }} +
+ {{ $group = $group | append .group }} + + {{ end }} + + {{ if eq .input_type "title" }} +

{{ .placeholder }}

+ {{ else if eq .input_type "textarea" }} +
+ + +
+ {{ else if eq .input_type "radio" }} +
+ +
+ {{ else if eq .input_type "checkbox" }} +
+ +
+ {{ else if eq .input_type "results" }} + + {{ else if eq .input_type "submit" }} +
+ +
+ + + + + + + + + {{ else if eq .input_type "mc" }} + {{ $in0 := .name }} + + {{- $finale := slice -}} + {{ $pages := where site.RegularPages "Type" "in" site.Params.searchSections }} + {{ if eq .name "tags" }} + {{ range $pages }} + {{- if .Params.tags -}} + {{- $finale = $finale | append .Params.tags -}} + {{ end }} + {{ end }} + {{ else }} + {{ range $pages }} + {{ range .Param $in0 }} + {{- $finale = $finale | append . -}} + {{ end }} + {{ end }} + {{ end }} + {{- $finale = $finale | uniq -}} + +
+
+ {{ .placeholder }} + {{ if ne .collapsed false }}{{ partial "misc/expand" (dict "name" (printf "%scat" $in0)) }}{{ end }} +
+ + + +
+ + +
+
+ {{ range sort $finale }} + + {{ end }} +
+ {{ if eq .new true }} + + + {{ end }} +
+
+ +
+ + + + + + + + + + + {{ else }} + {{ if eq .name "name" }} +
+ + +
+
+ + +
+ {{ else if eq .name "address" }} +
+ + +
+
+ + +
+ +
+ + +
+ {{ else }} +
+
+ + +
+
+ {{ end }} + {{ end }} + +{{ end }} + +
diff --git a/themes/buha/layouts/partials/misc/expand.html b/themes/buha/layouts/partials/misc/expand.html new file mode 100644 index 00000000..3849662c --- /dev/null +++ b/themes/buha/layouts/partials/misc/expand.html @@ -0,0 +1,3 @@ + + + diff --git a/themes/buha/layouts/partials/misc/generator.html b/themes/buha/layouts/partials/misc/generator.html index 90ca4314..165e156c 100644 --- a/themes/buha/layouts/partials/misc/generator.html +++ b/themes/buha/layouts/partials/misc/generator.html @@ -4,36 +4,13 @@
{{ .Content }} -
+
-
- {{ partial "misc/generator/partials/input_line" (dict "name" "title" "mandatory" "true") }} - {{ partial "misc/generator/content" }} - {{ partial "misc/generator/partials/categories_and_tags.html" (dict "name" "categories" "expanded" "true" "new" "false") }} - {{ partial "misc/generator/partials/expand" (dict "id" "isevent" "name" "isevent" "translation" "aufklappen" ) }} -
- {{ partial "misc/generator/partials/input_line" (dict "name" "when" "mandatory" "false" "eg" "Montag, 13. September 2022, 19Uhr") }} - {{ partial "misc/generator/partials/input_line" (dict "name" "price" "mandatory" "false" "eg" "3€ or free") }} - {{ partial "misc/generator/partials/input_line" (dict "name" "registeremail" "mandatory" "false" "eg" "info@bunteshaus.de") }} - {{ partial "misc/generator/partials/categories_and_tags.html" (dict "name" "events" "new" "false") }} -
- {{ partial "misc/generator/partials/expand" (dict "id" "Verschiedenes" "name" "misc" "translation" "aufklappen" ) }} -
- {{ partial "misc/generator/partials/truefalse" (dict "name" "featured" "expanded" "true") }} - {{ partial "misc/generator/partials/truefalse" (dict "name" "about" "expanded" "true") }} - {{ partial "misc/generator/partials/categories_and_tags.html" (dict "name" "tags" "new" "true") }} - -
- - - - {{ partial "misc/generator/submit" }} - -
- +{{ if (index .Page.Params.forms 0) }} + {{ partial "form.html" (dict "context" . "form" 0) }} +{{ end }} - \ No newline at end of file + diff --git a/themes/buha/static/js/generator.js b/themes/buha/static/js/generator.js index 5210dfc6..95c7547c 100644 --- a/themes/buha/static/js/generator.js +++ b/themes/buha/static/js/generator.js @@ -34,12 +34,12 @@ function showInput(e) { var datestring = d.getFullYear() + "-" + ("0"+(d.getMonth()+1)).slice(-2) + "-" + ("0" + d.getDate()).slice(-2) + "T" + ("0" + d.getHours()).slice(-2) + ":" + ("0" + d.getMinutes()).slice(-2) + ":00+02:00\""; var form = document.querySelector('form[id="myform"]'); - var title = form.elements['newtitle'].value; + var title = form.elements['title'].value; var content = form.elements['content'].value; - var when = form.elements['newwhen'].value; + var when = form.elements['when'].value; // var covid = form.elements['newcovid'].value; - var price = form.elements['newprice'].value; - var registeremail = form.elements['newregisteremail'].value; + var price = form.elements['price'].value; + var registeremail = form.elements['contact'].value; var events = check_checkboxes('events'); if (form.elements['newevents']) { var newevents = testor(form.elements['newevents'].value.split(',')); } var categories = check_checkboxes('categories'); @@ -74,6 +74,23 @@ function showInput(e) { var ncategories = categories + "," + newcategories; } + + + if (newevents != '""') { + var nevents = newevents; + } + + if (events != '') { + var nevents = events; + } + + if (events != '' && newevents != '""') { + var nevents = events + "," + newevents; + } + + + + if (!title) { display.innerHTML += "Title is missing..
" @@ -106,8 +123,8 @@ function showInput(e) { display.innerHTML += "categories: \[" + ncategories + "]
"; } - if (events != '') { - display.innerHTML += "events: \[" + events + "]
"; + if (nevents != '') { + display.innerHTML += "events: \[" + nevents + "]
"; } if (ntags) {