many changes

config/_default/params.toml

@@ -42,4 +42,4 @@ placeholder = "/images/no_article_pic.png"
     nonprofit = true
 
 [foundations]
-    brentrup = "https://heise.de"
+    jusos = "https://jusos.de/"

content/links.de.md

@@ -0,0 +1,9 @@
+---
+title: "Links"
+layout: "links"
+---
+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

@@ -1,4 +0,0 @@
----
-title: "Links"
-layout: "links"
----

content/links/list.md

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

content/links/rheinmetall.md

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

content/news/2002-02-20-Informationsveranstaltung-PKK-Verbot/index.de.md

@@ -4,5 +4,5 @@ lastmod: 2002-02-20T14:00:00+02:00
 when: "20.02.,2002, 19:00 Uhr"
 tags: ["Antifa","Informationsveranstaltungen","PKK Verbot","Antifa Celle","Kurdistan","Kurdistan Solidarität Uelzen","AZADI","Repression","Kazim E","Manfred Kanther","Bundesinnenministerium","OLG Celle","Oberlandesgericht","Kurden","Türkei"]
 price: "free"
-contact: "kurd-soli-uelzen@gmx.net"
+contact_mail: "kurd-soli-uelzen@gmx.net"
 ---

content/news/2022-04-04-Konzert-Katzengejammer/index.de.md

@@ -4,7 +4,7 @@ date: "2022-04-04T23:16:00+02:00"
 when: "Montag, 04.04.2022, 23.23 Uhr"
 events: ["Konzerte"]
 price: "free"
-foundations: ["brentrup","aktionmensch"]
+foundations: ["rote_hilfe"]
 covid: "Keine Masken mehr!"
 ---
 

content/news/2022-04-05-Gedenken-an-Arkan/index.de.md

@@ -2,7 +2,7 @@
 title: "Gedenken an Arkan"
 date: 2022-04-05T09:31:00+02:00
 when: "Donnerstag, 07.04.2022, 18:00 Uhr, Celler Triftpark"
-contact: "ArkanGedenken@riseup.net"
+contact_mail: "ArkanGedenken@riseup.net"
 featured: true
 ---
 

content/news/foodsaving/index.de.md

@@ -5,7 +5,8 @@ lastmod: "2021-04-06T19:00:00+02:00"
 about: true
 when: "Jeden Mittwoch 18:30-19:00Uhr & Samstags 15:00-15:30Uhr"
 events: ["Regelmäßig"]
-contact: "foodsavingcelle@riseup.net"
+contact_mail: "foodsavingcelle@riseup.net"
+insta: "foodsavingcelle"
 featured: true
 ---
 Die **kostenfreie** Verteilung von gespendeten und geretteten **Lebensmitteln** geht auch nach der Wiedereröffnung der Tafel weiter.  
@@ -53,7 +54,4 @@ Natürlich wollen die Aktiven sich und alle anderen schützen: Deswegen wird das
 „Sagt Menschen Bescheid, die wenig Geld haben und sich über Obst und Gemüse freuen würden!“ ruft Nina auf, „Engagiert euch, bietet eure Unterstützung an, wenn ihr könnt, sprecht Nachbar_innen und Wohnungslose an, damit sie vom Projekt erfahren. Denn Menschen zu helfen und Unterstützung zu erfahren ist wertvoller für die Gesellschaft als Geld und Banken. Nicht nur während Corona.“
 
 
-Kontakt:  
-Mail: foodsavingcelle@riseup.net  
-Instagram: www.instagram.com/foodsavingcelle  
 Nebenan.de: https://nebenan.de/places/organizations/6021  

themes/buha/assets/css/article.css

@@ -1,7 +1,6 @@
 article {
     flex-grow: 1;
     flex-shrink: 0;
-    background-color: var(--background);
     padding: 1rem;
     margin-bottom: 2rem;
     border-radius: 10px;

themes/buha/layouts/_default/list.html

@@ -8,7 +8,7 @@
     {{ $partial := "" }}
     {{ $title := "" }}
     {{ $pic := "true" }}
-    {{ $pre := "l1" }}
+    {{ $pre := "layout" }}
     {{- $paginator := "" -}}
     {{ $part := .Layout }}
     {{ $partial_before := "" }}
@@ -24,13 +24,11 @@
         {{ else if eq .Section "featured" }}
             {{- $pages = where $pages ".Params.featured" "=" true -}}
         {{ end }}
-    {{ else if or (eq .Layout "contact") (eq .Layout "imprint") }}
-         {{ $partial_before = "snippets/contact" }}
     {{ else }}
         {{ if eq .Kind "term" }}
             {{- $pages = .Data.Pages -}}
             {{ $part = "article_list" }}
-        {{ else if or (eq .Kind "taxonomy") }}
+        {{ else if eq .Kind "taxonomy" }}
             {{- $pages = .Data.Terms.Alphabetical -}}
             {{ $part = "tags_n_categories" }}
         {{ end }}    

themes/buha/layouts/_default/single.html

@@ -11,6 +11,11 @@
         {{ $partial = "layout/generator" }}
    {{ else if eq .Params.tool "nottranslated" }}
         {{ $partial = "layout/nottranslated" }}
+    {{ else if or (eq .Layout "contact") (eq .Layout "imprint") }}
+        {{ $partial_before = "snippets/contact" }}
+        {{ $partial = printf "layout/%s" .Layout }}
+    {{ else if eq .Layout "archive" }}
+        {{ $partial = printf "layout/%s" .Layout }}
     {{ end }}
     <article>
     {{ partial $partial (dict "context" . "pic" $pic "content" .Content  "partial_before" $partial_before "type" "article") }}

themes/buha/layouts/index.html

@@ -13,10 +13,10 @@
 		{{ if ne .Content "" }}
             {{ partial "snippets/content" (dict "content" .Content) }}
 		{{ end }}
-        {{ partial "l1/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }}
+        {{ partial "layout/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }}
 	{{ end }}
     {{ if gt (len $posts) 1 }}
-        {{ partial "l1/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News" "type" "list") }}
+        {{ partial "layout/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News" "type" "list") }}
             {{ partial "snippets/paginator" (dict "paginator" $paginator) }}
     {{ end }}
 {{ end }}

themes/buha/layouts/partials/l1/generic_single.html

@@ -1,34 +0,0 @@
-{{ $pic := "solo" }}
-{{ $text := "solo" }}
-{{- if and (.context.Resources.ByType "image") (.context.Content) -}}
-    {{ $pic = "multiple_small" }}
-    {{ $text = "multiple_big" }}
-{{ end }}
-{{ $img := "" }}
-{{ $thumb := "" }}
-{{- if .context.Resources.ByType "image" -}}
-    {{- $img = index (.context.Resources.ByType "image") 0 -}}
-    {{- $thumb = $img.Resize "1024x" }}
-    {{ if .content }}
-        {{- $thumb = $img.Resize "500x" }}
-    {{ end }}
-{{ end }}
-
-<section>
- <div class="articleinner">
-    {{ if and (ne $img "") (eq .pic true)}}
-         <div class="articlepicture {{ $pic }}">
-            {{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
-                <img src="{{- $thumb.Permalink -}}" class="borderrad4px" />
-            {{ if ne .type "list" }}</a>{{ end }}
-            {{ if eq .type "article" }}{{ end }}
-        </div>
-    {{ end }}
-    <div class="articletext {{ $text }}">
-        {{ if .partial_before }}
-            {{ partial .partial_before (dict "context" .context "pic" .pic) }}
-        {{ end }}
-        {{ .content }}
-    </div>
-</div>
-</section>

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

@@ -1,12 +0,0 @@
-{{ if ne .context.Content "" }}
-    <section>
-        {{ partial "snippets/content" (dict "content" .context.Content) }}
-    </section>
-{{ end }}
-{{ range .context.Pages }}
-    <section>
-        <a href="{{ .Params.link }}" class="underline">{{ .Params.link }}</a><br>
-        {{ .Title }}<br>
-        <br>
-    </section>
-{{ end }}

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

@@ -1,5 +1,4 @@
-{{ $metas := dict "when" .context.Params.when "price" .context.Params.price "contact" .context.Params.contact "covid"
-.context.Params.covid }}
+{{ $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 }}
@@ -55,12 +54,16 @@
                             {{ $url = index site.Params.foundations $l }}
                         {{ end }}
                         
-                       
+                    
                         {{- $res_im := resources.GetMatch (printf "/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/foundations/{{- $l -}} .* missing
+                            </div>
                         {{ end }}
                     {{ end }}
                 </div>

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

@@ -1,33 +0,0 @@
-{{ $small := "solo" }}
-{{ $big := "solo" }}
-{{ $img := "" }}
-{{ $thumb := "" }}
-{{- if .context.Resources.ByType "image" -}}
-    {{- $img = index (.context.Resources.ByType "image") 0 -}}
-    {{- $thumb = $img.Resize "1024x" }}
-    {{ if .content }}
-        {{- $thumb = $img.Resize "500x" }}
-    {{ end }}
-{{ end }}
-{{- if or (.context.Resources.ByType "image") (.context.Summary) ($img) -}}
-    {{ $small = "multiple_small" }}
-    {{ $big = "multiple_big" }}
-{{ else }}
-    {{ $small = "multiple_big"}}
-{{ end }}
- <div id="articleinner">
-    {{ if and (ne $img "") (eq .pic true)}}
-         <div id="articlepicture" class="{{ $small }}">
-            {{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
-                <img src="{{- $thumb.Permalink -}}" class="borderrad4px" />
-            {{ if ne .type "list" }}</a>{{ end }}
-            {{ if eq .type "article" }}{{ end }}
-        </div>
-    {{ end }}
-    <div id="articletext" class="{{ $big }}">
-        {{ if .partial_before }}
-            {{ partial .partial_before (dict "context" .context "pic" .pic) }}
-        {{ end }}
-        {{ .content }}
-    </div>
-</div>

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

@@ -4,7 +4,7 @@
     </section>
 {{ end }}
 <section>
-{{ range .context.Resources.ByType "image" }}
-    <img src="{{ .Permalink }}" class="borderrad4px"/>
+{{ range .context.Resources }}
+     <div>🗀 <a href="{{ .Permalink }}">{{ . }}</a></div>
 {{ end }}
 </section>

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

@@ -1,4 +1,4 @@
-{{ if or .when .price .contact .covid }}
+{{ if or .when .price .contact_mail .covid .insta }}
 
 			<div class="articlemeta font_size_smaller">
 				{{ if .when }}
@@ -13,8 +13,11 @@
 					        <div>{{ if i18n "entry" }}{{ i18n "entry" }}{{ else }}{{ "Entry" }}{{ end }}: {{ .price }}</div>
 					{{ end }}
 				{{ end }}
-				{{ if .contact }}
-					<div>{{ if i18n "contact" }}{{ i18n "contact" }}{{ else }}{{ "Contact" }}{{ end }} {{ .contact | markdownify }} {{ if i18n "or" }}{{ i18n "or" }}{{ else }}{{ "or" }}{{ end }} <a href="tel://{{ site.Params.imprintdata.tel }}">{{ site.Params.imprintdata.tel }}</a></div>
+				{{ if .insta }}
+                    <div>Instagram: <a href="https://instagram.com/{{- .insta -}}">https://instagram.com/{{- .insta -}}</a></div>
+				{{ end }}
+				{{ if .contact_mail }}
+					<div>{{ if i18n "mail" }}{{ i18n "mail" }}{{ else }}{{ "mail" }}{{ end }} {{ .contact_mail | markdownify }}</div>
 				{{ end }}
 				{{ if .covid }}
 					<div>Covid: {{ .covid }}</div>

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

@@ -1,12 +0,0 @@
-    {{ partial "debug" (dict "context" .context "caller" "single_chooser.html")}}
-    {{ $partial_before := "" }}
-    {{ $partial := "layout/single/article" }}
-    {{ $pic := .pic }}
-    {{ if eq .context.Params.tool "generator" }}
-        {{ $partial = "layout/single/generator" }}
-   {{ else if eq .context.Params.tool "nottranslated" }}
-        {{ $partial = "layout/single/nottranslated" }}
-    {{ end }}
-    <article>
-    {{ partial $partial (dict "context" .context "pic" $pic "content" .context.Content  "partial_before" $partial_before) }}
-    </article>