From ccab16c0b03034e42eff4ac0a60a33e2863455cf Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 5 Apr 2022 14:49:37 +0200
Subject: [PATCH] small fixes

---
 content/news/neue-seite/index.de.md           |  8 ---
 themes/buha/assets/css/layout.css             | 18 +++----
 themes/buha/layouts/_default/archive.html     |  2 +-
 themes/buha/layouts/_default/baseof.html      |  4 +-
 themes/buha/layouts/_default/contact.html     |  2 +-
 themes/buha/layouts/_default/imprint.html     |  2 +-
 themes/buha/layouts/_default/list.html        |  2 +-
 themes/buha/layouts/_default/orga.html        |  2 +-
 themes/buha/layouts/_default/rss.xml          | 12 +++--
 themes/buha/layouts/_default/single.html      |  3 --
 themes/buha/layouts/_default/taxonomy.html    |  2 +-
 .../partials/structure/article_meta.html      | 54 +++++++++++++------
 12 files changed, 61 insertions(+), 50 deletions(-)
 delete mode 100644 content/news/neue-seite/index.de.md

diff --git a/content/news/neue-seite/index.de.md b/content/news/neue-seite/index.de.md
deleted file mode 100644
index e460718..0000000
--- a/content/news/neue-seite/index.de.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "Neue Homepage"
-date: "2022-02-27T14:00:00+02:00"
----
-Wir präsentieren nun unsere neue Homepage.
-
-[Wir](https://buha.rotce.de/bunteshaus/homepage/) bauen diese mit hugo, git und ohne php oder cms.
-
diff --git a/themes/buha/assets/css/layout.css b/themes/buha/assets/css/layout.css
index 6f4c759..6d6b914 100644
--- a/themes/buha/assets/css/layout.css
+++ b/themes/buha/assets/css/layout.css
@@ -8,10 +8,15 @@
 	background: url(/images/logo_back_full.svg);
 }
 
-
+h1 {
+	margin-top: 1rem;
+	padding-top: 0;
+	margin-bottom: 0;
+	padding-bottom: 0;
+}
 
 main {
-	margin-top: 1rem;
+	margin-top: 2rem;
 }
 
 form label {
@@ -46,9 +51,7 @@ aside {
 }
 
 h1 {
-	margin-top: 0rem;
 	margin-left: .5rem;
-	padding-left: 0;
 }
 
 .right-sidebar {
@@ -139,7 +142,7 @@ article h3 {
 }
 
 #articlemeta {
-	margin-bottom: 1.5rem;
+	margin-bottom: 1rem;
 }
 
 #articlemeta div:first-child {
@@ -255,10 +258,7 @@ input, textarea {
 		display: none;
 	}
 
-	h1 {
-		margin-top: .5rem;
-		margin-bottom: 1rem;
-	}
+
 
 	#headerinner {
 		padding: 10px;
diff --git a/themes/buha/layouts/_default/archive.html b/themes/buha/layouts/_default/archive.html
index 04d1e69..591262b 100644
--- a/themes/buha/layouts/_default/archive.html
+++ b/themes/buha/layouts/_default/archive.html
@@ -3,7 +3,7 @@
     {{ if lower $name | i18n }}
             {{ $name = lower $name | i18n }}
     {{ end }}
-    {{ $name }}
+    <h1>{{ $name }}</h1>
 {{ end }}
 
 {{ define "main" }}
diff --git a/themes/buha/layouts/_default/baseof.html b/themes/buha/layouts/_default/baseof.html
index 1792d99..1d705be 100644
--- a/themes/buha/layouts/_default/baseof.html
+++ b/themes/buha/layouts/_default/baseof.html
@@ -10,9 +10,7 @@
                 </header>
                 <div class="content">
                     <main>
-                        <h1>
-                            {{ block "title" . -}}{{- end }}
-                        </h1>
+                        {{ block "title" . -}}{{- end }}
                         {{ block "main" . -}}{{- end }}
                     </main>
                     <aside class="right-sidebar">
diff --git a/themes/buha/layouts/_default/contact.html b/themes/buha/layouts/_default/contact.html
index 28b33a7..a704d79 100644
--- a/themes/buha/layouts/_default/contact.html
+++ b/themes/buha/layouts/_default/contact.html
@@ -3,7 +3,7 @@
     {{ if lower $name | i18n }}
             {{ $name = lower $name | i18n }}
     {{ end }}
-    {{ $name }}
+    <h1>{{ $name }}</h1>
 {{ end }}
 
 {{ define "main" }}
diff --git a/themes/buha/layouts/_default/imprint.html b/themes/buha/layouts/_default/imprint.html
index 9fd6271..64e72c7 100644
--- a/themes/buha/layouts/_default/imprint.html
+++ b/themes/buha/layouts/_default/imprint.html
@@ -3,7 +3,7 @@
     {{ if lower $name | i18n }}
             {{ $name = lower $name | i18n }}
     {{ end }}
-    {{ $name }}
+    <h1>{{ $name }}</h1>
 {{ end }}
 
 {{ define "main" }}
diff --git a/themes/buha/layouts/_default/list.html b/themes/buha/layouts/_default/list.html
index 180ee05..2585674 100644
--- a/themes/buha/layouts/_default/list.html
+++ b/themes/buha/layouts/_default/list.html
@@ -8,7 +8,7 @@
     	{{ end }}
     	{{ $name = $name  | humanize }}
     {{ end }}
-    {{ $name }}
+    <h1>{{ $name }}</h1>
 {{- end -}}
 
 {{- define "main" -}}
diff --git a/themes/buha/layouts/_default/orga.html b/themes/buha/layouts/_default/orga.html
index a20baf5..42d16b5 100644
--- a/themes/buha/layouts/_default/orga.html
+++ b/themes/buha/layouts/_default/orga.html
@@ -1,5 +1,5 @@
 {{ define "title" }}
-Orga
+<h1>Orga</h1>
 {{ end }}
 
 {{ define "main" }}
diff --git a/themes/buha/layouts/_default/rss.xml b/themes/buha/layouts/_default/rss.xml
index e06d000..b4a34ec 100644
--- a/themes/buha/layouts/_default/rss.xml
+++ b/themes/buha/layouts/_default/rss.xml
@@ -45,6 +45,10 @@
     {{ range .Params.tags }}
       {{ $tags = $tags | append . }}
     {{ end }}
+    {{ $images := slice }}
+    {{ range .Resources.ByType "image" }}
+      {{ $images = $images | append . }}
+    {{ end }}
     {{ $hash := slice $when $about $categories $events $covid $registeremail $price $price $featured $tags .Date .Lastmod .Title .Content }}
     {{ $hash = delimit $hash ", " }}
     {{ $hash = md5 $hash }}
@@ -56,18 +60,16 @@
       {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
       <guid>{{ .Permalink }}-{{ $hash }}</guid>
       <description>
-        {{- $c := .Content -}}
-        {{- $c := replace $c "<img" "<img width=\"600\"" -}}
+        {{- $c := replace .Content "<img" "<img width=\"600\"" -}}
         {{- if $when -}}
           {{- $c = printf "<p><b>%s</b></p>%s" $when $c -}}
         {{- end -}}
         {{- $img := index (.Resources.ByType "image") 0 -}}
         {{- with $img -}}
           {{- $img := .Resize "640x" -}}
-          {{- printf "<![CDATA[%s<img src=\"%s\" width=\"%d\" height=\"%d\" />]]>" $c $img.Permalink $img.Width $img.Height | safeHTML -}}
-        {{- else -}}
-          {{- printf "<![CDATA[%s]]>" $c | safeHTML -}}
+          {{- $c = printf "%s<img src=\"%s\" width=\"%d\" height=\"%d\" />" $c $img.Permalink $img.Width $img.Height -}}
         {{- end -}}
+        {{- printf "<![CDATA[%s]]>" $c | safeHTML -}}
       </description>
 
     </item>
diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html
index a8042a9..9791b26 100644
--- a/themes/buha/layouts/_default/single.html
+++ b/themes/buha/layouts/_default/single.html
@@ -1,6 +1,3 @@
-{{ define "title" }}
-{{ end }}
-
 {{ define "main" }}
 	{{ if eq .Description "nottranslated" }}
 		{{ partial "orga/nottranslated.html" . }}
diff --git a/themes/buha/layouts/_default/taxonomy.html b/themes/buha/layouts/_default/taxonomy.html
index 2e11398..6e91303 100644
--- a/themes/buha/layouts/_default/taxonomy.html
+++ b/themes/buha/layouts/_default/taxonomy.html
@@ -8,7 +8,7 @@
     	{{ end }}
     	{{ $name = $name  | humanize }}
     {{ end }}
-    {{ $name }}
+    <h1>{{ $name }}</h1>
 {{- end -}}
 
 {{- define "main" -}}
diff --git a/themes/buha/layouts/partials/structure/article_meta.html b/themes/buha/layouts/partials/structure/article_meta.html
index a41b0c5..0ee85cf 100644
--- a/themes/buha/layouts/partials/structure/article_meta.html
+++ b/themes/buha/layouts/partials/structure/article_meta.html
@@ -26,28 +26,50 @@
 		{{ end }}
 	{{ end }}
 {{ end }}
-		<div id="articlemeta" style="font-size: smaller;">
+
+{{ $showmeta := "false" }}
+{{ if and (ne .context.Params.when "") (ne .context.Params.when nil) }}
+	{{ $showmeta = "true" }}
+{{ end }}
+{{ if and (ne .context.Params.price "") (ne .context.Params.price nil) }}
+	{{ $showmeta = "true" }}
+{{ end }}
+{{ if and (ne .context.Params.registeremail "") (ne .context.Params.registeremail nil) }}
+	{{ $showmeta = "true" }}
+{{ end }}
+{{ if and (ne .context.Params.covid "") (ne .context.Params.covid nil) }}
+	{{ $showmeta = "true" }}
+{{ end }}
+{{ if and (ne .context.Params.contact "") (ne .context.Params.contact nil) }}
+	{{ $showmeta = "true" }}
+{{ end }}
+{{ if and (ne .context.Params.contact "") (ne .context.Params.contact nil) }}
+	{{ $showmeta = "true" }}
+{{ end }}
+{{ if eq $showmeta "true" }}
+	<div id="articlemeta" style="font-size: smaller;">
 		{{ if and (ne .context.Params.when "") (ne .context.Params.when nil) }}
 			<div>{{ .context.Params.when }}</div>
 		{{ end }}
-   		{{ if and (ne .context.Params.price "") (ne .context.Params.price nil) (eq $price "true") }}
+		{{ if and (ne .context.Params.price "") (ne .context.Params.price nil) (eq $price "true") }}
 			{{ if eq .context.Params.price "free" }}
 			        <div>Der Eintritt ist frei.</div>
 			{{ else }}
 			        <div>Eintritt: {{ .context.Params.price }}</div>
 			{{ end }}
 		{{ end }}
-        {{ if and (ne .context.Params.registeremail "") (ne .context.Params.registeremail nil) (eq $registeremail "true")}}
-                <div>Anmeldung unter {{ .context.Params.registeremail | markdownify }} erwünscht</div>
-        {{ else if and (ne .context.Params.registeremail "") (ne .context.Params.registeremail nil) (eq $registeremail "false")}}
-		{{ $.context.Scratch.Set "meta" "true" }}
-        {{ end }}
-        {{ if and (ne .context.Params.covid "") (ne .context.Params.covid nil) (eq $covid "true") }}
-                <div>Es gilt die {{ .context.Params.covid }} Regel</div>
-        {{ end }}
-        {{ if and (ne .context.Params.contact "") (ne .context.Params.contact nil) (eq $contact "true") }}
-                <div>Kontakt: <a href="mailto://{{ .context.Params.contact }}">{{ .context.Params.contact }}</a></div>
-        {{ else if and (ne .context.Params.contact "") (ne .context.Params.contact nil) (eq $contact "false") }}
-		{{ $.context.Scratch.Set "meta" "true" }}
-        {{ end }}
-		</div>
+		{{ if and (ne .context.Params.registeremail "") (ne .context.Params.registeremail nil) (eq $registeremail "true")}}
+			<div>Anmeldung unter {{ .context.Params.registeremail | markdownify }} erwünscht</div>
+		{{ else if and (ne .context.Params.registeremail "") (ne .context.Params.registeremail nil) (eq $registeremail "false")}}
+			{{ $.context.Scratch.Set "meta" "true" }}
+		{{ end }}
+		{{ if and (ne .context.Params.covid "") (ne .context.Params.covid nil) (eq $covid "true") }}
+			<div>Es gilt die {{ .context.Params.covid }} Regel</div>
+		{{ end }}
+		{{ if and (ne .context.Params.contact "") (ne .context.Params.contact nil) (eq $contact "true") }}
+			<div>Kontakt: <a href="mailto://{{ .context.Params.contact }}">{{ .context.Params.contact }}</a></div>
+		{{ else if and (ne .context.Params.contact "") (ne .context.Params.contact nil) (eq $contact "false") }}
+			{{ $.context.Scratch.Set "meta" "true" }}
+		{{ end }}
+	</div>
+{{ end }}
\ No newline at end of file