From 0e2f6a71a131687d2c1c676de72dbfdca60f20c0 Mon Sep 17 00:00:00 2001 From: rra Date: Wed, 28 Sep 2022 14:11:14 +0200 Subject: [PATCH] merge fixes from Cristoph, working filter, calendar view --- config.toml | 5 +- .../lumbung-theme/layouts/_default/list.html | 4 +- themes/lumbung-theme/layouts/events/list.html | 29 +++ themes/lumbung-theme/layouts/index.html | 23 +- .../layouts/partials/book_card.html | 74 +++--- .../layouts/partials/calendar_card.html | 2 +- .../lumbung-theme/layouts/partials/card.html | 2 +- .../layouts/partials/data/contributors.html | 1 + .../layouts/partials/data/sources.html | 1 + .../layouts/partials/event_list_item.html | 19 ++ .../layouts/partials/filter-nav.html | 16 +- .../layouts/partials/footer.html | 2 +- .../lumbung-theme/layouts/partials/head.html | 1 + .../layouts/partials/header.html | 11 +- .../layouts/partials/pen_card.html | 4 +- .../layouts/partials/shout_card.html | 92 +++---- .../layouts/partials/social_card.html | 94 ++++---- .../layouts/partials/video_box.html | 2 +- themes/lumbung-theme/static/css/main.css | 225 +++++++++++++++--- 19 files changed, 414 insertions(+), 193 deletions(-) create mode 100644 themes/lumbung-theme/layouts/events/list.html create mode 100644 themes/lumbung-theme/layouts/partials/data/contributors.html create mode 100644 themes/lumbung-theme/layouts/partials/data/sources.html create mode 100644 themes/lumbung-theme/layouts/partials/event_list_item.html diff --git a/config.toml b/config.toml index 1e59e82..1489f8a 100644 --- a/config.toml +++ b/config.toml @@ -14,10 +14,10 @@ paginate = 20 title = 'lumbung dot space' bundleCss = "/bundle.css" bundleJs = "/bundle.js" - mainSections = ['social', 'shouts', 'calendar', 'tv', 'pen'] + mainSections = ['social', 'shouts', 'events', 'tv', 'pen', 'pages'] [markup.goldmark.renderer] -unsafe = true + unsafe = true [taxonomies] author = "authors" @@ -25,6 +25,7 @@ unsafe = true tag = "tags" source = "sources" timeline = "timelines" + [permalinks] timelines = "/timeline/:slug/" diff --git a/themes/lumbung-theme/layouts/_default/list.html b/themes/lumbung-theme/layouts/_default/list.html index 3c45a28..094ef4d 100644 --- a/themes/lumbung-theme/layouts/_default/list.html +++ b/themes/lumbung-theme/layouts/_default/list.html @@ -33,8 +33,8 @@ {{ end }} - - {{ if .Site.Params.mainSections }} - {{- partial "filter-nav.html" . -}} - {{ end }}
login
- + - + + 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 }}