From 52da0b891989ea934d5dc54c85d0c6cea07c78af Mon Sep 17 00:00:00 2001 From: teldra Date: Fri, 8 Apr 2022 14:12:20 +0200 Subject: [PATCH] small fixes --- .../2022-04-05-Gedenken-an-Arkan/index.de.md | 1 + content/news/revista/index.de.md | 1 - themes/buha/layouts/index.html | 2 +- .../layouts/partials/contentlayouts/list.html | 63 ++++++++++++------- 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md b/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md index 8544e6c8..7a19b59a 100644 --- a/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md +++ b/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md @@ -3,6 +3,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" +featured: true --- Am 7. April jährt sich der Todestag des êzîdischen Jugendlichen Arkan Hussein Khalaf zum zweiten Mal. Wir, die Initiative "In Gedenken an Arkan“, in der sich unterschiedliche Gruppen und Einzelpersonen aus Celle organisieren, rufen zur Beteiligung am Gedenken auf. diff --git a/content/news/revista/index.de.md b/content/news/revista/index.de.md index 0c6d8b2c..78b4b2b2 100644 --- a/content/news/revista/index.de.md +++ b/content/news/revista/index.de.md @@ -2,7 +2,6 @@ title: "Zeitungsprojekt Revista" date: "1993-09-04T19:00:00+02:00" lastmod: "2022-04-04T19:00:00+02:00" -featured: true about: true --- Was ist Revista? Revista ist spanisch und heißt Zeitung, und genau das sind wir, eine Zeitung. Die revista ist ein relativ neues Projekt, die erste Ausgabe erschien um Oktober 1999. diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html index f98f7b82..8a6d1ba3 100644 --- a/themes/buha/layouts/index.html +++ b/themes/buha/layouts/index.html @@ -8,7 +8,7 @@ {{ $s := .Site.Params }} {{- $posts := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" $s.searchSections }} {{- $featured := where (where $posts ".Params.featured" "=" true) "Type" "in" $s.searchSections }} - {{ $featured = where $featured (.Lastmod.AddDate 0 0 14) "gt" now }} + {{ $featured = where $featured ".Params.Lastmod" "gt" (now.AddDate 0 0 -14) }} {{- $paginator := .Paginate $posts -}} {{ if eq $paginator.PageNumber 1 }} {{ if ne .Content "" }} diff --git a/themes/buha/layouts/partials/contentlayouts/list.html b/themes/buha/layouts/partials/contentlayouts/list.html index ed44e3d0..ddb41d9f 100644 --- a/themes/buha/layouts/partials/contentlayouts/list.html +++ b/themes/buha/layouts/partials/contentlayouts/list.html @@ -1,25 +1,44 @@ -{{ if and (or .paginator .pages) .amount }} - {{ $amount := .amount }} - {{ $pages := "" }} - {{ if .pages }} - {{ $pages = .pages.ByLastmod.Reverse }} - {{ else if .paginator }} - {{ $pages = .paginator.Pages.ByLastmod.Reverse }} - {{ end }} - {{- range first $amount $pages -}} - {{ if .Title }} -
- -
-

{{- .Title -}}

-
-
- -
- {{ partial "contentlayouts/article.html" (dict "context" . "type" "list") }} -
-
-
+{{ if or .paginator .pages }} + {{ if .amount }} + {{ $amount := .amount }} + {{ $pages := "" }} + {{ $max_age := int .max_age }} + {{ $featured := .featured }} + {{ if .pages }} + {{ $pages = .pages.ByLastmod.Reverse }} + {{ else if .paginator }} + {{ $pages = .paginator.Pages.ByLastmod.Reverse }} + {{ end }} + {{- range first $amount $pages -}} + {{ $true := true }} + + {{ if $featured }} + {{ if le (.Lastmod.AddDate 0 0 $max_age) now }} + {{ $true = false }} + {{ end }} + {{ else }} + {{ if $max_age }} + {{ if and (lt (.Lastmod.AddDate 0 0 $max_age) now) (eq .Params.featured true) }} + {{ $true = false }} + {{ end }} + {{ end }} + {{ end }} + {{ if eq $true true }} + {{ if .Title }} +
+ +
+

{{- .Title -}}

+
+
+ +
+ {{ partial "contentlayouts/article.html" (dict "context" . "type" "list") }} +
+
+
+ {{ end }} + {{ end }} {{ end }} {{ end }} {{ end }}