From fe2cb36b1d756922de0c054a3cdbab4d41db6c73 Mon Sep 17 00:00:00 2001 From: teldra Date: Tue, 5 Apr 2022 20:58:02 +0200 Subject: [PATCH] small fixes --- content/news/foodsaving/index.de.md | 16 ++-- content/news/umsonstladen/index.de.md | 2 - themes/buha/assets/css/layout.css | 24 +++-- themes/buha/i18n/de.toml | 14 ++- themes/buha/layouts/_default/contact.html | 37 +------- themes/buha/layouts/_default/list.html | 38 ++++---- themes/buha/layouts/_default/single.html | 28 +++--- themes/buha/layouts/_default/taxonomy.html | 6 +- themes/buha/layouts/index.html | 6 +- .../partials/contentlayouts/article.html | 87 +++++++++++++++++++ .../layouts/partials/contentlayouts/list.html | 14 +++ .../menu.html} | 4 +- .../buha/layouts/partials/single/article.html | 42 --------- .../partials/structure/article_meta.html | 75 ---------------- .../partials/structure/list_article.html | 46 ---------- .../layouts/partials/structure/sidebar.html | 6 +- .../layouts/partials/structure/submenu.html | 5 +- themes/buha/layouts/shortcodes/picture.html | 4 +- 18 files changed, 181 insertions(+), 273 deletions(-) create mode 100644 themes/buha/layouts/partials/contentlayouts/article.html create mode 100644 themes/buha/layouts/partials/contentlayouts/list.html rename themes/buha/layouts/partials/{structure/sidebar_submenu.html => contentlayouts/menu.html} (93%) delete mode 100644 themes/buha/layouts/partials/single/article.html delete mode 100644 themes/buha/layouts/partials/structure/article_meta.html delete mode 100644 themes/buha/layouts/partials/structure/list_article.html diff --git a/content/news/foodsaving/index.de.md b/content/news/foodsaving/index.de.md index a3ff2f41..ba94780e 100644 --- a/content/news/foodsaving/index.de.md +++ b/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. - -Pressemitteilung 12. Mai 2020 +Die **kostenfreie** Verteilung von gespendeten und geretteten **Lebensmitteln** geht auch nach der Wiedereröffnung der Tafel weiter. +Spenden? Mitmachen? Wer **mitmachen** oder uns unterstützen möchte, kann sich per Mail melden, sodass wir bei Bedarf nachfragen können. -Food-Saving macht weitere Verteilungen + + +### 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. diff --git a/content/news/umsonstladen/index.de.md b/content/news/umsonstladen/index.de.md index 3fa7dbc6..c4200f7e 100644 --- a/content/news/umsonstladen/index.de.md +++ b/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. diff --git a/themes/buha/assets/css/layout.css b/themes/buha/assets/css/layout.css index 23202dc5..13f6d330 100644 --- a/themes/buha/assets/css/layout.css +++ b/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 { - margin: 0; -} - -article h3 { - margin: 0; +#articletext img { + margin: 1.5rem 1.5rem 3rem 2rem; + border-radius: 15px; + width: 80%; } #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; } diff --git a/themes/buha/i18n/de.toml b/themes/buha/i18n/de.toml index b76e0900..66be044f 100644 --- a/themes/buha/i18n/de.toml +++ b/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?" \ No newline at end of file +other = "Ist es ein Termin?" + +[entry] +other = "Eintritt" + +[freeentry] +other = "Der Eintritt ist kostenlos." + +[register] +other = "Anmeldung" diff --git a/themes/buha/layouts/_default/contact.html b/themes/buha/layouts/_default/contact.html index 2bc9513f..4b836f7b 100644 --- a/themes/buha/layouts/_default/contact.html +++ b/themes/buha/layouts/_default/contact.html @@ -10,41 +10,6 @@ {{- $pic := index (.Resources.ByType "image") 0 -}}
-
- {{ 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 }} -
- {{- if .Resources.ByType "image" -}} - {{- $pic := index (.Resources.ByType "image") 0 -}} - {{- $thumb := $pic.Resize "2048x" }} - {{ if ne .Content "" }} - {{- $thumb = $pic.Resize "1024x" }} - {{ end }} -
- -
- {{ else if $img }} - {{- $img = $img.Resize "1024x" }} -
- -
- {{ end }} - {{- if .Content -}} -
- {{ partial "contact.html" }} - {{- .Content -}} -
- {{- end }} -
-
+ {{ partial "contentlayouts/article.html" (dict "context" . "type" "article") }}
{{ end }} \ No newline at end of file diff --git a/themes/buha/layouts/_default/list.html b/themes/buha/layouts/_default/list.html index 25856743..cec0b9cc 100644 --- a/themes/buha/layouts/_default/list.html +++ b/themes/buha/layouts/_default/list.html @@ -12,22 +12,30 @@ {{- end -}} {{- define "main" -}} - {{ $s := .Site.Params }} - {{- $paginator := slice -}} - {{- $paginator = .Paginate .Data.Pages.ByDate.Reverse -}} - {{ if eq $paginator.PageNumber 1 }} - {{ if ne .Content "" }} -
- {{ .Content }} -
- {{ end }} - {{ end }} - {{- range first 5 $paginator.Pages -}} - {{ partial "structure/list_article.html" . }} - {{- end }} - {{ partial "structure/paginator" (dict "paginator" $paginator) }} + {{ $title := lower .Title }} + {{ $s := .Site.Params }} + {{- $paginator := slice -}} + {{ $what := printf ".Params.%s" $title }} + {{ if or (eq $title "about") (eq $title "featured") }} + {{- $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 }} + {{- $paginator = .Paginate .Data.Pages -}} + {{ end }} + {{ if eq $paginator.PageNumber 1 }} + {{ if ne .Content "" }} +
+ {{ .Content }} +
+ {{ 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 }} \ No newline at end of file diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html index c99133e1..9082bf1e 100644 --- a/themes/buha/layouts/_default/single.html +++ b/themes/buha/layouts/_default/single.html @@ -1,4 +1,10 @@ - +{{ define "title" }} + {{ $name := .Title }} + {{ if lower $name | i18n }} + {{ $name = lower $name | i18n }} + {{ end }} +

{{ $name }}

+{{ end }} {{ define "main" }} @@ -7,7 +13,9 @@ {{ else if eq .Description "generator" }} {{ partial "orga/generator.html" . }} {{ else }} - {{ partial "single/article" . }} +
+ {{ partial "contentlayouts/article.html" (dict "context" . "type" "article") }} +
{{ end }} {{ end }} @@ -30,19 +38,5 @@ {{ define "sidebar" }} -
- {{- if .Params.tags -}} -

{{ T "tags" }}

-
- {{- with .Params.tags -}} - {{- if ge (len .) 1 -}} - {{- range . -}} - #{{ . }} - {{ end -}} - {{- end -}} - {{- end -}} -
- {{ end }} - {{ partial "structure/langs" . }} -
+ {{- partial "contentlayouts/menu.html" . }} {{ end }} diff --git a/themes/buha/layouts/_default/taxonomy.html b/themes/buha/layouts/_default/taxonomy.html index 6e913038..cec0b9cc 100644 --- a/themes/buha/layouts/_default/taxonomy.html +++ b/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 }} \ No newline at end of file diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html index d2501d74..5d582d6a 100644 --- a/themes/buha/layouts/index.html +++ b/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 }}
@@ -42,6 +42,6 @@ {{ end }} {{ define "sidebar" }} - {{- partial "structure/sidebar" . }} + {{- partial "contentlayouts/menu.html" . }} {{ end }} diff --git a/themes/buha/layouts/partials/contentlayouts/article.html b/themes/buha/layouts/partials/contentlayouts/article.html new file mode 100644 index 00000000..95cd8ee5 --- /dev/null +++ b/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" }} +
+ {{ if eq $when true }} +
{{ .context.Params.when }}
+ {{ end }} + {{ if eq $price true }} + {{ if eq .context.Params.price "free" }} +
{{ if i18n "freeentry" }}{{ i18n "freeentry" }}{{ else }}{{ "freeentry" }}{{ end }}
+ {{ else }} +
{{ if i18n "entry" }}{{ i18n "entry" }}{{ else }}{{ "entry" }}{{ end }}: {{ .context.Params.price }}
+ {{ end }} + {{ end }} + {{ if eq $registeremail true }} +
{{ if i18n "register" }}{{ i18n "register" }}{{ else }}{{ "register" }}{{ end }} {{ .context.Params.registeremail | markdownify }} {{ if i18n "or" }}{{ i18n "or" }}{{ else }}{{ "or" }}{{ end }} {{ site.Params.imprintdata.tel }}
+ {{ end }} + {{ if eq $covid true }} +
Es gilt die {{ .context.Params.covid }} Regel
+ {{ end }} + {{ if eq $contact true }} +
{{ if i18n "contact" }}{{ i18n "contact" }}{{ else }}{{ "contact" }}{{ end }}: {{ if eq .type "article" }}{{ end }}{{ .context.Params.contact }}{{ if eq .type "article" }}{{ end }}
+ {{ end }} +
+ {{ 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 }} +
+
+ {{ if eq .type "article" }}{{ end }} + + {{ if eq .type "article" }}{{ end }} +
+ {{- if or .context.Content .context.Summary -}} +
+ {{ if eq .type "list" }}{{- .context.Summary -}}{{ else }}{{- .context.Content -}}{{ end }} + {{ if and .context.Truncated (eq .type "list") }} +
{{- i18n "readmore" -}}..
+ {{ end }} +
+ {{- end }} + diff --git a/themes/buha/layouts/partials/contentlayouts/list.html b/themes/buha/layouts/partials/contentlayouts/list.html new file mode 100644 index 00000000..fd0149eb --- /dev/null +++ b/themes/buha/layouts/partials/contentlayouts/list.html @@ -0,0 +1,14 @@ +{{ if .Title }} + +{{ end }} diff --git a/themes/buha/layouts/partials/structure/sidebar_submenu.html b/themes/buha/layouts/partials/contentlayouts/menu.html similarity index 93% rename from themes/buha/layouts/partials/structure/sidebar_submenu.html rename to themes/buha/layouts/partials/contentlayouts/menu.html index ac109189..683485a4 100644 --- a/themes/buha/layouts/partials/structure/sidebar_submenu.html +++ b/themes/buha/layouts/partials/contentlayouts/menu.html @@ -22,4 +22,6 @@
  • {{ $taxonomyname }}
    • {{ end }} {{ end }} - + {{ if .IsHome }} + {{ partial "structure/langs" . }} + {{ end }} diff --git a/themes/buha/layouts/partials/single/article.html b/themes/buha/layouts/partials/single/article.html deleted file mode 100644 index 86c9566f..00000000 --- a/themes/buha/layouts/partials/single/article.html +++ /dev/null @@ -1,42 +0,0 @@ -{{ define "title" }} - {{ $name := .Title }} - {{ if lower $name | i18n }} - {{ $name = lower $name | i18n }} - {{ end }} -

    {{ $name }}

    -{{ end }} - -{{- $pic := index (.Resources.ByType "image") 0 -}} - -
    -
    - {{ 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 }} -
    - {{- if .Resources.ByType "image" -}} - {{- $pic := index (.Resources.ByType "image") 0 -}} - {{- $thumb := $pic.Resize "2048x" }} - {{ if ne .Content "" }} - {{- $thumb = $pic.Resize "1024x" }} - {{ end }} -
    - -
    - {{ end }} - {{- if .Content -}} -
    - {{- .Content -}} -
    - {{- end }} -
    -
    -
    - - diff --git a/themes/buha/layouts/partials/structure/article_meta.html b/themes/buha/layouts/partials/structure/article_meta.html deleted file mode 100644 index 0ee85cfa..00000000 --- a/themes/buha/layouts/partials/structure/article_meta.html +++ /dev/null @@ -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" }} -
    - {{ if and (ne .context.Params.when "") (ne .context.Params.when nil) }} -
    {{ .context.Params.when }}
    - {{ end }} - {{ if and (ne .context.Params.price "") (ne .context.Params.price nil) (eq $price "true") }} - {{ if eq .context.Params.price "free" }} -
    Der Eintritt ist frei.
    - {{ else }} -
    Eintritt: {{ .context.Params.price }}
    - {{ end }} - {{ end }} - {{ if and (ne .context.Params.registeremail "") (ne .context.Params.registeremail nil) (eq $registeremail "true")}} -
    Anmeldung unter {{ .context.Params.registeremail | markdownify }} erwünscht
    - {{ 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") }} -
    Es gilt die {{ .context.Params.covid }} Regel
    - {{ end }} - {{ if and (ne .context.Params.contact "") (ne .context.Params.contact nil) (eq $contact "true") }} -
    Kontakt: {{ .context.Params.contact }}
    - {{ else if and (ne .context.Params.contact "") (ne .context.Params.contact nil) (eq $contact "false") }} - {{ $.context.Scratch.Set "meta" "true" }} - {{ end }} -
    -{{ end }} \ No newline at end of file diff --git a/themes/buha/layouts/partials/structure/list_article.html b/themes/buha/layouts/partials/structure/list_article.html deleted file mode 100644 index 40962505..00000000 --- a/themes/buha/layouts/partials/structure/list_article.html +++ /dev/null @@ -1,46 +0,0 @@ -{{ if .Title }} -
    -
    -

    {{- .Title -}}

    -
    -
    - {{ $.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 }} -
    - {{- if .Resources.ByType "image" -}} - {{- $pic := index (.Resources.ByType "image") 0 -}} - {{- $thumb := $pic.Resize "2048x" }} - {{ if ne .Content "" }} - {{- $thumb = $pic.Resize "1024x" }} - {{ end }} -
    - -
    - {{ else if $img }} - {{- $img = $img.Resize "1024x" }} -
    - -
    - {{ end }} - {{- if .Summary -}} -
    - {{- .Summary -}} - {{ if or .Truncated (eq ($.Scratch.Get "meta") "true") }} -
    {{- i18n "readmore" -}}..
    - {{ end }} -
    - {{- end }} -
    -
    -
    -{{ end }} diff --git a/themes/buha/layouts/partials/structure/sidebar.html b/themes/buha/layouts/partials/structure/sidebar.html index 131e15b5..0d5ca4a4 100644 --- a/themes/buha/layouts/partials/structure/sidebar.html +++ b/themes/buha/layouts/partials/structure/sidebar.html @@ -1,6 +1,2 @@ -{{ $s := .Site.Params }} -
    - {{ partial "structure/sidebar_submenu" . }} - {{ partial "structure/langs" . }} -
    +{{ partial "contentlayouts/menu.html" . }} diff --git a/themes/buha/layouts/partials/structure/submenu.html b/themes/buha/layouts/partials/structure/submenu.html index fbb2f390..c5c83f2d 100644 --- a/themes/buha/layouts/partials/structure/submenu.html +++ b/themes/buha/layouts/partials/structure/submenu.html @@ -2,10 +2,7 @@
    Menü ☰

    - {{ partial "structure/sidebar_submenu" . }} - {{ if .IsHome }} - {{ partial "structure/langs" . }} - {{ end }} + {{ partial "contentlayouts/menu.html" . }}

    diff --git a/themes/buha/layouts/shortcodes/picture.html b/themes/buha/layouts/shortcodes/picture.html index 3d96beb6..eef29795 100644 --- a/themes/buha/layouts/shortcodes/picture.html +++ b/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 -}} -
    - {{ $alt }} -
    +{{ $alt }}