small fixes

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.
 

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!

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.<!--more-->
 
-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.
+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.

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);
+	background: url(/images/logo_back_full.svg);
-}
-
-
-
-form label {
-  display: inline-block;
-  width: 100px;
-}
-
-form div {
-  margin-bottom: 10px;
 }
 
 .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) {...}
 

themes/buha/layouts/_default/baseof.html

@@ -23,4 +23,4 @@
                 </footer>
             </div>
     </body>
-</html>
+</html>

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 }}

themes/buha/layouts/partials/contentlayouts/article.html

@@ -75,6 +75,7 @@
 				{{- $thumb = $img.Resize "2048x" }}
 			{{ end }}
 		{{ end }}
+		
 		<div id="articleinner">
             {{ if ne $img "" }}
 			<div id="articlepicture" class="{{ $small }} borderrad25">

themes/buha/layouts/partials/form.html

@@ -0,0 +1,141 @@
+{{ $pageform := (index .context.Page.Params.forms .form) }}
+{{ $group := slice }}
+
+<form id="myform">
+
+
+{{ 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))}}
+        <div class="margin_top_1rem">
+            {{ .group }}
+            {{ partial "misc/expand" (dict "name" (printf "%sgroup" .group)) }}
+        </div>
+        {{ $group = $group | append .group }}
+
+    {{ end }}    
+    
+    {{ if eq .input_type "title" }}
+        <h3 {{ if .group }}class="visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ end }}>{{ .placeholder }}</h3>
+    {{ else if eq .input_type "textarea" }}
+        <div {{ if .group }}class="visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ end }}>
+            <label {{ if $pageform.placeholders }}sr-only{{ end }} for="{{ .name }}">{{ .placeholder }}{{ .Scratch.Get "requiredstar" }}</label>
+            <textarea name="{{ .name }}" id="{{ .name }}" rows="10" {{ if $pageform.placeholders }}placeholder="{{ .placeholder }}{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}></textarea>
+        </div>
+    {{ else if eq .input_type "radio" }}
+        <div class="radio {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ else }}"{{ end }}>
+            <label><input type="radio" name="{{ .name }}" id="{{ .name }}" value="{{ .placeholder }}" {{ .Scratch.Get "requiredtext" }}>{{ .placeholder }}</label>
+        </div>
+    {{ else if eq .input_type "checkbox" }}
+        <div class="checkbox {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ else }}"{{ end }}>
+            <label><input type="checkbox" name="{{ .name }}" id="{{ .name }}" value="{{ .placeholder }}" {{ .Scratch.Get "requiredtext" }}>{{ .placeholder }}</label>
+        </div>
+    {{ else if eq .input_type "results" }}
+          <div id='display' class="result" style="white-space: pre; display: none; background: var(--background-body); padding: .6rem 0 1rem 1rem;"></div>
+    {{ else if eq .input_type "submit" }}
+        <div class="margin_top_1rem {{ if .group }}visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ else }}"{{ end }}>
+            <input type="{{ .input_type }}" value="{{ i18n "generate" }}" onclick="showInput(event);" />
+        </div>
+
+        
+        
+        
+    
+    
+    
+    
+    {{ 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 -}}
+        
+        <div class="margin_top_1rem {{- if .group }} visibleIf" data-visibleif-rule="{{ .group }}group == 'true'"{{ else }}"{{ end }}  style="flex-direction: column;">
+            <div class="{{- if .group }}margin_left_1rem{{ end }}">
+                {{ .placeholder }}
+                {{ if ne .collapsed false }}{{ partial "misc/expand" (dict "name" (printf "%scat" $in0)) }}{{ end }}
+            </div>
+
+
+
+                <div class="visibleIf checkbox" data-visibleif-rule="{{ $in0 }}cat == 'true'">
+
+
+                        <div class="{{- if .group }}margin_left_1rem{{ end }} minmax" style="display: flex; flex-direction: column;">
+                        <fieldset id="{{ $in0 }}" name="{{ $in0 }}" style="display: flex; flex-direction: row; padding: 0; border: none;">
+                            {{ range sort $finale }}
+                                    <input type="checkbox" name="{{ $in0 }}" id="{{ $in0 }}-cat" value="{{ . }}"><label for="{{ $in0 }}-cat">{{ . }}</label>
+                            {{ end }}
+                        </fieldset>
+                        {{ if eq .new true }}
+                            <label id="label" for="new{{- .name -}}">{{ if i18n "new" }}{{ i18n "new" }}{{ else }}{{ "new" }}{{ end }}{{- if eq .required true -}}*{{- end -}}</label>
+                            <input type="text" name="new{{- .name -}}" id="new{{- .name -}}" value="" placeholder="{{ .eg }}" />
+                        {{ end }}
+                        </div>
+                </div>
+ 
+        </div>    
+   
+    
+    
+    
+    
+    
+    
+    
+        
+        
+    {{ else }}
+        {{ if eq .name "name" }}
+            <div class="half {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ else }}"{{ end }}>
+                <label class="{{ if $pageform.placeholders }}sr-only{{ end }}" for="firstname">First name{{ .Scratch.Get "requiredstar" }}</label>
+                <input type="text" name="firstname" id="firstname" {{ if $pageform.placeholders }}placeholder="First name{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+            </div>
+            <div class="half {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ else }}"{{ end }}>
+                <label class="{{ if $pageform.placeholders }}sr-only{{ end }}" for="lastname">Last name{{ .Scratch.Get "requiredstar" }}</label>
+                <input type="text" name="lastname" id="lastname" {{ if $pageform.placeholders }}placeholder="Last name{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+            </div>
+        {{ else if eq .name "address" }}
+            <div {{- if .group }} class="visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ end -}}>
+                <label class="{{ if $pageform.placeholders }}sr-only{{ end }}" for="address">Address{{ .Scratch.Get "requiredstar" }}</label>
+                <input type="text" name="address" id="address" {{ if $pageform.placeholders }}placeholder="Address{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+            </div>
+            <div class="half {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ else }}"{{ end }}>
+                <label class="{{ if $pageform.placeholders }}sr-only{{ end }}" for="city">City{{ .Scratch.Get "requiredstar" }}</label>
+                <input type="text" name="city" id="city" {{ if $pageform.placeholders }}placeholder="City{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+            </div>
+
+            <div class="half {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ else }}"{{ end }}>
+                <label class="{{ if $pageform.placeholders }}sr-only{{ end }}" for="postalcode">Postal code{{ .Scratch.Get "requiredstar" }}</label>
+                <input type="text" name="postalcode" id="postalcode" {{ if $pageform.placeholders }}placeholder="Postal code{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+            </div>
+        {{ else }}
+            <div class="margin_top_1rem {{ if .group }} visibleIf margin_left_1rem" data-visibleif-rule=" {{ .group }}group == 'true'"{{ else }}" {{ end }} class="minmax">
+                <div class="minmax" style="display: flex; flex-direction: column;">
+                    <label class="{{ if $pageform.placeholders }}sr-only{{ end }}" for="{{ .name }}">{{ .placeholder }}{{ .Scratch.Get "requiredstar" }}</label>
+                    <input type="{{ .input_type }}" name="{{ .name }}" id="{{ .name }}" {{ if $pageform.placeholders }}placeholder="{{ .placeholder }}{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+                </div>
+            </div>
+        {{ end }}
+    {{ end }}
+
+{{ end }}
+
+</form>

themes/buha/layouts/partials/misc/expand.html

@@ -0,0 +1,3 @@
+
+    <input type="checkbox" name="{{ .name }}" id="{{ .name }}" value="true" style="font-size: smaller;" />
+    <label for="{{ .name }}" style="font-size: smaller;"> {{ if i18n "expand" }}{{ i18n "expand" }}{{ else }}{{ "expand" }}{{ end }}</label>

themes/buha/layouts/partials/misc/generator.html

@@ -4,36 +4,13 @@
 <article class="minmax">
 <div style="flex-direction: row;">
 {{ .Content }}
-</div >
+</div>
 <noscript><p><b>Bitte aktiviere Javascript, sonst funktioniert der Generator nicht.</b></p></noscript>
 
-<form id="myform" style="display: flex; flex-shrink: 0; flex-grow: 1; flex-direction: column; max-width: 950px; margin-top: 1rem;">
+{{ if (index .Page.Params.forms 0) }}
-  {{ partial "misc/generator/partials/input_line" (dict "name" "title" "mandatory" "true") }}
+  {{ partial "form.html" (dict "context" . "form" 0) }}
-  {{ partial "misc/generator/content" }}
+{{ end }}
-  {{ 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" ) }}
-  <div style="flex-direction: column; margin-left: 2rem;" class="visibleIf" data-visibleif-rule="isevent == 'true'">
-    {{ 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") }}
-  </div>
-  {{ partial "misc/generator/partials/expand" (dict "id" "Verschiedenes" "name" "misc" "translation" "aufklappen" ) }}
-  <div style="flex-direction: column; margin-left: 2rem;" class="visibleIf" data-visibleif-rule="misc == 'true'">
-    {{ 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/partials/input_line" (dict "name" "covid" "mandatory" "false" "eg" "3G") }} -->
-  </div>
-
-  <div id='display' class="result" style="white-space: pre; display: none; background: var(--background-body); padding: .6rem 0 1rem 1rem;">
-  </div>
-
-  {{ partial "misc/generator/submit" }}
-
-</form>
-
 
 </article>
 <script defer language="javascript" type="text/javascript"  src="{{ "/js/visibleIf.js" | urlize | relURL }}"></script>
-<script defer language="javascript" type="text/javascript"  src="{{ "/js/generator.js" | urlize | relURL }}"></script>
+<script defer language="javascript" type="text/javascript"  src="{{ "/js/generator.js" | urlize | relURL }}"></script>

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 price = form.elements['price'].value;
-  var registeremail = form.elements['newregisteremail'].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..<br>"
@@ -106,8 +123,8 @@ function showInput(e) {
         display.innerHTML += "categories: \[" + ncategories + "]<br>";
     }
 
-    if (events != '') {
+    if (nevents != '') {
-        display.innerHTML += "events: \[" + events + "]<br>";
+        display.innerHTML += "events: \[" + nevents + "]<br>";
     }
     
     if (ntags) {