small fixes

content/news/foodsaving/index.de.md

@@ -6,18 +6,21 @@ when: "Jeden Mittwoch 18:30-19:00Uhr & Samstags 15:00-15:30Uhr"
 events: ["Regelmäßig"]
 contact: "foodsavingcelle@riseup.net"
 ---
-Die kostenfreie Verteilung von gespendeten und geretteten Lebensmitteln geht auch nach der Wiedereröffnung der Tafel weiter. Wann? Immer Mittwochs von 18.30 bis 19 Uhr und Samstags von 15 bis 15.30 Uhr. Spenden?  Mitmachen? Wer mitmachen oder uns unterstützen möchte, kann sich per Mail melden, sodass wir bei Bedarf nachfragen können.
+Die **kostenfreie** Verteilung von gespendeten und geretteten **Lebensmitteln** geht auch nach der Wiedereröffnung der Tafel weiter.  
-<!--more-->
+Spenden? Mitmachen? Wer **mitmachen** oder uns unterstützen möchte, kann sich per Mail melden, sodass wir bei Bedarf nachfragen können.
-Pressemitteilung 12. Mai 2020
 
-Food-Saving macht weitere Verteilungen
+<!--more-->
+
+### Pressemitteilung 12. Mai 2020
+
+#### Food-Saving macht weitere Verteilungen
 
 Die Initiative "Foodsaving Celle" hat sich ein neues Verteilkonzept überlegt. Nachdem die Tafel wieder geöffnet und damit die Häufigkeit und Menge der Lebensmittelspenden sich auch verringert hat, geht es trotzdem weiter mit öffentlichen Lebensmittelausgaben.
 
-{{< picture 1 "Zeitungsauschnitt" >}}
 
 Gerettete Lebensmittel freuen sich nun auf geregelte Öffnungszeiten: Die Foodsaving-Initiative des Vereins Buntes Haus e.V. richtet ab dem heutigen Mittwoch feste Abholtermine ein. Menschen, die gerettete Lebensmittel abholen möchten werden mittwochs von 18:30-19:00 Uhr und samstags von 15:00-15:30 Uhr im Essensladen (analog zum Umsonstladen vielleicht einen cooleren Titel?)am Bunten Haus bedient.
 
+
 "Es gibt auch nach Wiederöffnung der Tafeln weiterhin sowohl den Bedarf für Unterstützung als auch den Zustand, dass leider immer noch viele Nahrungsmittel im Müll landen. Viele Menschen haben mitbekommen, wie viel Essen immer wieder gerettet wird - und freuen sich über die ökologisch und ökonomisch sinnvolle Verschenkaktion. Vor allem Backwaren haben wir in großen Mengen - mindestens diese gibt es weiterhin Mittwochs und Samstags.
 
 Und wir möchten mit weiteren Betrieben eine Kooperation aufnehmen: Lassen Sie uns gemeinsam eine Alternative aufbauen, sodass weniger im Müll landet und Unterstützung mehr Menschen erreicht!", sagt Nina Singers von der Initiative.
@@ -26,9 +29,10 @@ Die Freiwilligen, die die Initiative aufrecht erhalten, wollen mit ihrer Arbeit
 
 Es gibt jetzt keine vorgepackten Taschen mehr. Die Lebensmittelausgabe erfolgt unter Beachtung von Abstands- und Hygieneregeln.
 
+{{< picture 1 "Zeitungsauschnitt" >}}
  
 
-Pressemitteilung vom 27. März 2020:
+### Pressemitteilung vom 27. März 2020:
 
 Die Celler Tafel, soziale Treffs und Hilfseinrichtungen haben geschlossen. Menschen verlieren ihren Lohn, ihre Arbeit, können Miete und Essen nicht bezahlen – gleichzeitig werden immer noch Unmengen an Lebensmitteln weggeschmissen.
 

content/news/umsonstladen/index.de.md

@@ -4,8 +4,6 @@ date: "1993-09-04T19:00:00+02:00"
 when: "Jeden Dienstag von 16.00 bis 18.00 Uhr"
 about: true
 events: ["Regelmäßig"]
-price: "free"
-covid: "3g"
 ---
 Mit einer kleinen Feier hat der erste Umsonst-Laden in Celle eröffnet. In den vom Hof zugänglichen Raum ist der U-Laden eingezogen.  
 

themes/buha/assets/css/layout.css

@@ -8,6 +8,8 @@
 	background: url(/images/logo_back_full.svg);
 }
 
+
+
 form label {
   display: inline-block;
   width: 100px;
@@ -103,6 +105,10 @@ p a {
 	text-decoration: underline;
 }
 
+#articletitle h2 {
+	margin-top: 0;
+}
+
 article a:hover {
 	text-decoration: none;
 }
@@ -119,15 +125,13 @@ article {
 	display: flex;
 	flex-direction: column;
 	margin-bottom: 2rem;
-	padding: 1rem 0 1rem 1rem;
+	padding: 1rem 1rem 1rem 1rem;
 }
 
-article h2 {
+#articletext img {
-	margin: 0;
+	margin: 1.5rem 1.5rem 3rem 2rem;
-}
+	border-radius: 15px;
-
+	width: 80%;
-article h3 {
-	margin: 0;
 }
 
 #articlemeta {
@@ -172,7 +176,6 @@ article h3 {
 	background-color: var(--background);
 }
 
-
 #nav-posts {
 	display: flex;
 	flex-direction: column;
@@ -220,11 +223,6 @@ input, textarea {
 	flex: 0 0 100%;
 }
 
-.picture_outer {
-	padding: 1.5rem 1.5rem 3.5rem 1.5rem;
-	border: 1px solid var(--background-body);
-}
-
 .borderrad25 {
 	border-radius: 15px;
 }

themes/buha/i18n/de.toml

@@ -67,6 +67,9 @@ other = "English"
 [ku]
 other = "Kurdî"
 
+[or]
+other = "oder"
+
 [all]
 other = "Alle"
 
@@ -74,4 +77,13 @@ other = "Alle"
 other = "Titel"
 
 [isevent]
-other = "Ist es ein Termin?"
+other = "Ist es ein Termin?"
+
+[entry]
+other = "Eintritt"
+
+[freeentry]
+other = "Der Eintritt ist kostenlos."
+
+[register]
+other = "Anmeldung"

themes/buha/layouts/_default/contact.html

@@ -10,41 +10,6 @@
 {{- $pic := index (.Resources.ByType "image") 0 -}}
 
 <article>
-    <div id="articlecontent">
+    {{ partial "contentlayouts/article.html" (dict "context" . "type" "article") }}
-        {{ partial "structure/article_meta" (dict "context" . "visible" "all") }}
-        {{ $small := "solo" }}
-        {{ $big := "solo" }}
-        {{ $placeholder := "/images/placeholder_article.jpg" }}
-        {{ $img := resources.Get $placeholder }}
-        {{- if or (.Resources.ByType "image") (.Content) ($img) -}}
-            {{ $small = "multiple_small" }}
-            {{ $big = "multiple_big" }}
-        {{ else }}
-            {{ $small = "multiple_big"}}
-        {{ end }}
-        <div id="articleinner">
-            {{- if .Resources.ByType "image" -}}
-                {{- $pic := index (.Resources.ByType "image") 0 -}}
-                {{- $thumb := $pic.Resize "2048x" }}
-                {{ if ne .Content "" }}
-                    {{- $thumb = $pic.Resize "1024x" }}
-                {{ end }}
-                <div id="articlepicture" class="{{ $small }} borderrad25">
-                    <img src="{{- $thumb.Permalink -}}" class="borderrad25" />
-                </div>
-            {{ else if $img }}
-                {{- $img = $img.Resize "1024x" }}
-                <div id="articlepicture" class="{{ $small }} borderrad25">
-                    <img src="{{- $img.Permalink -}}" class="borderrad25" />
-                </div>
-            {{ end }}
-            {{- if .Content -}}
-                <div id="articletext" class="{{ $big }}">
-                    {{ partial "contact.html" }}
-                    {{- .Content -}}
-                </div>
-            {{- end }}
-        </div>
-    </div>
 </article>
 {{ end }}

themes/buha/layouts/_default/list.html

@@ -12,22 +12,30 @@
 {{- end -}}
 
 {{- define "main" -}}
-    {{ $s := .Site.Params }}
+	{{ $title := lower .Title }}
-    {{- $paginator := slice -}}
+	{{ $s := .Site.Params }}
-    {{- $paginator = .Paginate .Data.Pages.ByDate.Reverse -}}
+	{{- $paginator := slice -}}
-    {{ if eq $paginator.PageNumber 1 }}
+	{{ $what := printf ".Params.%s" $title }}
-        {{ if ne .Content "" }}
+	{{ if or (eq $title "about") (eq $title "featured") }}
-        <article>
+		{{- $paginator = .Paginate (where (where .Site.RegularPages "Type" "in" site.Params.searchSections) $what "eq" true) -}}
-            {{ .Content }}
+	{{ else if eq $title "events" }}
-        </article>
+		{{- $paginator = .Paginate (where (where .Site.RegularPages "Type" "in" site.Params.searchSections) ".Params.when" "ne" nil) -}}
-        {{ end }}
+	{{ else }}
-    {{ end }}
+		{{- $paginator = .Paginate .Data.Pages -}}
-    {{- range first 5 $paginator.Pages -}}
+	{{ end }}
-        {{ partial "structure/list_article.html" . }}
+	{{ if eq $paginator.PageNumber 1 }}
-    {{- end }}
+		{{ if ne .Content "" }}
-    {{ partial "structure/paginator" (dict "paginator" $paginator) }}
+		<article>
+			{{ .Content }}
+		</article>
+		{{ end }}
+	{{ end }}
+	{{- range first 5 $paginator.Pages -}}
+		{{ partial "contentlayouts/list.html" . }}
+	{{- end }}
+	{{ partial "structure/paginator" (dict "paginator" $paginator) }}
 {{- end -}}
 
 {{ define "sidebar" }}
-	{{- partial "structure/empty" . }}
+	{{- partial "contentlayouts/menu.html" . }}
 {{ end }}

themes/buha/layouts/_default/single.html

@@ -1,4 +1,10 @@
-
+{{ define "title" }}
+    {{ $name := .Title }}
+    {{ if lower $name | i18n }}
+            {{ $name = lower $name | i18n }}
+    {{ end }}
+    <h1>{{ $name }}</h1>
+{{ end }}
 
 
 {{ define "main" }}
@@ -7,7 +13,9 @@
 	{{ else if eq .Description "generator" }}
 		{{ partial "orga/generator.html" . }}
 	{{ else }}
-		{{ partial "single/article" . }}
+		<article>
+			{{ partial "contentlayouts/article.html" (dict "context" . "type" "article") }}
+		</article>
 	{{ end }}
 {{ end }}
 
@@ -30,19 +38,5 @@
 
 
 {{ define "sidebar" }}
-	<section class="sidebar_inner">
+	{{- partial "contentlayouts/menu.html" . }}
-	{{- if .Params.tags -}}
-		<h3>{{ T "tags" }}</h3>
-		<div class="tags-list" style="display: flex; flex-direction: column;">
-		    {{- with .Params.tags -}}
-		        {{- if ge (len .) 1 -}}
-		            {{- range . -}}
-		                <a href="{{ $.Site.BaseURL }}/tags/{{ . | urlize }}/">#{{ . }}</a>
-		            {{ end -}}
-		        {{- end -}}
-		    {{- end -}}
-		</div>
-	{{ end }}
- 	{{ partial "structure/langs" . }}
-	</section>
 {{ end }}

themes/buha/layouts/_default/taxonomy.html

@@ -20,8 +20,6 @@
 		{{- $paginator = .Paginate (where (where .Site.RegularPages "Type" "in" site.Params.searchSections) $what "eq" true) -}}
 	{{ else if eq $title "events" }}
 		{{- $paginator = .Paginate (where (where .Site.RegularPages "Type" "in" site.Params.searchSections) ".Params.when" "ne" nil) -}}
-	{{ else if eq $title "news" }}
-		{{- $paginator = .Paginate .Site.RegularPages -}}
 	{{ else }}
 		{{- $paginator = .Paginate .Data.Pages -}}
 	{{ end }}
@@ -33,11 +31,11 @@
 		{{ end }}
 	{{ end }}
 	{{- range first 5 $paginator.Pages -}}
-		{{ partial "structure/list_article" . }}
+		{{ partial "contentlayouts/list.html" . }}
 	{{- end }}
 	{{ partial "structure/paginator" (dict "paginator" $paginator) }}
 {{- end -}}
 
 {{ define "sidebar" }}
-	{{- partial "structure/empty" . }}
+	{{- partial "contentlayouts/menu.html" . }}
 {{ end }}

themes/buha/layouts/index.html

@@ -24,14 +24,14 @@
 		{{ range first 3 $featured.ByLastmod.Reverse }}
 			{{ $article_age := sub now.Unix (int .Date.Unix) }}
 			{{ if lt $article_age "1209600" }}
-			{{ partial "structure/list_article.html" . }}
+				{{ partial "contentlayouts/list.html" . }}
 			{{ end }}
 		{{ end }}
 	{{ end }}
 	{{- range first 5 $paginator.Pages -}}
 		{{ $article_age := sub now.Unix (int .Date.Unix) }}
 		{{ if or (ne .Params.featured true) (ge $article_age "1209600") }}
-			{{ partial "structure/list_article.html" . }}
+			{{ partial "contentlayouts/list.html" . }}
 		{{ end }}
 	{{- end }}
 	<div id="pagination_outer" style="display: flex; justify-content: center;">
@@ -42,6 +42,6 @@
 {{ end }}
 
 {{ define "sidebar" }}
-	{{- partial "structure/sidebar" . }}
+	{{- partial "contentlayouts/menu.html" . }}
 {{ end }}
 

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

@@ -0,0 +1,87 @@
+		{{ $visible := "false" }}
+		{{ $covid := "false" }}
+		{{ $when := "false" }}
+		{{ $price := "false" }}
+		{{ $contact := "false" }}
+		{{ $registeremail := "false" }}
+		{{ $showmeta := "false" }}
+		{{ if and (ne .context.Params.when "") (ne .context.Params.when nil) }}
+			{{ $showmeta = "true" }}
+			{{ $when = true }}
+		{{ end }}
+		{{ if and (ne .context.Params.price "") (ne .context.Params.price nil) }}
+			{{ $showmeta = "true" }}
+			{{ if eq .context.Params.price "free" }}
+				{{ $price = true }}
+			{{ end }}
+		{{ end }}
+		{{ if and (ne .context.Params.registeremail "") (ne .context.Params.registeremail nil) (eq .type "article") }}
+			{{ $showmeta = "true" }}
+			{{ $registeremail = true }}
+		{{ end }}
+		{{ if and (ne .context.Params.covid "") (ne .context.Params.covid nil) (eq .type "article") }}
+			{{ $showmeta = "true" }}
+			{{ $covid = true }}
+		{{ end }}
+		{{ if and (ne .context.Params.contact "") (ne .context.Params.contact nil) (eq .type "article") }}
+			{{ $showmeta = "true" }}
+			{{ $contact = true }}
+		{{ end }}
+		
+		{{ if eq $showmeta "true" }}
+			<div id="articlemeta" style="font-size: smaller;">
+				{{ if eq $when true }}
+					<div>{{ .context.Params.when }}</div>
+				{{ end }}
+				{{ if eq $price true }}
+					{{ if eq .context.Params.price "free" }}
+					        <div>{{ if i18n "freeentry" }}{{ i18n "freeentry" }}{{ else }}{{ "freeentry" }}{{ end }}</div>
+					{{ else }}
+					        <div>{{ if i18n "entry" }}{{ i18n "entry" }}{{ else }}{{ "entry" }}{{ end }}: {{ .context.Params.price }}</div>
+					{{ end }}
+				{{ end }}
+				{{ if eq $registeremail true }}
+					<div>{{ if i18n "register" }}{{ i18n "register" }}{{ else }}{{ "register" }}{{ end }} {{ .context.Params.registeremail | markdownify }} {{ if i18n "or" }}{{ i18n "or" }}{{ else }}{{ "or" }}{{ end }} {{ site.Params.imprintdata.tel }}</div>
+				{{ end }}
+				{{ if eq $covid true }}
+					<div>Es gilt die {{ .context.Params.covid }} Regel</div>
+				{{ end }}
+				{{ if eq $contact true }}
+					<div>{{ if i18n "contact" }}{{ i18n "contact" }}{{ else }}{{ "contact" }}{{ end }}: {{ if eq .type "article" }}<a href="mailto://{{ .context.Params.contact }}">{{ end }}{{ .context.Params.contact }}{{ if eq .type "article" }}</a>{{ end }}</div>
+				{{ end }}
+			</div>
+		{{ end }}
+
+		{{ $small := "solo" }}
+		{{ $big := "solo" }}
+		{{ $placeholder := "/images/placeholder_article.jpg" }}
+		{{ $img := resources.Get $placeholder }}
+		{{- $thumb := $img.Resize "1024x" }}
+		{{- if or (.context.Resources.ByType "image") (.Summary) ($img) -}}
+			{{ $small = "multiple_small" }}
+			{{ $big = "multiple_big" }}
+		{{ else }}
+			{{ $small = "multiple_big"}}
+		{{ end }}
+		{{- if .context.Resources.ByType "image" -}}
+			{{- $img = index (.context.Resources.ByType "image") 0 -}}
+			{{- $thumb = $img.Resize "1024x" }}
+			{{ if ne .context.Content "" }}
+				{{- $thumb = $img.Resize "2048x" }}
+			{{ end }}
+		{{ end }}
+		<div id="articleinner">
+			<div id="articlepicture" class="{{ $small }} borderrad25">
+				{{ if eq .type "article" }}<a href="{{- $img.Permalink -}}">{{ end }}
+					<img src="{{- $thumb.Permalink -}}" class="borderrad25" />
+				{{ if eq .type "article" }}</a>{{ end }}
+			</div>
+			{{- if or .context.Content .context.Summary -}}
+				<div id="articletext" class="{{ $big }}">
+					{{ if eq .type "list" }}{{- .context.Summary -}}{{ else }}{{- .context.Content -}}{{ end }}
+					{{ if and .context.Truncated (eq .type "list") }}
+						<div id="readmore">{{- i18n "readmore" -}}..</div>
+					{{ end }}
+				</div>
+			{{- end }}
+

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

@@ -0,0 +1,14 @@
+{{ if .Title }}
+	<article class="articlebgcol1 borderrad25">
+		<a href="{{- .Permalink -}}">
+			<div id="articletitle">
+				<h2>{{- .Title -}}</h2>
+			</div>
+		</a>
+		<a href="{{- .Permalink -}}">
+			<div id="articlecontent">
+				{{ partial "contentlayouts/article.html" (dict "context" . "type" "list") }}
+			</div>
+		</a>
+	</article>
+{{ end }}

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

@@ -22,4 +22,6 @@
               <li class="align_menu"><a href="{{ "events/" | relLangURL}}{{ $orig | urlize }}">{{ $taxonomyname }}</a></li>
           {{ end }}
         {{ end }}
-
+        {{ if .IsHome }}
+            {{ partial "structure/langs" . }}
+        {{ end }}

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

@@ -1,42 +0,0 @@
-{{ define "title" }}
-    {{ $name := .Title }}
-    {{ if lower $name | i18n }}
-            {{ $name = lower $name | i18n }}
-    {{ end }}
-    <h1>{{ $name }}</h1>
-{{ end }}
-
-{{- $pic := index (.Resources.ByType "image") 0 -}}
-
-<article>
-	<div id="articlecontent">
-		{{ partial "structure/article_meta" (dict "context" . "visible" "all") }}
-		{{ $small := "solo" }}
-		{{ $big := "solo" }}
-		{{- if or (.Resources.ByType "image") (.Content) -}}
-			{{ $small = "multiple_small" }}
-			{{ $big = "multiple_big" }}
-		{{ else }}
-			{{ $small = "multiple_big"}}
-		{{ end }}
-		<div id="articleinner">
-			{{- if .Resources.ByType "image" -}}
-				{{- $pic := index (.Resources.ByType "image") 0 -}}
-				{{- $thumb := $pic.Resize "2048x" }}
-				{{ if ne .Content "" }}
-					{{- $thumb = $pic.Resize "1024x" }}
-				{{ end }}
-				<div id="articlepicture" class="{{ $small }} borderrad25">
-					<img src="{{- $thumb.Permalink -}}" class="borderrad25" />
-				</div>
-			{{ end }}
-			{{- if .Content -}}
-				<div id="articletext" class="{{ $big }}">
-					{{- .Content -}}
-				</div>
-			{{- end }}
-		</div>
-	</div>
-</article>
-
-

themes/buha/layouts/partials/structure/article_meta.html

@@ -1,75 +0,0 @@
-{{ $visible := "none" }}
-{{ $covid := "false" }}
-{{ $price := "false" }}
-{{ $contact := "false" }}
-{{ $registeremail := "false" }}
-{{ if .visible }}
-	{{ $visible = split .visible "," }}
-	{{  range $visible }}
-		{{ if eq . "covid" }}
-			{{ $covid = "true" }}
-		{{ end }}
-		{{ if eq . "price" }}
-			{{ $price = "true" }}
-		{{ end }}
-		{{ if eq . "contact" }}
-			{{ $contact = "true" }}
-		{{ end }}
-		{{ if eq . "registeremail" }}
-			{{ $registeremail = "true" }}
-		{{ end }}
-		{{ if eq . "all" }}
-			{{ $contact = "true" }}
-			{{ $price = "true" }}
-			{{ $covid = "true" }}
-			{{ $registeremail = "true" }}
-		{{ end }}
-	{{ end }}
-{{ end }}
-
-{{ $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 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>
-{{ end }}

themes/buha/layouts/partials/structure/list_article.html

@@ -1,46 +0,0 @@
-{{ if .Title }}
-	<article class="articlebgcol1 borderrad25"><a href="{{- .Permalink -}}">
-	<div id="articletitle">
-		<h2>{{- .Title -}}</h2>
-	</div>
-	<div id="articlecontent">
-		{{ $.Scratch.Set "meta" "false" }}
-		{{ partial "structure/article_meta" (dict "context" . "visible" "price") }}
-		{{ $small := "solo" }}
-		{{ $big := "solo" }}
-		{{ $placeholder := "/images/placeholder_article.jpg" }}
-		{{ $img := resources.Get $placeholder }}
-		{{- if or (.Resources.ByType "image") (.Summary) ($img) -}}
-			{{ $small = "multiple_small" }}
-			{{ $big = "multiple_big" }}
-		{{ else }}
-			{{ $small = "multiple_big"}}
-		{{ end }}
-		<div id="articleinner">
-			{{- if .Resources.ByType "image" -}}
-				{{- $pic := index (.Resources.ByType "image") 0 -}}
-				{{- $thumb := $pic.Resize "2048x" }}
-				{{ if ne .Content "" }}
-					{{- $thumb = $pic.Resize "1024x" }}
-				{{ end }}
-				<div id="articlepicture" class="{{ $small }} borderrad25">
-					<img src="{{- $thumb.Permalink -}}" class="borderrad25" />
-				</div>
-			{{ else if $img }}
-				{{- $img = $img.Resize "1024x" }}
-				<div id="articlepicture" class="{{ $small }} borderrad25">
-					<img src="{{- $img.Permalink -}}" class="borderrad25" />
-				</div>
-			{{ end }}
-			{{- if .Summary -}}
-				<div id="articletext" class="{{ $big }}">
-					{{- .Summary -}}
-					{{ if or .Truncated (eq ($.Scratch.Get "meta") "true") }}
-						<div id="readmore">{{- i18n "readmore" -}}..</div>
-					{{ end }}
-				</div>
-			{{- end }}
-		</div>
-	</div>
-</a></article>
-{{ end }}

themes/buha/layouts/partials/structure/sidebar.html

@@ -1,6 +1,2 @@
-{{ $s := .Site.Params }}
+{{ partial "contentlayouts/menu.html" . }}
-<section class="sidebar_inner">
-  {{ partial "structure/sidebar_submenu" . }}
-  {{ partial "structure/langs" . }}
-</section>
 

themes/buha/layouts/partials/structure/submenu.html

@@ -2,10 +2,7 @@
                         <details>
                             <summary style="list-style: none; text-align: right;">Menü ☰</summary>
                             <p>
-                                {{ partial "structure/sidebar_submenu" . }}
+                                {{ partial "contentlayouts/menu.html" . }}
-                                {{ if .IsHome }}
-                                    {{ partial "structure/langs" . }}
-                                {{ end }}
                             </p>
                         </details>
                     </div>

themes/buha/layouts/shortcodes/picture.html

@@ -2,6 +2,4 @@
 {{ $alt := "sry_no_desc" }}
 {{ if index .Params 1}}{{ $alt = index .Params 1 }}{{ end }}
 {{- $pic := index ($.Page.Resources.ByType "image") $nr -}}
-<div class="picture_outer borderrad25">
+<a href="{{- $pic.Permalink -}}"><img src="{{- $pic.Permalink -}}" alt="{{ $alt }}" /></a>
-	<img src="{{- $pic.Permalink -}}" alt="{{ $alt }}" class="picture_small_center borderrad25" />
-</div>