many changes

This commit is contained in:
teldra 2022-05-06 11:49:30 +02:00
parent 0aef75bc3f
commit 30a0e20c53
41 changed files with 2778 additions and 100 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -20,7 +20,7 @@ media = true
imprint = true
# what is seen in the header?
mainMenu = ['about']
mainMenu = ['about','news','events']
# in which section search for posts?
searchSections = ['news']

View File

@ -1,5 +1,5 @@
---
title: "Willkommen"
title: "Bunteshaus e.v."
---
Wir sind das Buntehaus, ein soziokulturelles Zentrum in Celle.
Wir leben vom mitmachen und so.

View File

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

View File

Before

Width:  |  Height:  |  Size: 382 KiB

After

Width:  |  Height:  |  Size: 382 KiB

View File

Before

Width:  |  Height:  |  Size: 240 KiB

After

Width:  |  Height:  |  Size: 240 KiB

View File

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

View File

Before

Width:  |  Height:  |  Size: 3.0 MiB

After

Width:  |  Height:  |  Size: 3.0 MiB

View File

Before

Width:  |  Height:  |  Size: 4.7 MiB

After

Width:  |  Height:  |  Size: 4.7 MiB

View File

Before

Width:  |  Height:  |  Size: 225 KiB

After

Width:  |  Height:  |  Size: 225 KiB

View File

@ -0,0 +1,7 @@
[Dolphin]
HeaderColumnWidths=733,143,94,163
SortOrder=1
SortRole=modificationtime
Timestamp=2022,4,28,22,48,30.82
Version=4
VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_type,Details_permissions,CustomizedDetails

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

View File

Before

Width:  |  Height:  |  Size: 286 KiB

After

Width:  |  Height:  |  Size: 286 KiB

View File

@ -0,0 +1 @@
/home/xo/work/buha/bunteshaus.de/content/news/cafe/banner.jpeg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 328 KiB

After

Width:  |  Height:  |  Size: 358 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 358 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 328 KiB

View File

@ -5,7 +5,6 @@
flex-direction: row;
flex-wrap: wrap;
background-color: #741e94;
background: url(/images/logo_back_full.svg);
padding: .2rem;
padding-right: .7rem;
}

View File

@ -5,7 +5,7 @@ img {
#container {
background-color: var(--background);
background-image: linear-gradient(var(--background-alt), var(--background));
background-image: linear-gradient(var(--background), var(--background-alt));
}
main {
@ -58,3 +58,20 @@ body {
background: #12011e; /* Fallback */
animation: color 300s infinite linear;
}
img.light-shadow{
filter: drop-shadow(0px 3px 3px rgba(0, 0, 0, 0.4));
}
img.dark-shadow{
filter: drop-shadow(0px 3px 3px rgba(0, 0, 0, 1));
}
a.light-shadow{
text-shadow: 0px 3px 3px rgba(0, 0, 0, 0.4);
}
a.dark-shadow{
text-shadow: 0px 3px 3px rgba(0, 0, 0, 1);
color: white;
}

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

Before

Width:  |  Height:  |  Size: 4.3 MiB

After

Width:  |  Height:  |  Size: 4.3 MiB

View File

@ -9,7 +9,7 @@
{{- else -}}
{{ if .Page.Resources.ByType "image" }}
{{ $nr := .Destination }}
{{- $pic := index (.Page.Resources.ByType "image") (int $nr) -}}
{{- $pic := index (.Page.Resources.ByType "image") (sub (int $nr) 1) -}}
{{- $image := .Page.Resources.GetMatch (printf "%s" ($pic | safeURL)) -}}
{{ if ne $image nil }}
<div>

View File

@ -5,19 +5,15 @@
<body>
<div id="container">
<header>
{{ partialCached "snippets/header" . }}
{{ partial "snippets/submenu" . }}
{{ partial "snippets/header" . }}
</header>
{{ partial "snippets/banner" . -}}
<main id="main">
<div id="content">
{{ block "title" . -}}{{- end }}
{{ block "calc" . -}}{{- end }}
{{ block "content" . -}}{{- end }}
{{ block "pagefooter" . -}}{{- end }}
</div>
<aside id="sidebar">
{{ block "sidebar" . -}}{{- end }}
</aside>
</main>
<footer>
{{- partial "snippets/footer" . -}}

View File

@ -1,20 +1,21 @@
{{ define "title" }}
<h1>{{ if .Title }}{{ .Title }}{{ else }}{{ if i18n .Section }}{{ i18n .Section }}{{ else }}{{ .Section }}{{ end }}{{ end }}</h1>
<h1>{{ if .Title }}
{{ .Title }}
{{ else }}
{{ if i18n .Section }}
{{ i18n .Section }}
{{ else }}
{{ .Section }}
{{ end }}
{{ end }}</h1>
{{ end }}
{{ define "content" }}
{{ partial "debug" (dict "context" . "caller" "list.html")}}
{{- $pages := where .Site.RegularPages "Permalink" "!=" .Permalink -}}
{{ $partial := "" }}
{{ $title := "" }}
{{ $pic := "true" }}
{{ $pre := "layout" }}
{{- $paginator := "" -}}
{{ $part := .Layout }}
{{ $partial_before := "" }}
{{ $paginate := false }}
{{ if eq .Layout "article_list" }}
{{ $paginate = true }}
{{- $partial := .Layout -}}
{{- $paginate := true -}}
{{- if eq .Layout "article_list" -}}
{{ if eq .Section "events" }}
{{- $pages = where $pages ".Params.when" "ne" nil -}}
{{ else if eq .Type "about" }}
@ -27,17 +28,50 @@
{{ else }}
{{ if eq .Kind "term" }}
{{- $pages = .Data.Pages -}}
{{ $part = "article_list" }}
{{ $partial = "article_list" }}
{{ else if eq .Kind "taxonomy" }}
{{- $pages = .Data.Terms.Alphabetical -}}
{{ $part = "tags_n_categories" }}
{{ $paginate = false }}
{{- $pages = .Data.Terms.ByCount -}}
{{ $partial = "tags_n_categories" }}
{{ end }}
{{ end }}
{{ if eq $paginate true}}
{{- $paginator = .Paginate $pages -}}
{{ end }}
{{ if and $pre $part }}
{{ $partial := string (printf "%s/%s" $pre $part) }}
{{ partial $partial (dict "context" . "paginator" $paginator "pages" $pages "amount" "5" "title" $title "content" .Content "pic" $pic "type" .Type "partial_before" $partial_before "paginate" $paginate) }}
{{ $partial = string (printf "layout/%s" $partial) }}
{{ partial $partial (dict "context" . "pages" $pages "amount" "5" "content" .Content "type" .Type "paginate" $paginate) }}
{{ end }}
{{ define "sidebar" }}
{{ if eq .Section "news" }}
{{ if gt .Site.Taxonomies.categories 0 }}
<div>
<h3 class="align_menu">{{ if i18n "categories" }}{{ i18n "categories" }}{{ else }}{{ "Categories" }}{{ end }}</h3>
{{ range $taxonomyname, $taxonomy := .Site.Taxonomies.categories }}
{{ $orig := $taxonomyname }}
{{ if ne (i18n $taxonomyname) "" }}
{{ $taxonomyname = i18n $taxonomyname }}
{{ else }}
{{ $taxonomyname = $taxonomyname | humanize }}
{{ end }}
<div class="align_menu"><a href="{{ "categories/" | relLangURL}}{{ $orig | urlize }}">{{ $taxonomyname }}</a></div>
{{ end }}
</div>
{{ end }}
{{ else if eq .Section "events" }}
{{ if gt .Site.Taxonomies.events 0 }}
<div>
<h3 class="align_menu">{{ if i18n "categories" }}{{ i18n "categories" }}{{ else }}{{ "Categories" }}{{ end }}</h3>
{{ range $taxonomyname, $taxonomy := .Site.Taxonomies.events }}
{{ $orig := $taxonomyname }}
{{ if ne (i18n $taxonomyname) "" }}
{{ $taxonomyname = i18n $taxonomyname }}
{{ else }}
{{ $taxonomyname = $taxonomyname | humanize }}
{{ end }}
<div class="align_menu"><a href="{{ "events/" | relLangURL}}{{ $orig | urlize }}">{{ $taxonomyname }}</a></div>
{{ end }}
</div>
{{ end }}
{{ end }}
{{ end }}

View File

@ -6,14 +6,25 @@
{{ $posts := $all | complement $featured }}
{{- $paginator := .Paginate $posts -}}
{{ if eq $paginator.PageNumber 1 }}
<h1>{{ .Title }}</h1>
{{ if ne .Content "" }}
{{ partial "snippets/content" (dict "content" .Content) }}
{{ end }}
{{ partial "layout/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }}
{{ end }}
{{ if gt (len $posts) 1 }}
{{ partial "layout/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News" "type" "list") }}
{{ partial "snippets/paginator" (dict "paginator" $paginator) }}
{{ 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*") }}
<div style="background-image:linear-gradient(rgba(0, 0, 0, 0.4), rgba(0, 0, 0, 0.4)), url({{- $img.Permalink -}}); background-size: cover; min-height: 33vh; display: flex; justify-content: center; align-items: center;"><h1 style="font-size: xx-large; text-shadow: -2px 0px 3px rgba(0,0,0,.25), -2px -2px 3px rgba(0,0,0,.25), 0px 2px 3px rgba(0,0,0,.25), 2px 2px 3px rgba(0,0,0,.25); ">{{ .Title }}</h1></div>
{{ else }}
<h1 style="margin-top: 1rem; margin-left: 1rem; margin-bottom: 0; color: white;">{{ .Title }}</h1>
{{ end }}
{{ end }}
{{ define "sidebar" }}
{{ "" }}
{{ end }}

View File

@ -2,63 +2,63 @@
{{ if eq .type "list" }}
{{ $metas = dict "when" .context.Params.when "price" .context.Params.price }}
{{ end }}
{{ $type := .type }}
{{ $pic := "solo" }}
{{ $text := "solo" }}
{{- if and (.context.Resources.ByType "image") (.context.Content) -}}
{{ $pic = "multiple_small" }}
{{ $text = "multiple_big" }}
{{ else if and (.context.Resources.ByType "image") (not (.context.Content)) }}
{{ $pic = "multiple_medium" }}
{{ if eq $type "list" }}
{{- if and (.context.Resources.ByType "image") (.context.Content) -}}
{{ $pic = "multiple_small" }}
{{ $text = "multiple_big" }}
{{ else if and (.context.Resources.ByType "image") (not (.context.Content)) }}
{{ $pic = "multiple_medium" }}
{{ end }}
{{ end }}
{{ partial "snippets/article_metadata" $metas }}
<div class="articleinner">
{{ $i := .context.Resources.ByType "image" }}
{{- if .context.Content -}}
{{- if and (.context.Resources.ByType "image") (eq .pic "true") -}}
{{ $resize := "500x" }}
{{- $img := index (.context.Resources.ByType "image") 0 -}}
{{- $thumb := index (.context.Resources.ByType "image") 0 -}}
{{ if ne .context.Content "" }}
{{- $resize = "2048x" }}
{{ else if eq .type "list" }}
{{- $resize = "300x" }}
{{ end }}
{{- $thumb = $img.Resize $resize }}
<div class="articlepicture {{ $pic }}" >
{{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
<img src="{{- $thumb.Permalink -}}" class="borderrad4px" />
{{ if and (ne .type "list") (.context.Resources.ByType "image") }}</a>{{ end }}
</div>
{{ if eq $type "list" }}
{{ if .context.Resources.Match "banner*" }}
<div class="articlepicture {{ $pic }}">
{{ range $i }}
{{ if hasPrefix .Name "banner" }}
{{ $img := . }}
{{ $thumb := $img.Resize "500x" }}
<img src="{{ $thumb.Permalink }}" />
{{- end }}
{{- end }}
</div>
{{- end }}
{{ end }}
{{- if or .context.Content .context.Summary -}}
<div class="articletext {{ $text }}">
{{ if eq .type "list" }}{{- .context.Summary -}}{{ else }}{{- .context.Content -}}{{ end }}
{{ if and .context.Truncated (eq .type "list") }}
<div class="readmore">{{- if i18n "readmore" -}}{{- i18n "readmore" -}}{{- else -}}{{- "readmore" -}}{{- end -}}..</div>
{{ end }}
</div>
{{- end }}
<div class="articletext {{ $text }}">
{{ if eq .type "list" }}{{- .context.Summary -}}{{ else }}{{- .context.Content -}}{{ end }}
{{ if and .context.Truncated (eq .type "list") }}
<div class="readmore">{{- if i18n "readmore" -}}{{- i18n "readmore" -}}{{- else -}}{{- "readmore" -}}{{- end -}}..</div>
{{ end }}
</div>
{{ else }}
{{ $type := .type }}
{{ if eq $type "article" }}
<div style="display:flex; flex-direction: column;">
{{ range .context.Resources.ByType "image" }}
{{ $img := . }}
{{ $thumb := $img.Resize "500x" }}
<a href="{{ $img.Permalink }}"><img src="{{ $thumb.Permalink }}" /></a>
{{ range $i }}
{{ if not (hasPrefix .Name "banner") }}
{{ $img := . }}
{{ $thumb := $img.Resize "500x" }}
<a href="{{ $img.Permalink }}"><img src="{{ $thumb.Permalink }}" /></a>
{{- end }}
{{- end }}
</div>
{{ else }}
{{- $img := index (.context.Resources.ByType "image") 0 -}}
{{ $thumb := $img.Resize "300x" }}
<img src="{{ $thumb.Permalink }}" />
{{ range first 1 $i }}
{{ if not (hasPrefix .Name "banner") }}
{{ $img := . }}
{{ $thumb := $img.Resize "500x" }}
<img src="{{ $thumb.Permalink }}" />
{{- end }}
{{- end }}
{{ end }}
{{- end }}
</div>
{{ define "pagefooter" }}
{{ if and (eq .Kind "page") (or (eq .Section "news") (eq .Section "events") (eq .Section "about")) }}
<div class="article_footer">
@ -105,6 +105,28 @@
{{ define "sidebar" }}
{{ if ne .Type "tools" }}
{{- partial "snippets/menu" . }}
{{ end }}
<aside id="sidebar">
{{ if .Params.categories }}
<h3 class="align_menu"><a href="{{ "/categories/" | relLangURL }}">{{ if i18n "categories" }}{{ i18n "categories" }}{{ else }}{{ "Categories" }}{{ end }}</a></h3>
{{ range .Params.categories }}
<div class="align_menu"><a href="{{ "/categories/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></div>
{{ end }}
{{ end }}
{{ if .Params.events }}
<h3 class="align_menu"><a href="{{ "/events/" | relLangURL }}">{{ if i18n "events" }}{{ i18n "events" }}{{ else }}{{ "events" }}{{ end }}</a></h3>
{{ range .Params.events }}
<div class="align_menu"><a href="{{ "/events/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></div>
{{ end }}
{{ end }}
{{ if .Params.tags }}
<h3 class="align_menu"><a href="{{ "/tags/" | relLangURL }}">{{ if i18n "tags" }}{{ i18n "tags" }}{{ else }}{{ "Tags" }}{{ end }}</a></h3>
{{ range .Params.tags }}
<div class="align_menu"><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></div>
{{ end }}
{{ end }}
</aside>
{{ end }}
{{ end }}

View File

@ -1,9 +1,7 @@
{{ if and .amount (or .paginator .pages) }}
{{ if and .amount .pages }}
{{ $amount := .amount }}
{{ $pages := .pages.ByLastmod.Reverse }}
{{ if .paginator }}
{{ $pages = .paginator.Pages.ByLastmod.Reverse }}
{{ end }}
{{- $paginator := .context.Paginate $pages -}}
{{ if eq $paginator.PageNumber 1 }}

View File

@ -1,6 +1,7 @@
<article>
<section>
{{ $type := .type }}
{{ range .pages }}
<a href="{{ .Page.Permalink }}" style="margin-right: 1rem;">{{ .Page.Title }} {{ if eq $type "tags"}}{{ .Count }}{{ end }}</a>
{{ end }}
</article>
</section>

View File

@ -0,0 +1,12 @@
{{ $title := .Title }}
{{ $title = singularize $title }}
{{ $title = i18n $title }}
{{ if not $title }}
{{ $title = .Title }}
{{ end }}
{{ $img := resources.Get "/images/banner/banner_1.jpg" }}
{{ if .Resources.Match "banner*" }}
{{ $img = (.Resources.GetMatch "banner*") }}
{{ end }}
<div style="background-image:linear-gradient(rgba(0, 0, 0, 0.4), rgba(0, 0, 0, 0.4)), url({{- $img.Permalink -}}); background-size: cover; min-height: 33vh; display: flex; justify-content: center; align-items: center;"><h1 style="font-size: 350%; color: white;">{{ $title }}</h1></div>

View File

@ -25,7 +25,6 @@
<a href="{{- "newsletter" | absLangURL -}}">{{- $newsletter | strings.FirstUpper -}}</a><br><br>
{{- end -}}
<a href="{{- "misc" | absLangURL -}}">Misc</a><br><br>
<a href="{{- "tools" | absLangURL -}}">Tools</a><br><br>
</div>
<div class="infobox">
@ -42,13 +41,6 @@
{{ $links = i18n "links" }}
{{ end }}
<a href="{{- "links" | absLangURL -}}">{{- $links | strings.FirstUpper -}}</a><br><br>
{{- end -}}
{{- if eq site.Params.media true -}}
{{ $links := "Media" }}
{{ if i18n "media" }}
{{ $links = i18n "media" }}
{{ end }}
<a href="{{- "media" | absLangURL -}}">{{- $links | strings.FirstUpper -}}</a><br><br>
{{- end -}}
{{- if not (or (eq .Section "featured") (eq .Section "about")) -}}
{{- with .OutputFormats.Get "rss" -}}

View File

@ -2,6 +2,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{{ $pico := resources.Get "css/pico.css" }}
{{ $water := resources.Get "css/color.css" }}
{{ $header := resources.Get "css/header.css" }}
{{ $main := resources.Get "css/main.css" }}
@ -14,6 +15,7 @@
{{ $allcss := slice $water $header $main $article $paginator $footer $generator $big $classes | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }}
<link rel="stylesheet" href="{{ $allcss.RelPermalink }}" integrity="{{ $allcss.Data.Integrity }}">
{{ $title := print .Site.Title " | " .Title }}
{{ if .IsHome }}{{ $title = .Site.Title }}{{ end }}
<title>{{ $title }}</title>

View File

@ -1,6 +1,9 @@
<div id="headerinner">
{{ $img := resources.GetMatch "/images/logo_back_full.svg" }}
<div id="headerinner" style="background: url(--backgroud-color); background-size: cover;">
<a href="/">
<img src="/images/logo.svg" alt="SVG mit img laden">
<img src="/images/logo.svg" alt="SVG mit img laden" class="dark-shadow">
</a>
<div id="menu">
{{- range site.Params.mainMenu -}}
@ -8,8 +11,9 @@
{{ if i18n . }}
{{ $name = i18n . }}
{{ end }}
<a href="{{- . | relLangURL -}}" style="color: white;">{{- $name | humanize -}}</a>
<a href="{{- . | relLangURL -}}" class="dark-shadow">{{- $name | humanize -}}</a>
{{- end -}}
</div>
</div>

View File

@ -1,6 +0,0 @@
<div>
<details>
<summary>Menü ☰</summary>
{{ partial "snippets/menu" . }}
</details>
</div>