diff --git a/config/_default/params.toml b/config/_default/params.toml index 3ca9745..4ec9ba8 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -4,20 +4,21 @@ keywords = "buntes haus celle, buntes haus, bunteshaus, celle, buntes haus e.V., #do you want a contact page? contact = true +#do you want an archive? +archive = true + #do you want a newsletter page? newsletter = true #do you want a links page? links = true -#do you want an archive? -archive = true +# do you want an imprint? +imprint = true #do you want an media folder? media = true -# do you want an imprint? -imprint = true # what is seen in the header? mainMenu = ['about','news','events'] @@ -26,9 +27,7 @@ mainMenu = ['about','news','events'] searchSections = ['news'] # how long stays a featrued article on frontpage as featured (in weeks) -featured_expire = "13" - -placeholder = "/images/no_article_pic.png" +featured_expire = "8" items_per_list = 5 diff --git a/content/contact/index.de.md b/content/contact/index.de.md index 50dc3ea..543163a 100644 --- a/content/contact/index.de.md +++ b/content/contact/index.de.md @@ -5,4 +5,6 @@ banner: false --- Konzerte: konzerte@bunteshaus.de +![Anfahrt](1) + Routenplanung via [Googlemaps](https://www.google.com/maps/dir//Buntes+Haus+e.V.,+Hannoversche+Str.+30F,+29221+Celle/@52.6156635,10.0795909,17z/data=!4m16!1m6!3m5!1s0x47b0180746b97409:0xc85c7b0ba432ab1d!2sBuntes+Haus+e.V.!8m2!3d52.6156635!4d10.0817796!4m8!1m0!1m5!1m1!1s0x47b0180746b97409:0xc85c7b0ba432ab1d!2m2!1d10.0817796!2d52.6156635!3e1), [openrouteservice.org](https://maps.openrouteservice.org/#/directions/null/Hannoversche%20Stra%C3%9Fe%2030f,Celle,NI,Deutschland/data/55,130,32,198,15,97,4,224,38,9,96,59,2,24,5,192,166,6,113,0,184,72,129,92,1,178,32,26,66,72,27,128,70,0,24,3,165,160,14,0,153,105,96,54,0,89,189,182,142,2,176,112,9,202,64,75,122,29,168,10,224,29,128,95,14,76,120,138,226,20,136,8,0,29,83,192,136,155,14,80,0,188,160,5,181,205,67,134,173,208,32,3,55,132,93,46,112,1,60,193,18,64,28,192,45,52,116,111,98,100,104,117,16,91,116,123,116,0,196,48,23,60,0,200,51,51,116,68,88,116,88,16,0,95,44,160,0,0) diff --git a/themes/buha/assets/scss/container.scss b/themes/buha/assets/scss/container.scss index 64e6a29..269ac4d 100644 --- a/themes/buha/assets/scss/container.scss +++ b/themes/buha/assets/scss/container.scss @@ -17,3 +17,19 @@ .underline { text-decoration: underline; } + +.links_wrapper { + display: flex; + flex-direction: column; + .links { + margin-bottom: 2em; + &:hover { + .t, .p { + text-decoration: underline; + } + .s { + text-decoration: none; + } + } + } +} diff --git a/themes/buha/layouts/_default/rss.xml b/themes/buha/layouts/_default/rss.xml index 73e89ae..d26ea28 100644 --- a/themes/buha/layouts/_default/rss.xml +++ b/themes/buha/layouts/_default/rss.xml @@ -1,19 +1,30 @@ -{{- $pages := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections -}} -{{- $title := lower .Title -}} +{{- if or (.IsHome) (in .Site.Params.mainMenu .Section) -}} +{{- $title := .Site.Title -}} +{{- $desc := "" -}} +{{- $i18n_section := i18n "news" -}} + +{{- if .IsHome -}} + {{- $desc = printf "Aktuelle Informationen vom %s" $title -}} + {{- $title = printf "%s: %s" $title $i18n_section -}} +{{ else if in .Site.Params.mainMenu .Section }} + {{- $desc = printf "Aktuelle Informationen vom %s" .Site.Title -}} + {{ $i18n_section = i18n .Section }} + {{- $title = printf "%s: %s" .Site.Title $i18n_section -}} +{{- end -}} + + + +{{- $pages := where (where site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections -}} {{- if eq .Section "events" -}} - {{- $pages = where $pages ".Params.when" "ne" nil -}} + {{- $pages = where $pages ".Params.when" "ne" nil -}} {{- end -}} -{{- $limit := .Site.Config.Services.RSS.Limit -}} -{{- if ge $limit 1 -}} -{{- $pages = $pages | first $limit -}} -{{- end -}} -{{- $pages = $pages.ByLastmod.Reverse -}} + {{- printf "" | safeHTML }} - {{ .Site.Title }} + {{ $title }} {{ .Permalink }} - Aktuelles von {{ .Site.Title }} + {{- $desc -}} Hugo -- gohugo.io{{ with .Site.LanguageCode }} {{.}}{{end}}{{ with .Site.Author.email }} {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} @@ -23,7 +34,7 @@ {{- with .OutputFormats.Get "RSS" -}} {{ printf "" .Permalink .MediaType | safeHTML }} {{- end -}} - {{ range where $pages "Type" "in" .Site.Params.searchSections }} + {{ range $pages }} {{ if or (eq .Lastmod .Date) (gt .Lastmod (.Date.AddDate 0 0 -1)) }} {{ $when := .Params.when }} {{ $about := .Params.about }} @@ -44,9 +55,6 @@ {{ $tags = $tags | append . }} {{ end }} {{ $images := slice }} - {{ range .Resources.ByType "image" }} - {{ $images = $images | append . }} - {{ end }} {{ $hash := slice $when $about $categories $events $covid $contact $price $featured $tags .Date .Lastmod .Title .Content }} {{ $hash = delimit $hash ", " }} {{ $hash = md5 $hash }} @@ -58,16 +66,35 @@ {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} {{ .Permalink }}-{{ $hash }} - {{- $c := replace .Content "" -}} + {{- $tmp := split .RawContent "" -}} + {{- $c = index $tmp 0 | markdownify -}} + {{- else if $c -}} + {{- if hasPrefix .Summary "

" -}} + {{- $c = .Summary -}} + {{- else -}} + {{- $c = printf "

%s

" .Summary -}} + {{- end -}} + {{- end -}} + {{- if $when -}} {{- $c = printf "

%s

%s" $when $c -}} {{- end -}} - {{- $img := index (.Resources.ByType "image") 0 -}} - {{- with $img -}} - {{- $img := .Resize "500x" -}} - {{- $c = printf "%s" $c $img.Permalink $img.Width $img.Height -}} + {{- $banner := .Resources.GetMatch "banner*" -}} + {{- if $banner -}} + {{- $c = printf "%s" $banner.Permalink $banner.Width $banner.Height $c -}} {{- end -}} - {{- printf "" $c | safeHTML -}} + + {{- range .Resources.ByType "image" -}} + {{- if not (hasPrefix . "banner") }} + {{- $c = printf "%s" $c .Permalink .Width .Height -}} + {{- end -}} + {{- end -}} + + {{- printf "" ($c | safeHTML) -}} {{- end -}} @@ -75,3 +102,4 @@ {{ end }} +{{- end -}} diff --git a/themes/buha/layouts/partials/layout/links.html b/themes/buha/layouts/partials/layout/links.html index 4eaad0f..a9a2a03 100644 --- a/themes/buha/layouts/partials/layout/links.html +++ b/themes/buha/layouts/partials/layout/links.html @@ -14,13 +14,19 @@ {{ if $p }} -
- {{ range $p }} - -

{{ .Title }}
- {{ .Params.Link }} -

- - {{ end }} +
+ {{ range $p }} +
+ + {{ .Title }} + + + {{ .Params.Link }} + + + {{ .Content }} + +
+ {{ end }}
{{ end }} diff --git a/themes/buha/layouts/partials/snippets/footer.html b/themes/buha/layouts/partials/snippets/footer.html index f6f37fe..228d15c 100644 --- a/themes/buha/layouts/partials/snippets/footer.html +++ b/themes/buha/layouts/partials/snippets/footer.html @@ -24,17 +24,6 @@ {{ end }} {{- $newsletter | strings.FirstUpper -}} {{- end -}} - Misc -
- -
- {{- if eq site.Params.imprint true -}} - {{ $imprint := "Imprint" }} - {{ if i18n "imprint" }} - {{ $imprint = i18n "imprint" }} - {{ end }} - {{- $imprint | strings.FirstUpper -}} - {{- end -}} {{- if eq site.Params.links true -}} {{ $links := "Links" }} {{ if i18n "links" }} @@ -42,7 +31,18 @@ {{ end }} {{- $links | strings.FirstUpper -}} {{- end -}} - {{- if not (or (eq .Section "featured") (eq .Section "about")) -}} + {{- if eq site.Params.imprint true -}} + {{ $imprint := "Imprint" }} + {{ if i18n "imprint" }} + {{ $imprint = i18n "imprint" }} + {{ end }} + {{- $imprint | strings.FirstUpper -}} + {{- end -}} +
+ +
+ Misc + {{- if or (in .Site.Params.mainMenu .Section) -}} {{- with .OutputFormats.Get "rss" -}} {{- if .Permalink -}} {{- printf `` .Permalink | safeHTML -}}