diff --git a/assets/images/banner/about.jpg b/assets/images/banner/about.jpg new file mode 100644 index 00000000..6aac5d62 Binary files /dev/null and b/assets/images/banner/about.jpg differ diff --git a/assets/images/banner/home.jpg b/assets/images/banner/home.jpg new file mode 100644 index 00000000..6aac5d62 Binary files /dev/null and b/assets/images/banner/home.jpg differ diff --git a/assets/images/banner/news.jpg b/assets/images/banner/news.jpg new file mode 100644 index 00000000..6aac5d62 Binary files /dev/null and b/assets/images/banner/news.jpg differ diff --git a/assets/images/banner/tools.jpg b/assets/images/banner/tools.jpg new file mode 100644 index 00000000..6aac5d62 Binary files /dev/null and b/assets/images/banner/tools.jpg differ diff --git a/content/archive.de.md b/content/archive.de.md index 78756941..1e1f6330 100644 --- a/content/archive.de.md +++ b/content/archive.de.md @@ -1,4 +1,5 @@ --- title: "Archiv" layout: "archive" +banner: false --- diff --git a/content/contact.de.md b/content/contact.de.md index 21f06ba9..9f4f2e49 100644 --- a/content/contact.de.md +++ b/content/contact.de.md @@ -1,6 +1,7 @@ --- title: "Kontakt" layout: "contact" +banner: false --- Konzerte: konzerte@bunteshaus.de diff --git a/content/imprint.de.md b/content/imprint.de.md index b621805b..7dfeac1c 100644 --- a/content/imprint.de.md +++ b/content/imprint.de.md @@ -1,6 +1,7 @@ --- title: "Impressum" layout: "generic_single" +banner: false --- Angaben gemäß § 5 TMG diff --git a/content/links.de.md b/content/links.de.md index 4e9bebca..bbf5ff0f 100644 --- a/content/links.de.md +++ b/content/links.de.md @@ -1,6 +1,7 @@ --- title: "Links" layout: "links" +banner: false --- http://list-celle.over-blog.com/ Gruppe LiST: Land in Sicht - Transition Celle diff --git a/content/misc/_index.de.md b/content/misc/_index.de.md index e45f3bd8..87055a1b 100644 --- a/content/misc/_index.de.md +++ b/content/misc/_index.de.md @@ -1,4 +1,5 @@ --- title: "Verschiedenes" layout: "section_list" +banner: false --- diff --git a/content/misc/flyertext.de.md b/content/misc/flyertext.de.md index 9ccfb4c5..f2da41ca 100644 --- a/content/misc/flyertext.de.md +++ b/content/misc/flyertext.de.md @@ -1,7 +1,8 @@ --- title: "Flyertext" date: 2021-06-22T23:00:00+02:00 +banner: false --- **Der folgende Text muss auf jedem Flyer gedruckt werden:** -Das Bunte Haus ist kein Ort für Rassismus, Antisemitismus, Sexismus oder Diskriminierung aufgrund sexueller Orientierungen! Wenn ihr dumm angemacht, angefasst oder sonst wie belästigt werdet meldet euch an der Theke, der Kasse oder bei den Türsteher*innen. Ihr entscheidet selbst, wo eure Grenzen liegen! \ No newline at end of file +Das Bunte Haus ist kein Ort für Rassismus, Antisemitismus, Sexismus oder Diskriminierung aufgrund sexueller Orientierungen! Wenn ihr dumm angemacht, angefasst oder sonst wie belästigt werdet meldet euch an der Theke, der Kasse oder bei den Türsteher*innen. Ihr entscheidet selbst, wo eure Grenzen liegen! diff --git a/content/misc/media/_index.de.md b/content/misc/media/_index.de.md index f0b3e55d..b857f82c 100644 --- a/content/misc/media/_index.de.md +++ b/content/misc/media/_index.de.md @@ -1,4 +1,5 @@ --- title: "Medien" layout: "media" +banner: false --- diff --git a/content/misc/partyunterlagen.de.md b/content/misc/partyunterlagen.de.md index 0144ad26..e1581a07 100644 --- a/content/misc/partyunterlagen.de.md +++ b/content/misc/partyunterlagen.de.md @@ -1,6 +1,7 @@ --- title: "Partyunterlagen" date: 2021-06-22T23:00:00+02:00 +banner: false --- ## Wie geht ne Party? diff --git a/content/misc/tools/_index.de.md b/content/misc/tools/_index.de.md index 658043e0..6e7e63c3 100644 --- a/content/misc/tools/_index.de.md +++ b/content/misc/tools/_index.de.md @@ -1,4 +1,5 @@ --- title: "Tools" layout: "section_list" +banner: false --- diff --git a/content/misc/tools/generator.de.md b/content/misc/tools/generator.de.md index 837ada6d..d6a7a95e 100644 --- a/content/misc/tools/generator.de.md +++ b/content/misc/tools/generator.de.md @@ -1,6 +1,7 @@ --- title: "Generator" date: 2021-06-22T23:00:00+02:00 +banner: false description: "generator" type: "tools" tool: "generator" diff --git a/content/misc/tools/not_translated.de.md b/content/misc/tools/not_translated.de.md index 5536e32f..6d6b2491 100644 --- a/content/misc/tools/not_translated.de.md +++ b/content/misc/tools/not_translated.de.md @@ -4,4 +4,5 @@ date: 2021-06-22T23:00:00+02:00 description: "nottranslated" type: "tools" tool: "nottranslated" +banner: false --- diff --git a/content/news/cafe/index.de.md b/content/news/cafe/index.de.md index 30f12a7b..be955bde 100644 --- a/content/news/cafe/index.de.md +++ b/content/news/cafe/index.de.md @@ -3,7 +3,7 @@ title: "Offenes Café" date: "2021-10-20T17:00:00+02:00" about: true when: "Mittwochs 16.00-19.00Uhr und Sonntags 14.00-17.00Uhr" -events: ["Regelmäßig"] tags: ["Cafe"] +recurrent: true --- Seit August gibt es im Bunten Haus das "Offene Café" immer Mittwochs 16.00 - 19.00 Uhr und Sonntags 14.00 - 17.00 Uhr: Wir haben leckeren Kaffee, Espresso, Tee und weitere Getränke und manchmal auch Kuchen. Wir freuen uns, wenn ihr vorbeischaut. Wir sehen uns dort! diff --git a/content/newsletter.de.md b/content/newsletter.de.md index 4e38d088..3d620474 100644 --- a/content/newsletter.de.md +++ b/content/newsletter.de.md @@ -1,6 +1,7 @@ --- title: "Newsletter" layout: "generic_single" +banner: false --- Wenn ihr in unseren Newsletter aufgenommen werden wollt, schickt uns eine email! diff --git a/themes/buha/assets/css/article.css b/themes/buha/assets/css/article.css index 8386603e..546eec1b 100644 --- a/themes/buha/assets/css/article.css +++ b/themes/buha/assets/css/article.css @@ -1,7 +1,6 @@ article { flex-grow: 1; flex-shrink: 0; - padding: 1rem; margin-bottom: 2rem; border-radius: 10px; align-items: stretch; @@ -80,7 +79,6 @@ article .readmore { .articleinner { display: flex; flex-direction: column-reverse; - margin-left: .3rem; } .article_footer { diff --git a/themes/buha/assets/css/classes.css b/themes/buha/assets/css/classes.css index baa6d3ff..79b76adf 100644 --- a/themes/buha/assets/css/classes.css +++ b/themes/buha/assets/css/classes.css @@ -31,10 +31,6 @@ font-size: smaller; } -.margin_left_1rem { - margin-left: 1rem; -} - .margin_right_1rem { margin-right: 1rem; } diff --git a/themes/buha/assets/css/main.css b/themes/buha/assets/css/main.css index 51d00727..caaef64c 100644 --- a/themes/buha/assets/css/main.css +++ b/themes/buha/assets/css/main.css @@ -19,17 +19,16 @@ h1 { } #main { - padding-left: 1rem; padding-right: 1rem; padding-bottom: 1rem; display: flex; - padding: 1rem; } #content { display: flex; flex-direction: column; flex-grow: 1; + padding: 1rem; } aside { @@ -39,10 +38,9 @@ aside { section { flex-grow: 0; flex-shrink: 0; - margin-left: 0rem; - padding: 1rem; - align-items: stretch; border-radius: 10px; + padding-left: 1rem; + padding-right: 1rem; } @keyframes color { diff --git a/themes/buha/layouts/_default/baseof.html b/themes/buha/layouts/_default/baseof.html index ce286c07..c9cf8398 100644 --- a/themes/buha/layouts/_default/baseof.html +++ b/themes/buha/layouts/_default/baseof.html @@ -7,7 +7,7 @@
{{ partial "snippets/header" . }}
- {{ partial "snippets/banner" . -}} + {{ partial "snippets/banner" . -}}
{{ block "content" . -}}{{- end }} diff --git a/themes/buha/layouts/_default/list.html b/themes/buha/layouts/_default/list.html index d097a29f..209605af 100644 --- a/themes/buha/layouts/_default/list.html +++ b/themes/buha/layouts/_default/list.html @@ -24,6 +24,8 @@ {{- $pages = .Data.Pages -}} {{ else if eq .Section "featured" }} {{- $pages = where $pages ".Params.featured" "=" true -}} + {{ else if eq .Section "recurrent" }} + {{- $pages = where $pages ".Params.recurrent" "=" true -}} {{ end }} {{ else }} {{ if eq .Kind "term" }} diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html index fc2c695c..76a3b4d2 100644 --- a/themes/buha/layouts/_default/single.html +++ b/themes/buha/layouts/_default/single.html @@ -3,7 +3,6 @@ {{ end }} {{ define "content" }} - {{ partial "debug" (dict "context" . "caller" "single_chooser.html")}} {{ $partial_before := "" }} {{ $partial := "layout/article" }} {{ $pic := "true" }} diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html index 13edbd50..4aa57bb2 100644 --- a/themes/buha/layouts/index.html +++ b/themes/buha/layouts/index.html @@ -4,25 +4,21 @@ {{ $featured := where (where (where $all ".Params.featured" "=" true) "Type" "in" .Site.Params.searchSections) ".Params.Lastmod" "gt" (now.AddDate 0 0 $days) }} {{ $featured = $all | intersect $featured }} {{ $posts := $all | complement $featured }} - {{- $paginator := .Paginate $posts -}} - {{ if eq $paginator.PageNumber 1 }} - {{ if ne .Content "" }} - {{ partial "snippets/content" (dict "content" .Content) }} - {{ end }} - {{ partial "layout/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }} - {{ end }} + {{ if ne .Content "" }} + {{ partial "snippets/content" (dict "content" .Content) }} + {{ end }} +
+ {{ if gt (len $featured) 1 }} +
+ {{ partial "layout/article_list" (dict "context" . "pages" $featured "amount" "5" "title" "Featured") }} +
+ {{ end }} {{ if gt (len $posts) 1 }} - {{ partial "layout/article_list" (dict "context" . "pages" $posts "amount" "5" "title" "News" "paginate" true) }} - {{ end }} -{{ end }} - -{{ define "banner" }} - {{ if .Resources.Match "banner*" }} - {{ $img := (.Resources.GetMatch "banner*") }} -

{{ .Title }}

- {{ else }} -

{{ .Title }}

+
+ {{ partial "layout/article_list" (dict "context" . "pages" $posts "amount" "5" "title" "News") }} +
{{ end }} +
{{ end }} {{ define "sidebar" }} diff --git a/themes/buha/layouts/partials/layout/article_list.html b/themes/buha/layouts/partials/layout/article_list.html index 82ac57f9..3b9de7e3 100644 --- a/themes/buha/layouts/partials/layout/article_list.html +++ b/themes/buha/layouts/partials/layout/article_list.html @@ -1,18 +1,24 @@ {{ if and .amount .pages }} {{ $amount := .amount }} {{ $pages := .pages.ByLastmod.Reverse }} - + {{ $p := .pages.ByLastmod.Reverse }} {{- $paginator := .context.Paginate $pages -}} + + {{ if .paginate }} + $p = $paginator.Pages + {{ end }} + {{ if eq $paginator.PageNumber 1 }} {{ if .content }} {{ partial "snippets/content" (dict "content" .content) }} {{ end }} {{ end }} {{- if gt (len $pages) 0 -}} +
{{ if .title }}

{{ .title }}

{{ end }} - {{- range first $amount $pages -}} -
{{ end }} {{ end }} diff --git a/themes/buha/layouts/partials/snippets/banner.html b/themes/buha/layouts/partials/snippets/banner.html index 731fbdca..d16f181a 100644 --- a/themes/buha/layouts/partials/snippets/banner.html +++ b/themes/buha/layouts/partials/snippets/banner.html @@ -4,9 +4,25 @@ {{ if not $title }} {{ $title = .Title }} {{ end }} - -{{ $img := resources.Get "/images/banner/banner_1.jpg" }} -{{ if .Resources.Match "banner*" }} - {{ $img = (.Resources.GetMatch "banner*") }} + +{{ $what := "none" }} +{{ $img := "none" }} +{{ if eq .Kind "home" }} + {{ $what = "home" }} +{{ else if .File.ContentBaseName }} + {{ $what = .File.ContentBaseName }} +{{ end }} +{{ $banner := printf "/images/banner/%s*" $what }} +{{ if resources.GetMatch $banner }} + {{ $img = resources.GetMatch $banner }} +{{ end }} + +{{ if resources.GetMatch $banner }} +

{{ $title }}

+{{ else if .Resources.Match "banner*" }} + {{ $img = (.Resources.GetMatch "banner*") }} +

{{ $title }}

+{{ else }} +

{{ $title }}

+ {{ $banner }} {{ end }} -

{{ $title }}