From ce945e77db5dc3694b5dde2800dfa399db7388f4 Mon Sep 17 00:00:00 2001 From: rra Date: Sun, 25 Sep 2022 09:10:37 +0200 Subject: [PATCH 1/5] WIP merge of Cristoph, filter, mobile view, menu rework --- themes/lumbung-theme/layouts/index.html | 30 +- .../lumbung-theme/layouts/partials/card.html | 2 +- .../layouts/partials/data/authors.html | 1 + .../layouts/partials/data/categories.html | 1 + .../layouts/partials/data/tags.html | 1 + .../layouts/partials/filter-nav.html | 191 +++----- .../layouts/partials/footer.html | 9 +- .../layouts/partials/header.html | 25 +- .../layouts/partials/pen_card.html | 2 +- .../layouts/partials/shout_card.html | 2 +- .../layouts/partials/social_card.html | 2 +- .../layouts/partials/video_box.html | 2 +- themes/lumbung-theme/static/css/main.css | 459 +++++++++++++----- themes/lumbung-theme/static/img/logo-big.svg | 21 + 14 files changed, 496 insertions(+), 252 deletions(-) create mode 100644 themes/lumbung-theme/layouts/partials/data/authors.html create mode 100644 themes/lumbung-theme/layouts/partials/data/categories.html create mode 100644 themes/lumbung-theme/layouts/partials/data/tags.html create mode 100644 themes/lumbung-theme/static/img/logo-big.svg diff --git a/themes/lumbung-theme/layouts/index.html b/themes/lumbung-theme/layouts/index.html index a5c69ec..263beb9 100644 --- a/themes/lumbung-theme/layouts/index.html +++ b/themes/lumbung-theme/layouts/index.html @@ -1,12 +1,16 @@ {{ define "main" }} +
-
-{{ range (.Paginate (.Site.RegularPages.GroupByDate "January 2006") 20 ).PageGroups }} - - {{ .Key }} - {{ range .Pages }} +
+ {{ $range := .Site.RegularPages }} + {{ $paginator := .Paginate $range }} + {{ $pageSize := $paginator.PageSize }} + {{ $totalPostsToShow := mul $paginator.PageNumber $pageSize }} + {{ range $index, $el := (first $totalPostsToShow .Site.RegularPages) }} + +
{{if eq .Section "tv"}} {{- partial "video_box.html" . -}} @@ -32,13 +36,17 @@ {{ else }} {{- partial "card.html" . -}} {{ end }} - - {{ end }} +
{{ end }}
- + +
+ {{ if and (gt $paginator.TotalPages 1) ($paginator.HasNext) }} + Next Page + {{ end }} + Load all +
+
@@ -46,5 +54,7 @@ lumbung radio
+ +
{{ end }} \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/card.html b/themes/lumbung-theme/layouts/partials/card.html index 9154a32..bffc5b2 100644 --- a/themes/lumbung-theme/layouts/partials/card.html +++ b/themes/lumbung-theme/layouts/partials/card.html @@ -1,4 +1,4 @@ -
+

{{ .Title }}

diff --git a/themes/lumbung-theme/layouts/partials/data/authors.html b/themes/lumbung-theme/layouts/partials/data/authors.html new file mode 100644 index 0000000..69be009 --- /dev/null +++ b/themes/lumbung-theme/layouts/partials/data/authors.html @@ -0,0 +1 @@ +{{ with .Params.authors }}{{ if eq ( printf "%T" . ) "string" }}{{ . | replaceRE "[.]" "_" | urlize }}{{ else if eq ( printf "%T" . ) "[]string" }}{{ range . }}{{ . | replaceRE "[.]" "_" | urlize }} {{end}}{{end}}{{else}}no-author{{end}} \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/data/categories.html b/themes/lumbung-theme/layouts/partials/data/categories.html new file mode 100644 index 0000000..9303037 --- /dev/null +++ b/themes/lumbung-theme/layouts/partials/data/categories.html @@ -0,0 +1 @@ +{{ with .Params.categories }}{{ if eq ( printf "%T" . ) "string" }}{{ . | replaceRE "[.]" "_" | urlize }}{{ else if eq ( printf "%T" . ) "[]string" }}{{ range . }}{{ . | replaceRE "[.]" "_" | urlize }} {{end}}{{end}}{{else}}no-cat{{end}} \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/data/tags.html b/themes/lumbung-theme/layouts/partials/data/tags.html new file mode 100644 index 0000000..6cb4851 --- /dev/null +++ b/themes/lumbung-theme/layouts/partials/data/tags.html @@ -0,0 +1 @@ +{{ with .Params.tags }}{{ range . }}{{ . | replaceRE "[.]" "_" | urlize }} {{ end }}{{ else }} tfuntagged{{ end }} \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/filter-nav.html b/themes/lumbung-theme/layouts/partials/filter-nav.html index 10b8ac0..ef472c8 100644 --- a/themes/lumbung-theme/layouts/partials/filter-nav.html +++ b/themes/lumbung-theme/layouts/partials/filter-nav.html @@ -1,121 +1,90 @@ -
Filter
+
+ -{{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }} -{{ $sections := .Site.Params.mainSections }} - -{{ $.Scratch.Set "authors" (slice ) }} -{{ $.Scratch.Set "noAuthors" 0 }} - -{{ range where .Site.RegularPages "Type" "in" .Site.Params.mainSections }} - {{ with .Params.authors }} - {{ if eq ( printf "%T" . ) "[]string" }} - {{ if ( not ( in ($.Scratch.Get "authors") . ) ) }} - {{ $.Scratch.Add "authors" . }} - {{ end }} - {{ else if ( printf "%T" . ) "[]string" }} - {{ range . }} - {{ if ( not ( in ($.Scratch.Get "authors") . ) ) }} - {{ $.Scratch.Add "authors" . }} - {{ end }} - {{ end }} + {{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }} + {{ $sections := .Site.Params.mainSections }} + {{ $tags := $.Site.Taxonomies.tags.ByCount }} + {{ $.Scratch.Set "untagged" 0 }} + {{ range $pages }} + {{ with .Params.tags }}{{ else }}{{ $.Scratch.Add "untagged" 1 }}{{ end }} {{ end }} - {{ else }} - {{ $.Scratch.Add "noAuthors" 1 }} - {{ end }} -{{ end }} -{{ $.Scratch.Set "cats" (slice ) }} -{{ $.Scratch.Set "nocat" 0 }} +
+
+
Cards
+
+
+
+ +
+ {{ range $sections }} + + {{ end }} + +
+
-{{ range where .Site.RegularPages "Type" "in" .Site.Params.mainSections }} - {{ with .Params.categories }} - {{ if eq ( printf "%T" . ) "[]string" }} - {{ if ( not ( in ($.Scratch.Get "cats") . ) ) }} - {{ $.Scratch.Add "cats" . }} - {{ end }} - - {{ end }} - {{ else }} - {{ $.Scratch.Add "nocat" 1 }} - {{ end }} -{{ end }} +
+ +
+ {{ range .Site.Taxonomies.authors }} + + {{ end }} + + +
+
-{{ $tags := $.Site.Taxonomies.tags.ByCount }} +
+ +
+ {{ range .Site.Taxonomies.categories }} + + {{ end }} + + +
+
-{{ $.Scratch.Set "untagged" 0 }} -{{ range $pages }} - {{ with .Params.tags }}{{ else }}{{ $.Scratch.Add "untagged" 1 }}{{ end }} -{{ end }} - -
-
-
Items
- Load all Items -
-
- - {{ range $sections }} - - {{ end }} +
+ +
+ {{ range $tags }} + {{ if .Term }} + + {{ end }} + {{ end }} + + +
+
+ +
-
- - - {{ range .Site.Taxonomies.authors }} - - {{ end }} - - {{ if gt ( $.Scratch.Get "noAuthors") 0 }} - - {{ end }} -
- -
- - - {{ range .Site.Taxonomies.categories }} - - {{ end }} - - {{ if gt ( $.Scratch.Get "nocat") 0 }} - - {{ end }} -
- -
- - {{ range $tags }} - {{ if .Term }} - - {{ end }} - {{ end }} - {{ if gt ( $.Scratch.Get "untagged") 0 }} - - {{ end }} -
\ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/footer.html b/themes/lumbung-theme/layouts/partials/footer.html index c8c9ced..0f6cf82 100644 --- a/themes/lumbung-theme/layouts/partials/footer.html +++ b/themes/lumbung-theme/layouts/partials/footer.html @@ -1,7 +1,7 @@
- +
lumbung.space is a social and publishing platform for sharing harvests by all members online. It is non-extractive, co governed by the users, and is built on open platforms.
@@ -18,4 +18,9 @@
Imprint - Privacy Policy - Glossary - Terms of Use
-
\ No newline at end of file + + + + \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/header.html b/themes/lumbung-theme/layouts/partials/header.html index 23111b8..c586d2b 100644 --- a/themes/lumbung-theme/layouts/partials/header.html +++ b/themes/lumbung-theme/layouts/partials/header.html @@ -6,7 +6,7 @@
- + {{ if .Site.Params.mainSections }} + + {{- partial "filter-nav.html" . -}} + {{ end }} +
- -
- \ No newline at end of file + + diff --git a/themes/lumbung-theme/layouts/partials/pen_card.html b/themes/lumbung-theme/layouts/partials/pen_card.html index b1cac10..b542750 100644 --- a/themes/lumbung-theme/layouts/partials/pen_card.html +++ b/themes/lumbung-theme/layouts/partials/pen_card.html @@ -1,4 +1,4 @@ -
+
From {{ if .Params.contributors }}{{range .Params.contributors}} {{ . }} {{end}} at {{ end }}{{ .Params.feed_name }}
diff --git a/themes/lumbung-theme/layouts/partials/shout_card.html b/themes/lumbung-theme/layouts/partials/shout_card.html index 982cd21..9e77acc 100644 --- a/themes/lumbung-theme/layouts/partials/shout_card.html +++ b/themes/lumbung-theme/layouts/partials/shout_card.html @@ -1,4 +1,4 @@ -
+
{{ $postPermalink := .Permalink}} diff --git a/themes/lumbung-theme/layouts/partials/social_card.html b/themes/lumbung-theme/layouts/partials/social_card.html index d9c08d0..518baa5 100644 --- a/themes/lumbung-theme/layouts/partials/social_card.html +++ b/themes/lumbung-theme/layouts/partials/social_card.html @@ -1,4 +1,4 @@ -
- {{ with (index (.Resources.ByType "image") 0) }} - {{ $height := add .Height 0.0}} - {{ $ratio := div $height .Width}} - {{ $thumb := .Fit "540x540 q80 webp"}} -
-
- {{ .Title }} -
- {{ else }} -
- {{ end }} -
-

- {{.Title}}

-
-
- {{ .Summary }} -
-
-
- -
-
- {{ if .Params.authors }}By {{range .Params.authors}} {{ . }} {{end}} on{{ end }} - - {{ if .Truncated }} -
-
Read More…
- {{ end }} -
-
+ {{ with (index (.Resources.ByType "image") 0) }} + {{ $height := add .Height 0.0}} + {{ $ratio := div $height .Width}} + {{ $thumb := .Fit "540x540 q80 webp"}} +
+
+ {{ .Title }}
+ {{ else }} +
+ {{ end }} +
+

+ {{.Title}}

+
+
+ {{ .Summary }} +
+
+
+ +
+
+ {{ if .Params.authors }}By {{range .Params.authors}} {{ . }} {{end}} on{{ end }} + + {{ if .Truncated }} +
+
Read More…
+ {{ end }} +
+
+
diff --git a/themes/lumbung-theme/layouts/partials/calendar_card.html b/themes/lumbung-theme/layouts/partials/calendar_card.html index c41cfa9..3a20ffc 100644 --- a/themes/lumbung-theme/layouts/partials/calendar_card.html +++ b/themes/lumbung-theme/layouts/partials/calendar_card.html @@ -1,5 +1,5 @@ {{ $t := (time .Params.event_end) }} -
+
{{ substr .Params.date 0 11}}
diff --git a/themes/lumbung-theme/layouts/partials/card.html b/themes/lumbung-theme/layouts/partials/card.html index bffc5b2..5cbaa86 100644 --- a/themes/lumbung-theme/layouts/partials/card.html +++ b/themes/lumbung-theme/layouts/partials/card.html @@ -1,4 +1,4 @@ -
+

{{ .Title }}

diff --git a/themes/lumbung-theme/layouts/partials/data/contributors.html b/themes/lumbung-theme/layouts/partials/data/contributors.html new file mode 100644 index 0000000..20dce32 --- /dev/null +++ b/themes/lumbung-theme/layouts/partials/data/contributors.html @@ -0,0 +1 @@ +{{ with .Params.contributors }}{{ if eq ( printf "%T" . ) "string" }}{{ . | replaceRE "[.]" "_" | urlize }}{{ else if eq ( printf "%T" . ) "[]string" }}{{ range . }}{{ . | replaceRE "[.]" "_" | urlize }} {{end}}{{end}}{{else}}no-contributor{{end}} \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/data/sources.html b/themes/lumbung-theme/layouts/partials/data/sources.html new file mode 100644 index 0000000..d39e141 --- /dev/null +++ b/themes/lumbung-theme/layouts/partials/data/sources.html @@ -0,0 +1 @@ +{{ with .Params.sources }}{{ if eq ( printf "%T" . ) "string" }}{{ . | replaceRE "[.]" "_" | urlize }}{{ else if eq ( printf "%T" . ) "[]string" }}{{ range . }}{{ . | replaceRE "[.]" "_" | urlize }} {{end}}{{end}}{{else}}no-sources{{end}} \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/event_list_item.html b/themes/lumbung-theme/layouts/partials/event_list_item.html new file mode 100644 index 0000000..524ea99 --- /dev/null +++ b/themes/lumbung-theme/layouts/partials/event_list_item.html @@ -0,0 +1,19 @@ +{{ $t := (time .Params.event_end) }} +
+
{{ substr .Params.event_begin 0 11}}
+

{{ .Title }}

+
+
+ + {{ .Params.localized_begin | markdownify }} + +
+
+
Duration: {{ .Params.duration }}
+
{{ .Params.location | markdownify }}
+ + +
+ {{.Content}} +
+
\ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/filter-nav.html b/themes/lumbung-theme/layouts/partials/filter-nav.html index ef472c8..da36f2c 100644 --- a/themes/lumbung-theme/layouts/partials/filter-nav.html +++ b/themes/lumbung-theme/layouts/partials/filter-nav.html @@ -34,14 +34,14 @@ by contributors
- {{ range .Site.Taxonomies.authors }} - {{ end }} - -
@@ -52,13 +52,13 @@ by sources
- {{ range .Site.Taxonomies.categories }} - {{ end }} - -
diff --git a/themes/lumbung-theme/layouts/partials/footer.html b/themes/lumbung-theme/layouts/partials/footer.html index 0f6cf82..3c74e2b 100644 --- a/themes/lumbung-theme/layouts/partials/footer.html +++ b/themes/lumbung-theme/layouts/partials/footer.html @@ -22,5 +22,5 @@ \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/head.html b/themes/lumbung-theme/layouts/partials/head.html index 38b375f..11ab989 100644 --- a/themes/lumbung-theme/layouts/partials/head.html +++ b/themes/lumbung-theme/layouts/partials/head.html @@ -25,4 +25,5 @@ {{ with .OutputFormats.Get "rss" -}} {{ printf `` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} {{ end -}} + diff --git a/themes/lumbung-theme/layouts/partials/header.html b/themes/lumbung-theme/layouts/partials/header.html index c586d2b..28d24c3 100644 --- a/themes/lumbung-theme/layouts/partials/header.html +++ b/themes/lumbung-theme/layouts/partials/header.html @@ -17,7 +17,7 @@
  • contributors
    • -
  • calendar
    • +
  • events
  • tv
  • social
  • pen
    • @@ -31,17 +31,14 @@
  • books
    • - - {{ if .Site.Params.mainSections }} - {{- partial "filter-nav.html" . -}} - {{ end }} -
    + - + +
    diff --git a/themes/lumbung-theme/layouts/partials/pen_card.html b/themes/lumbung-theme/layouts/partials/pen_card.html index b542750..4accc6d 100644 --- a/themes/lumbung-theme/layouts/partials/pen_card.html +++ b/themes/lumbung-theme/layouts/partials/pen_card.html @@ -1,7 +1,7 @@ -
    +
    -
    From {{ if .Params.contributors }}{{range .Params.contributors}} {{ . }} {{end}} at {{ end }}{{ .Params.feed_name }}
    +
    From {{ if .Params.author }}{{.Params.author}} at {{ end }}{{ .Params.feed_name }}
    {{ $postPermalink := .Permalink}} diff --git a/themes/lumbung-theme/layouts/partials/shout_card.html b/themes/lumbung-theme/layouts/partials/shout_card.html index 9e77acc..c3ee38b 100644 --- a/themes/lumbung-theme/layouts/partials/shout_card.html +++ b/themes/lumbung-theme/layouts/partials/shout_card.html @@ -1,48 +1,48 @@ -
    -
    -
    - {{ $postPermalink := .Permalink}} - -

    {{ .Title }}

    -
    - -
    From {{ if .Params.contributors }}{{range .Params.contributors}} {{ . }} {{end}} at {{ end }}{{ .Params.feed_name }}
    +
    +
    +
    + {{ $postPermalink := .Permalink}} + +

    {{ .Title }}

    +
    + +
    From {{ if .Params.contributors }}{{range .Params.contributors}} {{ . }} {{end}} at {{ end }}{{ .Params.feed_name }}
    - {{ if .Params.featured_image }} - {{ with $img := .Resources.GetMatch .Params.featured_image }} - {{ $height := add $img.Height 0.0}} - {{ $ratio := div $height $img.Width}} - {{ $thumb := $img.Fit "540x540 q80 webp"}} -
    -
    - {{ .Title }} -
    - {{end}} - {{ else if (.Resources.ByType "image") }} - {{ with (index (.Resources.ByType "image") 0) }} - {{ $img := . }} - {{ $height := add .Height 0.0}} - {{ $ratio := div $height .Width}} - {{ $thumb := .Fit "540x540 q80 webp"}} -
    -
    - {{ .Title }} -
    - {{ end }} - {{ else }} -
    - {{ end }} -
    - {{ .Summary }} -
    -
    - - -
    + {{ if .Params.featured_image }} + {{ with $img := .Resources.GetMatch .Params.featured_image }} + {{ $height := add $img.Height 0.0}} + {{ $ratio := div $height $img.Width}} + {{ $thumb := $img.Fit "540x540 q80 webp"}} +
    +
    + {{ .Title }} +
    + {{end}} + {{ else if (.Resources.ByType "image") }} + {{ with (index (.Resources.ByType "image") 0) }} + {{ $img := . }} + {{ $height := add .Height 0.0}} + {{ $ratio := div $height .Width}} + {{ $thumb := .Fit "540x540 q80 webp"}} +
    +
    + {{ .Title }}
    + {{ end }} + {{ else }} +
    + {{ end }} +
    + {{ .Summary }} +
    +
    + + +
    +
    diff --git a/themes/lumbung-theme/layouts/partials/social_card.html b/themes/lumbung-theme/layouts/partials/social_card.html index 518baa5..ebff12f 100644 --- a/themes/lumbung-theme/layouts/partials/social_card.html +++ b/themes/lumbung-theme/layouts/partials/social_card.html @@ -1,49 +1,49 @@ - \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/video_box.html b/themes/lumbung-theme/layouts/partials/video_box.html index a6f7d4f..4a9f418 100644 --- a/themes/lumbung-theme/layouts/partials/video_box.html +++ b/themes/lumbung-theme/layouts/partials/video_box.html @@ -1,4 +1,4 @@ -
    +
    {{ .Params.video_channel }}
    Date: Wed, 28 Sep 2022 15:12:51 +0200 Subject: [PATCH 3/5] rename events to calendar in menu --- themes/lumbung-theme/layouts/partials/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/lumbung-theme/layouts/partials/header.html b/themes/lumbung-theme/layouts/partials/header.html index 28d24c3..d29fae1 100644 --- a/themes/lumbung-theme/layouts/partials/header.html +++ b/themes/lumbung-theme/layouts/partials/header.html @@ -17,7 +17,7 @@
  • contributors
    • -
  • events
    • +
  • calendar
  • tv
  • social
  • pen
    • From 58efb45a8c7feae3c04ba8ac676e9d28fa45f101 Mon Sep 17 00:00:00 2001 From: rra Date: Thu, 29 Sep 2022 16:03:36 +0200 Subject: [PATCH 4/5] only show upcoming events section if there are upcoming events --- themes/lumbung-theme/layouts/events/list.html | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/themes/lumbung-theme/layouts/events/list.html b/themes/lumbung-theme/layouts/events/list.html index 387ce42..739ad2c 100644 --- a/themes/lumbung-theme/layouts/events/list.html +++ b/themes/lumbung-theme/layouts/events/list.html @@ -3,26 +3,36 @@
    {{ $now := (now.Format "060102" ) }} -
    -
    upcoming events
    - {{ range .Pages }} + + {{ $upcoming := slice }} + {{ $past := slice}} + + {{ range .Pages }} {{ $t := (substr .Params.event_end 2 8) }} {{ $time := ( replace $t "-" "") }} {{ if ge $time $now }} - {{- partial "event_list_item.html" . -}} + {{ $upcoming = $upcoming | append . }} + {{ else if gt $now $time }} + {{ $past = $past | append . }} {{ end }} {{ end }} -
    + + {{ with $upcoming }} +
    +
    upcoming events
    + {{ range $upcoming}} + {{- partial "event_list_item.html" . -}} + {{end}} +
    + {{end}} + {{ with $past }}
    past events
    - {{ range .Pages }} - {{ $t := (substr .Params.event_end 2 8) }} - {{ $time := ( replace $t "-" "") }} - {{ if gt $now $time }} - {{- partial "event_list_item.html" . -}} - {{ end }} + {{ range $past }} + {{- partial "event_list_item.html" . -}} {{ end }}
    + {{ end }}
    From 72e2872a2bc2530f51052d6eaacb773fe58ce5d7 Mon Sep 17 00:00:00 2001 From: rra Date: Mon, 10 Oct 2022 09:35:35 +0200 Subject: [PATCH 5/5] final fixes from Cristoph --- .../layouts/_default/baseof.html | 81 +++++++++++++++++-- .../lumbung-theme/layouts/_default/list.html | 72 +++++++++-------- themes/lumbung-theme/layouts/index.html | 6 +- .../layouts/partials/filter-nav.html | 1 + .../layouts/partials/footer.html | 7 +- .../layouts/partials/header.html | 2 +- .../layouts/partials/social_card.html | 2 +- themes/lumbung-theme/static/css/main.css | 20 ++++- 8 files changed, 136 insertions(+), 55 deletions(-) diff --git a/themes/lumbung-theme/layouts/_default/baseof.html b/themes/lumbung-theme/layouts/_default/baseof.html index 9e34d4e..007eb1a 100644 --- a/themes/lumbung-theme/layouts/_default/baseof.html +++ b/themes/lumbung-theme/layouts/_default/baseof.html @@ -11,6 +11,8 @@ {{- partial "news-ticker.html" . -}} {{- partial "footer.html" . -}} + + diff --git a/themes/lumbung-theme/layouts/_default/list.html b/themes/lumbung-theme/layouts/_default/list.html index 094ef4d..9178d35 100644 --- a/themes/lumbung-theme/layouts/_default/list.html +++ b/themes/lumbung-theme/layouts/_default/list.html @@ -1,40 +1,48 @@ {{ define "main" }}
    -
    - {{ range where (.Paginator 13).Pages "Params.hidden" "ne" "true" }} - +
    + {{ $range := where .Pages "Params.hidden" "ne" "true" }} + {{ $paginator := .Paginate $range }} + {{ $pageSize := $paginator.PageSize }} + {{ $totalPostsToShow := mul $paginator.PageNumber $pageSize }} + {{ range $index, $el := (first $totalPostsToShow $range) }} + +
    {{if eq .Section "tv"}} - {{- partial "video_box.html" . -}} - - {{ else if eq .Section "events" }} - {{- partial "partials/calendar_card.html" . -}} - - {{ else if eq .Section "shouts" }} - {{ if in .Params.sources "pen.lumbung.space" }} - {{- partial "pen_card.html" . -}} - {{ else }} - {{- partial "shout_card.html" . -}} - {{ end }} - - {{ else if eq .Section "social" }} - {{- partial "social_card.html" . -}} - - {{ else if eq .Section "publications"}} - {{- partial "book_card.html" . -}} - - {{ else if eq .Section "sounds"}} - {{- partial "sounds_card.html" . -}} - - {{ else }} - {{- partial "card.html" . -}} - - {{ end }} + {{- partial "video_box.html" . -}} + + {{ else if eq .Section "events" }} + {{- partial "partials/calendar_card.html" . -}} + + {{ else if eq .Section "shouts" }} + {{ if in .Params.sources "pen.lumbung.space" }} + {{- partial "partials/pen_card.html" . -}} + {{ else }} + {{- partial "partials/shout_card.html" . -}} + {{ end }} + + {{ else if eq .Section "social" }} + {{- partial "partials/social_card.html" . -}} + + {{ else if eq .Section "publications"}} + {{- partial "partials/book_card.html" . -}} + + {{ else if eq .Section "sounds"}} + {{- partial "sounds_card.html" . -}} + + {{ else }} + {{- partial "card.html" . -}} + {{ end }} +
    {{ end }}
    - - + +
    + {{ if and (gt $paginator.TotalPages 1) ($paginator.HasNext) }} + load more + {{ end }} +
    +
    {{ end }} \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/index.html b/themes/lumbung-theme/layouts/index.html index 9db5fab..190ba06 100644 --- a/themes/lumbung-theme/layouts/index.html +++ b/themes/lumbung-theme/layouts/index.html @@ -1,5 +1,4 @@ {{ define "main" }} -
    @@ -42,9 +41,8 @@
    {{ if and (gt $paginator.TotalPages 1) ($paginator.HasNext) }} - Next Page + load more {{ end }} - Load all
    @@ -54,8 +52,6 @@ lumbung radio
    - -
    diff --git a/themes/lumbung-theme/layouts/partials/filter-nav.html b/themes/lumbung-theme/layouts/partials/filter-nav.html index da36f2c..373c62b 100644 --- a/themes/lumbung-theme/layouts/partials/filter-nav.html +++ b/themes/lumbung-theme/layouts/partials/filter-nav.html @@ -12,6 +12,7 @@
    Cards
    +
    load more cards
    diff --git a/themes/lumbung-theme/layouts/partials/footer.html b/themes/lumbung-theme/layouts/partials/footer.html index 3c74e2b..c75a630 100644 --- a/themes/lumbung-theme/layouts/partials/footer.html +++ b/themes/lumbung-theme/layouts/partials/footer.html @@ -18,9 +18,4 @@
    Imprint - Privacy Policy - Glossary - Terms of Use
    - - - - \ No newline at end of file + \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/header.html b/themes/lumbung-theme/layouts/partials/header.html index d29fae1..ba3b1a0 100644 --- a/themes/lumbung-theme/layouts/partials/header.html +++ b/themes/lumbung-theme/layouts/partials/header.html @@ -7,7 +7,7 @@