small fixes

content/archive.de.md

@@ -1,5 +1,4 @@
 ---
 title: "Archiv"
 layout: "archive"
-banner: false
 ---

content/contact/index.de.md

@@ -1,6 +1,6 @@
 ---
 title: "Kontakt"
-layout: "contact"
+layout: "contact_imprint"
 banner: false
 ---
 Konzerte: konzerte@bunteshaus.de

content/imprint.de.md

@@ -1,6 +1,6 @@
 ---
 title: "Impressum"
-layout: "generic_single"
+layout: "contact_imprint"
 banner: false
 ---
 Angaben gemäß § 5 TMG

content/links.de.md

@@ -1,10 +0,0 @@
----
-title: "Links"
-layout: "links"
-banner: false
----
-http://list-celle.over-blog.com/  
-Gruppe LiST: Land in Sicht - Transition Celle
-
-https://rheinmetallentwaffnen.noblogs.org/  
-Aktionstage, Camp & Demonstration “Rheinmetall entwaffnen” in Unterlüß

content/links/_index.de.md

@@ -0,0 +1,5 @@
+---
+title: "Links"
+layout: "links"
+banner: false
+---

content/links/list.md

@@ -0,0 +1,4 @@
+---
+title: "Gruppe LiST: Land in Sicht - Transition Celle"
+link: "https://list-celle.over-blog.com/"
+---

content/links/rheinmetall.md

@@ -0,0 +1,4 @@
+---
+title: "Aktionstage, Camp & Demonstration “Rheinmetall entwaffnen” in Unterlüß"
+link: "https://rheinmetallentwaffnen.noblogs.org/"
+---

content/misc/tools/generator.de.md

@@ -17,21 +17,25 @@ forms:
         placeholder: "Untitled Band \"Rocken in Häusern\"-Tour"
       - title: description
         input_type: text
-        name: "Beschreibung/Summary"
+        name: "Beschreibung"
         placeholder: "Wir feiern die 300jährige Tour und können das mit ca 30 Worten umreissen."
+      - title: summary
+        input_type: textarea
+        name: "Zusammenfassung"
+        buttons: "headline,Überschrift;url,URL;pic,Bild;bold,Fett;paragraph,Absatz;newline,Neue Zeile"
+        placeholder: "Einfach losschreiben. Der erste Absatz wird die Zusammenfassung in Artikelübersichten. Denke an die Formatierungshilfe hinter dem Link oben."
       - title: content
         input_type: textarea
         name: "Inhalt"
-        buttons: "headline,Überschrift;url,URL;pic,Bild;bold,Fett;paragraph,Absatz;newline,Neue Zeile;more,Mehr"
-        button_target: content
+        buttons: "headline,Überschrift;url,URL;pic,Bild;bold,Fett;paragraph,Absatz;newline,Neue Zeile"
         required: true
-        placeholder: "Einfach losschreiben. Der erste Absatz wird die Zusammenfassung in Artikelübersichten. Denke an die Formatierungshilfe hinter dem Link oben."
+        placeholder: "Denke an die Formatierungshilfe hinter dem Link oben."
       - title: categories
         input_type: rb
         name: "Kategorie"
         expanded: true
         new: "Neue Kategorie"
-        help: "gerne Plural, möglichst wenige"
+        help: "gerne Plural, möglichst nur Eine"
         placeholder: "Pressemitteilungen"
       - title: when
         group: events

content/newsletter.de.md

@@ -1,7 +1,6 @@
 ---
 title: "Newsletter"
 layout: "generic_single"
-banner: false
 ---
 Wenn ihr in unseren Newsletter aufgenommen werden wollt, schickt uns eine email!
 

docs/todo

@@ -1,4 +1,8 @@
 todo buha.de
+
+- banner missing anzeige soll nur asset anzeigen, wenn nicht single
+
+
 - anleitung git proxy fuer tor
 - eintritt "gegen spende"
 - diskutieren, ob jede aenderung via rss raus soll (lastmod vs einmalig) (erstellung und lastmod gt date werden erstellt)

themes/buha/assets/scss/banner.scss

@@ -1,37 +1,41 @@
-
+.b {
+  height: calc(100vw / 3.5);
+}
+.b_index {
+  height: calc(100vw / 3);
+}
 .banner {
-	width: 98vw;
-    height: calc(100vw / 3.5);
-    //box-shadow: inset 0px -11px 8px -10px #444;
-    background-repeat: no-repeat;
-    background-size: 100%;
-    background-position: 50% 5rem;
-    background-attachment: fixed;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-end;
-    .title_index {
-      word-break: break-all;
-      color: var(--text-main);
-      background: var(--background-body-opaq);
-      text-align: center;
-      margin-bottom: 0;
-      text-shadow: 0px 4px 3px rgba(0,0,0,0.4),
-            0px 8px 13px rgba(0,0,0,0.1),
-            0px 18px 23px rgba(0,0,0,0.1);
-      
-    }
-    .title {
-      background: var(--background-body-opaq);
-      word-break: break-all;
-      color: var(--text-main);
-      margin-bottom: 0;
-      text-align: center;
-      text-shadow: 0px 4px 3px rgba(0,0,0,0.4),
-            0px 8px 13px rgba(0,0,0,0.1),
-            0px 18px 23px rgba(0,0,0,0.1);
-      
-    }
+  width: 98vw;
+  //box-shadow: inset 0px -11px 8px -10px #444;
+  background-repeat: no-repeat;
+  background-size: 100%;
+  background-position: 50% 5rem;
+  background-attachment: fixed;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+  .title_index {
+    word-break: break-all;
+    color: var(--text-main);
+    background: var(--background-body-opaq);
+    text-align: center;
+    margin-bottom: 0;
+    text-shadow: 0px 4px 3px rgba(0,0,0,0.4),
+          0px 8px 13px rgba(0,0,0,0.1),
+          0px 18px 23px rgba(0,0,0,0.1);
+    
+  }
+  .title {
+    background: var(--background-body-opaq);
+    word-break: break-all;
+    color: var(--text-main);
+    margin-bottom: 0;
+    text-align: center;
+    text-shadow: 0px 4px 3px rgba(0,0,0,0.4),
+          0px 8px 13px rgba(0,0,0,0.1),
+          0px 18px 23px rgba(0,0,0,0.1);
+    
+  }
 }
 
 @media (min-width: 640px) {

themes/buha/assets/scss/generator.scss

@@ -11,9 +11,19 @@ fieldset {
 }
 
 #result {
-    white-space: pre; display: none; background: var(--background-body);
+    white-space: pre; display: none; background: var(--background-alt);
     padding: 1rem 0 1rem 1rem; 
     margin-top: 1rem;
     -webkit-user-select: all;
     user-select: all;
+    margin-bottom: 1rem;
+}
+
+form {
+    width: 80vw;
+    max-width: 1280px;
+    button {
+        font-size: .8em;
+        padding: .5em;
+    }
 }

themes/buha/layouts/_default/list.html

@@ -34,6 +34,8 @@
         {{ else if eq .Section "recurrent" }}
             {{- $pages = where $pages ".Params.recurrent" "=" true -}}
         {{ end }}
+    {{ else if eq .Layout "links" -}}
+        {{- $pages = .Data.Pages -}}
     {{ else }}
         {{ if eq .Kind "term" }}
             {{- $pages = .Data.Pages -}}

themes/buha/layouts/_default/single.html

@@ -10,7 +10,7 @@
         {{ $partial = "layout/generator" }}
    {{ else if eq .Params.tool "nottranslated" }}
         {{ $partial = "layout/nottranslated" }}
-    {{ else if or (eq .Layout "contact") (eq .Layout "imprint") }}
+    {{ else if eq .Layout "contact_imprint" }}
         {{ $partial_before = "snippets/contact" }}
         {{ $partial = printf "layout/%s" .Layout }}
     {{ else if eq .Layout "archive" }}

themes/buha/layouts/partials/layout/archive.html

@@ -3,7 +3,6 @@
 
 {{ end }}
 <section>
-{{ partial "debug" (dict "context" . "caller" "archive.html" )}}
 {{ $prev := 3000}}
 {{range where site.RegularPages "Type" "in" site.Params.searchSections }}
     {{ $date := .Date }}

themes/buha/layouts/partials/layout/article.html.old

@@ -1,132 +0,0 @@
-{{ $metas := dict "when" .context.Params.when "price" .context.Params.price "contact_mail" .context.Params.contact_mail "covid" .context.Params.covid "insta" .context.Params.insta }}
-{{ if eq .type "list" }}
-    {{ $metas = dict "when" .context.Params.when "price" .context.Params.price }}
-{{ end }}
-{{ $type := .type }}
-
-{{ $pic := "solo" }}
-{{ $text := "solo" }}
-{{ if eq $type "list" }}
-    {{- if and (.context.Resources.ByType "image") (.context.Content) -}}
-        {{ $pic = "multiple_small" }}
-        {{ $text = "multiple_big" }}
-    {{ else if and (.context.Resources.ByType "image") (not (.context.Content)) }}
-        {{ $pic = "multiple_medium" }}
-    {{ end }}
-{{ end }}
-{{ partial "snippets/article_metadata" $metas }}
-<div class="articleinner">
-    {{ $i := .context.Resources.ByType "image" }}
-    {{- if .context.Content -}}
-        {{ if eq $type "list" }}
-            {{ if .context.Resources.Match "banner*" }}
-                <div class="articlepicture {{ $pic }}">
-                    {{ range $i }}
-                        {{ if hasPrefix .Name "banner" }}
-                            {{ $img := . }}
-                            {{ $thumb := $img.Resize "500x" }}
-                        <img src="{{ $thumb.Permalink }}" />
-                        {{- end }}
-                    {{- end }}
-                </div>
-            {{- end }}
-        {{ end }}
-        <div class="articletext {{ $text }}">
-            {{ if eq .type "list" }}{{- .context.Summary -}}{{ else }}{{- .context.Content -}}{{ end }}
-            {{ if and .context.Truncated (eq .type "list") }}
-                <div class="readmore">{{- if i18n "readmore" -}}{{- i18n "readmore" -}}{{- else -}}{{- "readmore" -}}{{- end -}}..</div>
-            {{ end }}
-        </div>
-    {{ else }}
-        {{ if eq $type "article" }}
-            <div style="display:flex; flex-direction: column;">
-            {{ range $i }}
-                {{ if not (hasPrefix .Name "banner") }}
-                    {{ $img := . }}
-                    {{ $thumb := $img.Resize "500x" }}
-                    <a href="{{ $img.Permalink }}"><img src="{{ $thumb.Permalink }}" /></a>
-                {{- end }}
-            {{- end }}
-            </div>
-        {{ else }}
-            {{ range first 1 $i }}
-                {{ if not (hasPrefix .Name "banner") }}
-                    {{ $img := . }}
-                    {{ $thumb := $img.Resize "500x" }}
-                    <img src="{{ $thumb.Permalink }}" />
-                {{- end }}
-            {{- end }}
-        {{ end }}
-    {{- end }}
-</div>
-
-
-{{ define "pagefooter" }}
-    {{ if and (eq .Kind "page") (or (eq .Section "news") (eq .Section "events") (eq .Section "about")) }}
-		<div class="article_footer">
-            {{ with .Params.foundations }}
-                <b>Träger der Veranstaltung:</b>
-                <div class="article_footer_foundations1">
-                    {{ range . }}
-                        {{ $l := . }}
-                        {{ $url := "" }}
-                        {{ if isset site.Params.foundations $l }}
-                            {{ $url = index site.Params.foundations $l }}
-                        {{ end }}
-                        
-                    
-                        {{- $res_im := resources.GetMatch (printf "/images/foundations/%s*" $l ) -}}
-                        {{ if $res_im }}
-                            <div class="article_footer_item1">
-                                {{ if $url }}<a href="{{ $url | safeHTML }}">{{ end }}<img src="{{- $res_im.Permalink -}}" class="borderrad4px article_footer_item1" /> {{ if $url }}</a>{{ end }}
-                            </div>
-                        {{ else }}
-                            <div class="article_footer_item1">
-                                assets/images/foundations/{{- $l -}} .* missing
-                            </div>
-                        {{ end }}
-                    {{ end }}
-                </div>
-            {{ end }}
-            <div class="article_footer_foundations2">
-                <div class="article_footer_item2">
-                    <b>{{ if i18n "created" }}{{ i18n "created" }}{{ else }}{{ "Created" }}{{ end }}</b>
-                    {{ .Date | time.Format ":date_full" }}
-                </div>
-                {{ if ne .Date .Lastmod }}	
-                    <div class="article_footer_item2">
-                        <b>{{ if i18n "lastmod" }}{{ i18n "lastmod" }}{{ else }}{{ "Last modification" }}{{ end }}</b>
-                        {{ .Lastmod | time.Format ":date_full" }}
-                    </div>
-                {{ end }}
-            </div>
-		</div>
-    {{ end }}
-{{ end }}
-
-
-{{ define "sidebar" }}
-    {{ if ne .Type "tools" }}
-    <aside class="sidebar">
-        {{ if .Params.categories }}
-            <h3 class="align_menu">{{ if i18n "categories" }}{{ i18n "categories" }}{{ else }}{{ "Categories" }}{{ end }}</h3>
-            {{ range .Params.categories }}
-            <div class="align_menu"><a href="{{ "/categories/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></div>
-            {{ end }}
-        {{ end }}
-        {{ if .Params.events }}
-            {{ range .Params.events }}
-            <div class="align_menu"><a href="{{ "/events/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></div>
-            {{ end }}
-        {{ end }}
-        
-        {{ if .Params.tags }}
-            <h3 class="align_menu"><a href="{{ "/tags/" | relLangURL }}">{{ if i18n "tags" }}{{ i18n "tags" }}{{ else }}{{ "Tags" }}{{ end }}</a></h3>
-            {{ range .Params.tags }}
-            <div class="align_menu"><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></div>
-            {{ end }}
-        {{ end }}
-        
-    </aside>
-	{{ end }}
-{{ end }}

themes/buha/layouts/partials/layout/generator/form.html

@@ -1,7 +1,7 @@
 {{ $pageform := (index .context.Page.Params.forms .form) }}
 {{ $group := slice }}
 {{ $divide := .context.Page.Params.divide }}
-<form id="myform">
+<form id="generatorform">
 
 
 {{ range $pageform.fields }}
@@ -27,14 +27,13 @@
     {{ else if eq .input_type "textarea" }}
         <div class="w100 {{ if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true' {{ end }}">
             <label class="w100 {{ if $pageform.names }}sr-only{{ end }}" for="{{ .title }}">{{- $name -}}{{- if .required -}}{{- " *" -}}{{- end -}}</label>
-            {{ $button_target := .button_target }}
+            {{ $button_target := .title }}
             {{ range split .buttons ";"}}
                 {{ $b := split . ","}}
-                {{ $name := index $b 0 }}
                 {{ $translation := index $b 1 }}
-                {{ $nn := printf "%s-%s" $button_target $name}}
-                {{ $nn }}
-                <button onclick="button({{ $nn }})" value="{{ $name }}">{{ $translation }}</button>
+                {{ $n := index $b 0 }}
+                {{ $nn := printf "%s;%s" $button_target $n}}
+                <button onclick="button({{- $nn -}})" type="button" value="{{ $n }}">{{ $translation }}</button>
             {{ end }}
             <textarea class="w100" name="{{ .title }}" id="{{ .title }}" rows="10" {{ if .placeholder }}placeholder="{{ .placeholder }}"{{ end }}></textarea>
         </div>

themes/buha/layouts/partials/layout/links.html

@@ -0,0 +1,26 @@
+{{ $title := .title }}
+
+{{ $p := .pages }}
+{{ if and (.limit) (not .paginate) }}
+	{{ $p = first .limit .pages }}
+{{ end }}
+
+{{ $paginator := .pages }}
+{{ if .paginate }}
+	{{ $paginator = .context.Paginate $p }}
+	{{ $p = $paginator.Pages }}
+{{ end }}
+
+
+
+{{ if $p }}
+	<div style="display: flex; flex-direction: column;">
+	{{ range $p }}
+		<a href="{{ .Params.Link }}">
+			<p>{{ .Title }}<br>
+			{{ .Params.Link }}
+			</p>
+		</a>
+	{{ end }}
+	</div>
+{{ end }}

themes/buha/layouts/partials/snippets/banner.html

@@ -16,15 +16,21 @@
     {{ end }}
 {{ end }}
 {{ $title_class := safeCSS "title" }}
+{{ $css := safeCSS "b" }}
 {{ if .IsHome }}
+    {{ $css = safeCSS "b_index" }}
     {{ $title_class = safeCSS "title_index" }}
 {{ end }}
-{{ $banner := printf "/images/banner/%s*" $what }}
+{{ $banner := string (printf "/images/banner/%s*" $what) }}
 {{ if resources.GetMatch $banner }}
     {{  $img = resources.GetMatch $banner }}
 {{ end }}
-{{ if and (resources.GetMatch $banner) (ne .Params.banner false) }}
-    <div style="background-image: url({{- $img.Permalink -}})" class="banner">
+{{ $single := false }}
+{{ if and (in .File "news/") (not (in .File "_index"))}}
+    {{ $single = true }}
+{{ end }}
+{{ if and (ne $img "none") (ne .Params.banner false) }}
+    <div style="background-image: url({{- $img.Permalink -}})" class="banner {{ $css }}">
         {{ if not .IsHome }}<h1 class="{{ $title_class }}">{{ $title }}</h1> {{ end }}
         {{ if eq hugo.Environment "development" }}
             <div>
@@ -53,7 +59,7 @@
     </div>
 {{ else if and (.Resources.Match "banner*") (ne .Params.banner false) }}
         {{ $img = .Resources.GetMatch "banner*" }}
-    <div style="background-image:url({{- $img.Permalink -}})" class="banner">
+    <div style="background-image:url({{- $img.Permalink -}})" class="banner {{ $css }}">
         {{ if not .IsHome }}<h1 class="{{ $title_class }}">{{ $title }}</h1> {{ end }}
         {{ if eq hugo.Environment "development" }}
             <div>
@@ -82,7 +88,7 @@
     </div>
 {{ else if and (.Resources.ByType "image") (ne .Params.banner false) (not true) }}
         {{ $img = index (.Resources.ByType "image") 0 }}
-    <div style="background-image: url({{- $img.Permalink -}})" class="banner">
+    <div style="background-image: url({{- $img.Permalink -}})" class="banner {{ $css }}">
         {{ if not .IsHome }}<h1 class="{{ $title_class }}">{{ $title }}</h1> {{ end }}
         {{ if eq hugo.Environment "development" }}
             <div>
@@ -110,13 +116,24 @@
         {{ end }}
     </div>
 {{ else }}
-    <div class="banner">
+    <div class="banner {{ $css }}">
         {{ if not .IsHome }}<h1 class="{{ $title_class }}">{{ $title }}</h1> {{ end }}
         {{ if eq hugo.Environment "development" }}
+            {{ $str1 := printf "assets/images/banner/%s* missing.." $what }}
+            {{ $str2 := printf "content//banner* missing.." }}
+            {{ with .File }}
+                {{ $str2 = printf "content/%s/banner* missing.." .Dir }}
+            {{ end }}
             <p>
-            assets/images/banner/{{ $what -}}.* missing..<br>
-            or<br>
-            {{ with .File }}content/{{ .Dir }}/banner* missing..{{ end }}
+                {{ if eq .Params.banner false }}
+                    banner is off
+                {{ else }}
+                    {{ if eq $single true }}
+                        {{ $str2 }}
+                    {{ else if eq $single false }}
+                        {{ $str1 }}
+                    {{ end }}
+                {{ end }}
             </p>
         {{ end }}
     </div>

themes/buha/static/js/generator.js

@@ -23,15 +23,16 @@ function Clear(name)
       ele[i].checked = false;
 }
 
-function typeInTextarea(newText, el = document.getElementById('content')) {
-  const [start, end] = [el.selectionStart, el.selectionEnd];
-  el.setRangeText(newText, start, end);
-}
 
 function button(str) {
-  const arr = str.split("-");
-  let target = arr[0];
+  var arr = str.split(";");
   let x = arr[1];
+  let target = arr[0];
+  var id = document.getElementById(target);
+  function typeInTextarea(newText, el = document.getElementById(target)) {
+    const [start, end] = [el.selectionStart, el.selectionEnd];
+    el.setRangeText(newText, start, end);
+  }
   if (x == "url") {
     let url = prompt("Please enter URL", "https://wikipedia.org");
     if (url != null) {
@@ -61,12 +62,11 @@ function button(str) {
     var out = "  \n";
   }
   if (x == "more") {
-    var out = "\n<!--more-->\n\n";
+    var out = "\n\n<!--more-->\n\n";
   }
   if (out != null) {
     typeInTextarea(out);
-    const id = document.getElementById(target);
-    const end = id.value.length;
+    var end = id.value.length;
     id.setSelectionRange(end, end);
     id.focus();
   }
@@ -88,7 +88,6 @@ function showInput(e) {
   document.getElementById("result").innerHTML = '';
   e.preventDefault();
   document.getElementById("result").style.display = "flex";
-  var output_info = document.getElementById("myform");
   var display = document.getElementById("result");
 
 
@@ -96,9 +95,10 @@ function showInput(e) {
   var d = new Date();
   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 form = document.querySelector('form[id="generatorform"]');
   var title = form.elements['title'].value;
   var description = form.elements['description'].value;
+  var summary = form.elements['summary'].value;
   var content = form.elements['content'].value;
   var when = form.elements['when'].value;
   var covid = form.elements['covid'].value;
@@ -180,9 +180,6 @@ function showInput(e) {
     var nfoundations = foundations + "," + newfoundations;
   }
 
-  
-  
-
   if (!title) {
     display.innerHTML += "Title is missing..<br>"
   }
@@ -190,15 +187,15 @@ function showInput(e) {
 
   if (title) {
     display.innerHTML += "---<br>";
-    display.innerHTML += "title: \"" + title + "\"<br>";
+    display.innerHTML += "title: \"" + title.trim() + "\"<br>";
     
     if (lastmod) {
-        display.innerHTML += "lastmod: " + lastmod + "<br>";
+        display.innerHTML += "lastmod: " + lastmod.trim() + "<br>";
     } else {
-        display.innerHTML += "date: " + datestring + "<br>";
+        display.innerHTML += "date: " + datestring.trim() + "<br>";
     }
     if (description) {
-      display.innerHTML += "description: \"" + description + "\"<br>";
+      display.innerHTML += "description: \"" + description.trim() + "\"<br>";
     }
     
     if (featured != '') {
@@ -246,13 +243,13 @@ function showInput(e) {
         display.innerHTML += "insta: \"" + insta + "\"<br>";
     }
     display.innerHTML += "---<br>";
+    if (summary) {
+      display.innerHTML += summary.trim() + "\n" + "&lt;!--more--&gt;" + "\n";
+    }
     if (content) {
-      display.innerHTML += content;
+      display.innerHTML += content.trim();
     }
   }
-    const textarea = document.getElementById('result');
-    var end = textarea.length;
-    textarea.focus();
 }