From 5c66b00d90ae494c28c1dd5afcb8c29a45219318 Mon Sep 17 00:00:00 2001 From: teldra Date: Sun, 10 Apr 2022 11:18:04 +0200 Subject: [PATCH] small fixes --- .../_default.old/_markup/render-heading.html | 7 - .../_default.old/_markup/render-image.html | 35 ----- themes/buha/layouts/_default.old/archive.html | 11 -- themes/buha/layouts/_default.old/baseof.html | 27 ---- themes/buha/layouts/_default.old/contact.html | 16 -- themes/buha/layouts/_default.old/imprint.html | 28 ---- themes/buha/layouts/_default.old/links.html | 31 ---- themes/buha/layouts/_default.old/list.html | 12 -- themes/buha/layouts/_default.old/misc.html | 12 -- themes/buha/layouts/_default.old/news.html | 31 ---- .../buha/layouts/_default.old/newsletter.html | 25 --- themes/buha/layouts/_default.old/rss.xml | 75 --------- themes/buha/layouts/_default.old/single.html | 46 ------ .../buha/layouts/_default.old/taxonomy.html | 43 ------ themes/buha/layouts/_default/list.html | 6 +- .../partials.old/contentlayouts/article.html | 51 ------- .../partials.old/contentlayouts/footer.html | 55 ------- .../partials.old/contentlayouts/list.html | 1 - .../partials.old/contentlayouts/menu.html | 27 ---- .../partials.old/contentlayouts/meta.html | 18 --- .../partials.old/contentlayouts/termlist.html | 29 ---- themes/buha/layouts/partials.old/debug.html | 8 - themes/buha/layouts/partials.old/layout/about | 0 .../layouts/partials.old/layout/archive.html | 16 -- .../layouts/partials.old/layout/categories | 0 .../buha/layouts/partials.old/layout/events | 0 .../buha/layouts/partials.old/layout/featured | 0 themes/buha/layouts/partials.old/layout/index | 0 themes/buha/layouts/partials.old/layout/links | 0 themes/buha/layouts/partials.old/layout/misc | 0 themes/buha/layouts/partials.old/layout/tags | 0 .../layouts/partials.old/misc/expand.html | 3 - .../buha/layouts/partials.old/misc/form.html | 142 ------------------ .../layouts/partials.old/misc/generator.html | 18 --- .../partials.old/misc/nottranslated.html | 25 --- themes/buha/layouts/partials.old/rrule.html | 13 -- .../partials.old/structure/contact.html | 6 - .../layouts/partials.old/structure/empty.html | 0 .../layouts/partials.old/structure/head.html | 27 ---- .../partials.old/structure/header.html | 15 -- .../layouts/partials.old/structure/langs.html | 10 -- .../partials.old/structure/paginator.html | 102 ------------- .../partials.old/structure/sidebar.html | 2 - .../partials.old/structure/submenu.html | 8 - .../layouts/partials/l1/article_list.html | 23 ++- 45 files changed, 18 insertions(+), 986 deletions(-) delete mode 100644 themes/buha/layouts/_default.old/_markup/render-heading.html delete mode 100644 themes/buha/layouts/_default.old/_markup/render-image.html delete mode 100644 themes/buha/layouts/_default.old/archive.html delete mode 100644 themes/buha/layouts/_default.old/baseof.html delete mode 100644 themes/buha/layouts/_default.old/contact.html delete mode 100644 themes/buha/layouts/_default.old/imprint.html delete mode 100644 themes/buha/layouts/_default.old/links.html delete mode 100644 themes/buha/layouts/_default.old/list.html delete mode 100644 themes/buha/layouts/_default.old/misc.html delete mode 100644 themes/buha/layouts/_default.old/news.html delete mode 100644 themes/buha/layouts/_default.old/newsletter.html delete mode 100644 themes/buha/layouts/_default.old/rss.xml delete mode 100644 themes/buha/layouts/_default.old/single.html delete mode 100644 themes/buha/layouts/_default.old/taxonomy.html delete mode 100644 themes/buha/layouts/partials.old/contentlayouts/article.html delete mode 100644 themes/buha/layouts/partials.old/contentlayouts/footer.html delete mode 100644 themes/buha/layouts/partials.old/contentlayouts/list.html delete mode 100644 themes/buha/layouts/partials.old/contentlayouts/menu.html delete mode 100644 themes/buha/layouts/partials.old/contentlayouts/meta.html delete mode 100644 themes/buha/layouts/partials.old/contentlayouts/termlist.html delete mode 100644 themes/buha/layouts/partials.old/debug.html delete mode 100644 themes/buha/layouts/partials.old/layout/about delete mode 100644 themes/buha/layouts/partials.old/layout/archive.html delete mode 100644 themes/buha/layouts/partials.old/layout/categories delete mode 100644 themes/buha/layouts/partials.old/layout/events delete mode 100644 themes/buha/layouts/partials.old/layout/featured delete mode 100644 themes/buha/layouts/partials.old/layout/index delete mode 100644 themes/buha/layouts/partials.old/layout/links delete mode 100644 themes/buha/layouts/partials.old/layout/misc delete mode 100644 themes/buha/layouts/partials.old/layout/tags delete mode 100644 themes/buha/layouts/partials.old/misc/expand.html delete mode 100644 themes/buha/layouts/partials.old/misc/form.html delete mode 100644 themes/buha/layouts/partials.old/misc/generator.html delete mode 100644 themes/buha/layouts/partials.old/misc/nottranslated.html delete mode 100644 themes/buha/layouts/partials.old/rrule.html delete mode 100644 themes/buha/layouts/partials.old/structure/contact.html delete mode 100644 themes/buha/layouts/partials.old/structure/empty.html delete mode 100644 themes/buha/layouts/partials.old/structure/head.html delete mode 100644 themes/buha/layouts/partials.old/structure/header.html delete mode 100644 themes/buha/layouts/partials.old/structure/langs.html delete mode 100644 themes/buha/layouts/partials.old/structure/paginator.html delete mode 100644 themes/buha/layouts/partials.old/structure/sidebar.html delete mode 100644 themes/buha/layouts/partials.old/structure/submenu.html diff --git a/themes/buha/layouts/_default.old/_markup/render-heading.html b/themes/buha/layouts/_default.old/_markup/render-heading.html deleted file mode 100644 index 7afe29a0..00000000 --- a/themes/buha/layouts/_default.old/_markup/render-heading.html +++ /dev/null @@ -1,7 +0,0 @@ - {{ $url := (printf "%s#%s" .Page.Permalink .Anchor) | safeURL }} - - - - {{ .Text | safeHTML }} - - diff --git a/themes/buha/layouts/_default.old/_markup/render-image.html b/themes/buha/layouts/_default.old/_markup/render-image.html deleted file mode 100644 index 3cdd4d57..00000000 --- a/themes/buha/layouts/_default.old/_markup/render-image.html +++ /dev/null @@ -1,35 +0,0 @@ -{{- if strings.HasPrefix .Destination "http" -}} - - {{ .Text }} -
{{ .Text }}
- -{{- else -}} - {{ if .Page.Resources.ByType "image" }} - {{ $nr := .Destination }} - {{- $pic := index (.Page.Resources.ByType "image") (int $nr) -}} - {{- $image := .Page.Resources.GetMatch (printf "%s" ($pic | safeURL)) -}} -
- - {{- $permalink := "" -}} - - {{- if ne $image nil -}} - {{- $permalink = $image.RelPermalink -}} - {{- else -}} - {{- $image = imageConfig (printf "static/%s" (.Destination | safeURL)) -}} - {{- $permalink = (printf "/%s" (.Destination | safeURL)) -}} - {{- end -}} - -
{{ .Text }}
-
{{ .Text }}
- -
- {{ end }} -{{- end -}} diff --git a/themes/buha/layouts/_default.old/archive.html b/themes/buha/layouts/_default.old/archive.html deleted file mode 100644 index 211f64c5..00000000 --- a/themes/buha/layouts/_default.old/archive.html +++ /dev/null @@ -1,11 +0,0 @@ -{{ define "title" }} - {{ $name := "archive" }} - {{ if lower $name | i18n }} - {{ $name = lower $name | i18n }} - {{ end }} -

{{ $name }}

-{{ end }} - -{{ define "main" }} -{{ partial "layout/archive" . }} -{{ end }} diff --git a/themes/buha/layouts/_default.old/baseof.html b/themes/buha/layouts/_default.old/baseof.html deleted file mode 100644 index 2ad994b3..00000000 --- a/themes/buha/layouts/_default.old/baseof.html +++ /dev/null @@ -1,27 +0,0 @@ - - - {{- partial "structure/head.html" . -}} - {{ block "css" . -}}{{- end }} - -
-
- {{ partialCached "structure/header" . }} - {{ partial "structure/submenu" . }} -
-
-
- {{ block "title" . -}}{{- end }} - {{ block "content" . -}}{{- end }} - {{ block "main" . -}}{{- end }} -
- -
- {{ block "pagefooter" . -}}{{- end }} -
- {{- partial "contentlayouts/footer" . -}} -
-
- - diff --git a/themes/buha/layouts/_default.old/contact.html b/themes/buha/layouts/_default.old/contact.html deleted file mode 100644 index 4211409e..00000000 --- a/themes/buha/layouts/_default.old/contact.html +++ /dev/null @@ -1,16 +0,0 @@ -{{ define "title" }} - {{ $name := "contact" }} - {{ if lower $name | i18n }} - {{ $name = lower $name | i18n }} - {{ end }} -

{{ $name }}

-{{ end }} - -{{ define "main" }} -{{ if site.Params.debug }}contact.html{{ end }} -{{- $pic := index (.Resources.ByType "image") 0 -}} - -
- {{ partial "contentlayouts/article.html" (dict "context" . "type" "contact") }} -
-{{ end }} diff --git a/themes/buha/layouts/_default.old/imprint.html b/themes/buha/layouts/_default.old/imprint.html deleted file mode 100644 index dadd8f60..00000000 --- a/themes/buha/layouts/_default.old/imprint.html +++ /dev/null @@ -1,28 +0,0 @@ -{{ define "title" }} - {{ $name := "imprint" }} - {{ if lower $name | i18n }} - {{ $name = lower $name | i18n }} - {{ end }} -

{{ $name }}

-{{ end }} - -{{ define "main" }} - {{ if site.Params.debug }}imprint.html{{ end }} - {{ if .Resources.ByType "image" }} -
-
- - {{ range .Resources.ByType "image" }} - - {{- end -}} -{{ end }} - -{{ if .Resources.ByType "image" }} -
-{{ end }} -
-{{ partial "structure/contact" }} -{{ if i18n "executive" }}{{ i18n "executive" }}{{ else }}{{ "Executive" }}{{ end }}: {{ site.Params.imprintdata.executive }} -{{ .Content }} -
-{{ end }} diff --git a/themes/buha/layouts/_default.old/links.html b/themes/buha/layouts/_default.old/links.html deleted file mode 100644 index 81299ae2..00000000 --- a/themes/buha/layouts/_default.old/links.html +++ /dev/null @@ -1,31 +0,0 @@ -{{- define "title" -}} - {{ $name := .Name | lower }} - {{ if ne ($name | i18n) "" }} - {{ $name = $name | i18n }} - {{ else }} - {{ if and (ne .Section "events") (ne .Section "links") }} - {{ $name = $name | singularize }} - {{ end }} - {{ $name = $name | humanize }} - {{ end }} -

{{ $name }}

-{{- end -}} - -{{- define "main" -}} - {{ if ne .Content "" }} -
- {{ .Content }} -
- {{ end }}
- {{ range .Pages }} -
-

{{ .Params.link }}

- {{ .Title }} - {{ .Content }} -
- {{ end }} -{{- end -}} - -{{ define "sidebar" }} - {{- partial "contentlayouts/menu.html" . }} -{{ end }} diff --git a/themes/buha/layouts/_default.old/list.html b/themes/buha/layouts/_default.old/list.html deleted file mode 100644 index e612da43..00000000 --- a/themes/buha/layouts/_default.old/list.html +++ /dev/null @@ -1,12 +0,0 @@ -{{ define "title" }} -

{{ if i18n .Section }}{{ i18n .Section }}{{ else }}{{ "Misc" }}{{ end }}

-{{ end }} - -{{ define "main" }} - {{ partial "debug" (dict "context" . ) }} -
- {{ range .Pages }} - {{ .Name }}
- {{ end }} -
-{{ end }} diff --git a/themes/buha/layouts/_default.old/misc.html b/themes/buha/layouts/_default.old/misc.html deleted file mode 100644 index e612da43..00000000 --- a/themes/buha/layouts/_default.old/misc.html +++ /dev/null @@ -1,12 +0,0 @@ -{{ define "title" }} -

{{ if i18n .Section }}{{ i18n .Section }}{{ else }}{{ "Misc" }}{{ end }}

-{{ end }} - -{{ define "main" }} - {{ partial "debug" (dict "context" . ) }} -
- {{ range .Pages }} - {{ .Name }}
- {{ end }} -
-{{ end }} diff --git a/themes/buha/layouts/_default.old/news.html b/themes/buha/layouts/_default.old/news.html deleted file mode 100644 index 2fbe9eba..00000000 --- a/themes/buha/layouts/_default.old/news.html +++ /dev/null @@ -1,31 +0,0 @@ -{{- define "title" -}} - {{ $name := .Name | lower }} - {{ if ne ($name | i18n) "" }} - {{ $name = $name | i18n }} - {{ else }} - {{ if ne .Section "events" }} - {{ $name = $name | singularize }} - {{ end }} - {{ $name = $name | humanize }} - {{ end }} -

{{ $name }}

-{{- end -}} - -{{- define "main" -}} - {{ partial "debug" (dict "context" . "filename" "news.html") }} - {{- $paginator := .Paginate .Data.Pages -}} - - {{ if eq $paginator.PageNumber 1 }} - {{ if ne .Content "" }} -
- {{ .Content }} -
- {{ end }} - {{ end }} - {{ partial "contentlayouts/list.html" (dict "context" . "paginator" $paginator "amount" "5") }} - {{ partial "structure/paginator" (dict "paginator" $paginator) }} -{{- end -}} - -{{ define "sidebar" }} - {{- partial "contentlayouts/menu.html" . }} -{{ end }} diff --git a/themes/buha/layouts/_default.old/newsletter.html b/themes/buha/layouts/_default.old/newsletter.html deleted file mode 100644 index 736cba00..00000000 --- a/themes/buha/layouts/_default.old/newsletter.html +++ /dev/null @@ -1,25 +0,0 @@ -{{- define "title" -}} - {{ $name := .Name | lower }} - {{ if ne ($name | i18n) "" }} - {{ $name = $name | i18n }} - {{ else }} - {{ if ne .Section "events" }} - {{ $name = $name | singularize }} - {{ end }} - {{ $name = $name | humanize }} - {{ end }} -

{{ $name }}

-{{- end -}} - -{{- define "main" -}} - {{ partial "debug" (dict "context" . ) }} - {{ if ne .Content "" }} -
- {{ .Content }} -
- {{ end }} -{{- end -}} - -{{ define "sidebar" }} - {{- partial "contentlayouts/menu.html" . }} -{{ end }} diff --git a/themes/buha/layouts/_default.old/rss.xml b/themes/buha/layouts/_default.old/rss.xml deleted file mode 100644 index fdf2e42f..00000000 --- a/themes/buha/layouts/_default.old/rss.xml +++ /dev/null @@ -1,75 +0,0 @@ -{{- $pages := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections -}} -{{- $title := lower .Title -}} -{{- if eq $title "events" -}} - {{- $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 }} - {{ .Permalink }} - Aktuelles von {{ .Site.Title }} - Hugo -- gohugo.io{{ with .Site.LanguageCode }} - {{.}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Copyright }} - {{.}}{{end}}{{ if not .Date.IsZero }} - {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} - {{- with .OutputFormats.Get "RSS" -}} - {{ printf "" .Permalink .MediaType | safeHTML }} - {{- end -}} - {{ range where $pages "Type" "in" .Site.Params.searchSections }} - {{ $when := .Params.when }} - {{ $about := .Params.about }} - {{ $covid := .Params.covid }} - {{ $contact := .Params.contact }} - {{ $price := .Params.price }} - {{ $featured := .Params.featured }} - {{ $categories := slice }} - {{ range .Params.categories }} - {{ $categories = $categories | append . }} - {{ end }} - {{ $events := slice }} - {{ range .Params.events }} - {{ $events = $events | append . }} - {{ end }} - {{ $tags := slice }} - {{ range .Params.tags }} - {{ $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 }} - - - {{ .Title }} - {{ .Permalink }} - {{ .Lastmod.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} - {{ .Permalink }}-{{ $hash }} - - {{- $c := replace .Content "%s

%s" $when $c -}} - {{- end -}} - {{- $img := index (.Resources.ByType "image") 0 -}} - {{- with $img -}} - {{- $img := .Resize "640x" -}} - {{- $c = printf "%s" $c $img.Permalink $img.Width $img.Height -}} - {{- end -}} - {{- printf "" $c | safeHTML -}} - - - - {{ end }} - - diff --git a/themes/buha/layouts/_default.old/single.html b/themes/buha/layouts/_default.old/single.html deleted file mode 100644 index 3f35aa29..00000000 --- a/themes/buha/layouts/_default.old/single.html +++ /dev/null @@ -1,46 +0,0 @@ -{{ define "title" }} - {{ $name := .Title }} - {{ if lower $name | i18n }} - {{ $name = lower $name | i18n }} - {{ end }} -

{{ $name }}

-{{ end }} - -{{ define "main" }} - {{ partial "debug" (dict "context" . "caller" "single.html" )}} -
- {{ if eq .Type "tools" }} -
- {{ $tool := printf "misc/%s" .Params.tool }} - {{ partial $tool . }} -
- {{ else }} -
- {{ partial "contentlayouts/article.html" (dict "context" . "type" "article") }} -
- {{ end }} -{{ end }} - -{{ define "pagefooter" }} - {{ if and (ne .Section "misc") (eq .Type "tools") }} -
-
- {{ if i18n "created" }}{{ i18n "created" }}{{ else }}{{ "Created" }}{{ end }}
- {{ .Date | time.Format ":date_full" }} -
- {{ if ne .Date .Lastmod }} -
- {{ if i18n "lastmod" }}{{ i18n "lastmod" }}{{ else }}{{ "Last modification" }}{{ end }}
- {{ .Lastmod | time.Format ":date_full" }} -
- {{ end }} -
- {{ end }} -{{ end }} - - -{{ define "sidebar" }} - {{ if ne .Type "tools" }} - {{- partial "contentlayouts/menu.html" . }} - {{ end }} -{{ end }} diff --git a/themes/buha/layouts/_default.old/taxonomy.html b/themes/buha/layouts/_default.old/taxonomy.html deleted file mode 100644 index 1c4e7632..00000000 --- a/themes/buha/layouts/_default.old/taxonomy.html +++ /dev/null @@ -1,43 +0,0 @@ -{{- define "title" -}} - {{ $name := .Name }} - {{ if ne ($name | lower | i18n) "" }} - {{ $name = $name | lower | i18n }} - {{ end }} -

{{ $name }}

-{{- end -}} - -{{- define "main" -}} - {{ partial "debug" (dict "context" . "caller" "taxonomy.html") }} - {{ $title := lower .Title }} - {{- $paginator := slice -}} - {{ $partial := "contentlayouts/list.html" }} - {{ $what := printf ".Params.%s" $title }} - - {{- $posts := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections }} - - {{ if or (eq $title "about") (eq $title "featured") }} - {{- $paginator = .Paginate (where $posts $what "eq" true) -}} - {{ else if or (eq $title "tags") (eq $title "categories") }} - {{- $paginator = .Paginate $posts -}} - {{ $partial = "contentlayouts/termlist.html" }} - {{ else if eq $title "events" }} - {{- $paginator = .Paginate (where $posts ".Params.when" "ne" nil) -}} - {{ else if eq .Section "about" }} - {{- $paginator = .Paginate (where $posts ".Params.about" "eq" true) -}} - {{ else }} - {{- $paginator = .Paginate .Data.Pages -}} - {{ end }} - {{ if eq $paginator.PageNumber 1 }} - {{ if ne .Content "" }} -
- {{ .Content }} -
- {{ end }} - {{ end }} - {{ partial $partial (dict "context" . "paginator" $paginator "amount" "5") }} - {{ partial "structure/paginator" (dict "paginator" $paginator) }} -{{- end -}} - -{{ define "sidebar" }} - {{- partial "contentlayouts/menu.html" . }} -{{ end }} diff --git a/themes/buha/layouts/_default/list.html b/themes/buha/layouts/_default/list.html index c777927a..14f213d1 100644 --- a/themes/buha/layouts/_default/list.html +++ b/themes/buha/layouts/_default/list.html @@ -12,8 +12,9 @@ {{- $paginator := "" -}} {{ $part := .Layout }} {{ $partial_before := "" }} - {{ $paginate := true }} + {{ $paginate := false }} {{ if eq .Layout "article_list" }} + {{ $paginate = true }} {{ if eq .Section "events" }} {{- $pages = where $pages ".Params.when" "ne" nil -}} {{ else if eq .Type "about" }} @@ -32,7 +33,6 @@ {{ else if eq .Kind "taxonomy" }} {{- $pages = .Data.Terms.Alphabetical -}} {{ $part = "tags_n_categories" }} - {{ $paginate = false }} {{ end }} {{ end }} {{ if eq $paginate true}} @@ -40,6 +40,6 @@ {{ 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) }} + {{ partial $partial (dict "context" . "paginator" $paginator "pages" $pages "amount" "5" "title" $title "content" .Content "pic" $pic "type" .Type "partial_before" $partial_before "paginate" $paginate) }} {{ end }} {{ end }} diff --git a/themes/buha/layouts/partials.old/contentlayouts/article.html b/themes/buha/layouts/partials.old/contentlayouts/article.html deleted file mode 100644 index 2bffda5a..00000000 --- a/themes/buha/layouts/partials.old/contentlayouts/article.html +++ /dev/null @@ -1,51 +0,0 @@ -{{ $showmeta := "false" }} - {{ $metas := dict "when" .context.Params.when "price" .context.Params.price "contact" .context.Params.contact "covid" - .context.Params.covid }} - {{ if eq .type "list" }} - {{ $metas = dict "when" .context.Params.when "price" .context.Params.price }} - {{ end }} - {{ partial "contentlayouts/meta.html" $metas }} - - {{ $small := "solo" }} - {{ $big := "solo" }} - {{ $img := "" }} - {{ $thumb := "" }} - {{ $placeholder := site.Params.placeholder }} - {{ if ne .context.Section "misc"}} - {{ $img = resources.Get $placeholder }} - {{- $thumb = $img.Resize "1024x" }} - {{ end }} - {{- if or (.context.Resources.ByType "image") (.Summary) ($img) -}} - {{ $small = "multiple_small" }} - {{ $big = "multiple_big" }} - {{ else }} - {{ $small = "multiple_big"}} - {{ end }} - - {{- if and (.context.Resources.ByType "image") (ne .context.Section "misc") -}} - {{- $img = index (.context.Resources.ByType "image") 0 -}} - {{- $thumb = $img.Resize "1024x" }} - {{ if ne .context.Content "" }} - {{- $thumb = $img.Resize "2048x" }} - {{ end }} - {{ end }} - -
- {{ if ne $img "" }} -
- {{ if and (ne .type "list") (.context.Resources.ByType "image") }}{{ end }} - - {{ if ne .type "list" }}{{ end }} - {{ if eq .type "article" }}{{ .TableOfContents }}{{ end }} -
- {{ end }} - {{- if or .context.Content .context.Summary -}} -
- {{ if eq .type "contact" }}{{ partial "structure/contact" }}{{ end }} - {{ if eq .type "list" }}{{- .context.Summary -}}{{ else }}{{- .context.Content -}}{{ end }} - {{ if and .context.Truncated (eq .type "list") }} -
{{- if i18n "readmore" -}}{{- i18n "readmore" -}}{{- else -}}{{- "readmore" -}}{{- end -}}..
- {{ end }} -
- {{- end }} -
diff --git a/themes/buha/layouts/partials.old/contentlayouts/footer.html b/themes/buha/layouts/partials.old/contentlayouts/footer.html deleted file mode 100644 index 17c107c1..00000000 --- a/themes/buha/layouts/partials.old/contentlayouts/footer.html +++ /dev/null @@ -1,55 +0,0 @@ -{{- if eq site.Params.contact true }} -
- {{ $contact := "Contact" }} - {{ if i18n "contact" }} - {{ $contact = i18n "contact" }} - {{ end }} - {{- $contact | strings.FirstUpper -}}:

- {{- partial "structure/contact" -}} -
-{{- end -}} - -
- {{- if eq site.Params.archive true -}} - {{ $archive := "Archive" }} - {{ if i18n "archive" }} - {{ $archive = i18n "archive" }} - {{ end }} - {{- $archive | strings.FirstUpper -}}

- {{- end -}} - {{- if eq site.Params.newsletter true -}} - {{ $newsletter := "Newsletter" }} - {{ if i18n "newsletter" }} - {{ $newsletter = i18n "newsletter" }} - {{ 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" }} - {{ $links = i18n "links" }} - {{ end }} - {{- $links | strings.FirstUpper -}}

- {{- end -}} - {{- if not (or (eq .Section "featured") (eq .Section "about")) -}} - {{- with .OutputFormats.Get "rss" -}} - {{- if .Permalink -}} - {{- printf `` .Permalink | safeHTML -}} - {{- end -}} - RSS

- {{- end -}} - {{ end }} - Sourcecode -
- diff --git a/themes/buha/layouts/partials.old/contentlayouts/list.html b/themes/buha/layouts/partials.old/contentlayouts/list.html deleted file mode 100644 index 8b137891..00000000 --- a/themes/buha/layouts/partials.old/contentlayouts/list.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/themes/buha/layouts/partials.old/contentlayouts/menu.html b/themes/buha/layouts/partials.old/contentlayouts/menu.html deleted file mode 100644 index 9b1a5573..00000000 --- a/themes/buha/layouts/partials.old/contentlayouts/menu.html +++ /dev/null @@ -1,27 +0,0 @@ - {{ if gt .Site.Taxonomies.categories 0 }} -

  • {{ if i18n "news" }}{{ i18n "news" }}{{ else }}{{ "News" }}{{ end }}

    • - {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.categories }} - {{ $orig := $taxonomyname }} - {{ if ne (i18n $taxonomyname) "" }} - {{ $taxonomyname = i18n $taxonomyname }} - {{ else }} - {{ $taxonomyname = $taxonomyname | humanize }} - {{ end }} -
  • {{ $taxonomyname }}
    • - {{ end }} - {{ end }} - {{ if gt .Site.Taxonomies.events 0 }} -

  • {{ if i18n "events" }}{{ i18n "events" }}{{ else }}{{ "Events" }}{{ end }}

    • - {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.events }} - {{ $orig := $taxonomyname }} - {{ if ne (i18n $taxonomyname) "" }} - {{ $taxonomyname = i18n $taxonomyname }} - {{ else }} - {{ $taxonomyname = $taxonomyname | humanize }} - {{ end }} -
  • {{ $taxonomyname }}
    • - {{ end }} - {{ end }} - {{ if .IsHome }} - {{ partial "structure/langs" . }} - {{ end }} diff --git a/themes/buha/layouts/partials.old/contentlayouts/meta.html b/themes/buha/layouts/partials.old/contentlayouts/meta.html deleted file mode 100644 index f3442d9c..00000000 --- a/themes/buha/layouts/partials.old/contentlayouts/meta.html +++ /dev/null @@ -1,18 +0,0 @@ -
    - {{ if .when }} -
    {{ .when }}
    - {{ end }} - {{ if .price }} - {{ if eq .price "free" }} -
    {{ if i18n "freeentry" }}{{ i18n "freeentry" }}{{ else }}{{ "Free Entry" }}{{ end }}
    - {{ else }} -
    {{ if i18n "entry" }}{{ i18n "entry" }}{{ else }}{{ "Entry" }}{{ end }}: {{ .price }}
    - {{ end }} - {{ end }} - {{ if .contact }} -
    {{ if i18n "contact" }}{{ i18n "contact" }}{{ else }}{{ "Contact" }}{{ end }} {{ .contact | markdownify }} {{ if i18n "or" }}{{ i18n "or" }}{{ else }}{{ "or" }}{{ end }} {{ site.Params.imprintdata.tel }}
    - {{ end }} - {{ if .covid }} -
    Covid: {{ .covid }}
    - {{ end }} -
    diff --git a/themes/buha/layouts/partials.old/contentlayouts/termlist.html b/themes/buha/layouts/partials.old/contentlayouts/termlist.html deleted file mode 100644 index 39ac2a9b..00000000 --- a/themes/buha/layouts/partials.old/contentlayouts/termlist.html +++ /dev/null @@ -1,29 +0,0 @@ -{{ $name := .context.Title }} -{{ $title := lower .context.Title }} - - -{{ range $taxonomyname, $taxonomy := .context.Site.Taxonomies }} - {{ if eq $title $taxonomyname }} - {{ range $key, $value := $taxonomy }} - {{ $key }} - {{ end }} - {{ end }} -{{ end }} - - -{{ if and site.Params.debug false }} - {{ range $taxonomyname, $taxonomy := .context.Site.Taxonomies }} -
  • {{ $taxonomyname }} -
      - {{ range $key, $value := $taxonomy }} -
    • {{ $key }}
      • - - {{ end }} -
    -
    • - {{ end }} -{{ end }} diff --git a/themes/buha/layouts/partials.old/debug.html b/themes/buha/layouts/partials.old/debug.html deleted file mode 100644 index c1cb7daf..00000000 --- a/themes/buha/layouts/partials.old/debug.html +++ /dev/null @@ -1,8 +0,0 @@ -{{ if eq site.Params.debug true }} -Title: {{ .context.Title }}
    -Name: {{ .context.Name }}
    -section: {{ .context.Section }}
    -type: {{ .context.Type }}
    -{{ if .caller }}caller: {{ .caller }}
    {{ end }} -kind: {{ .context.Kind }} -{{ end }} diff --git a/themes/buha/layouts/partials.old/layout/about b/themes/buha/layouts/partials.old/layout/about deleted file mode 100644 index e69de29b..00000000 diff --git a/themes/buha/layouts/partials.old/layout/archive.html b/themes/buha/layouts/partials.old/layout/archive.html deleted file mode 100644 index 717f9560..00000000 --- a/themes/buha/layouts/partials.old/layout/archive.html +++ /dev/null @@ -1,16 +0,0 @@ - -{{ partial "debug" (dict "context" . "caller" "archive.html" )}} -
    -{{ $prev := 3000}} -{{range where .Site.RegularPages "Type" "in" site.Params.searchSections }} - {{ $date := .Date }} - {{ if gt $prev ($date.Format "2006") }} -

    {{ $date.Format "2006" }}

    - {{end}} -
    -
    {{ .Title }}
    -
    {{- $date.Format "02" }}. {{ if $date.Format "Jan" | i18n }}{{ $date.Format "Jan" | i18n -}}{{- else -}} {{- $date.Format "Jan" -}}{{- end }} {{ $date.Format "2006 15:04" }}

    -
    - {{ $prev = $date.Format "2006"}} -{{end}} -
    diff --git a/themes/buha/layouts/partials.old/layout/categories b/themes/buha/layouts/partials.old/layout/categories deleted file mode 100644 index e69de29b..00000000 diff --git a/themes/buha/layouts/partials.old/layout/events b/themes/buha/layouts/partials.old/layout/events deleted file mode 100644 index e69de29b..00000000 diff --git a/themes/buha/layouts/partials.old/layout/featured b/themes/buha/layouts/partials.old/layout/featured deleted file mode 100644 index e69de29b..00000000 diff --git a/themes/buha/layouts/partials.old/layout/index b/themes/buha/layouts/partials.old/layout/index deleted file mode 100644 index e69de29b..00000000 diff --git a/themes/buha/layouts/partials.old/layout/links b/themes/buha/layouts/partials.old/layout/links deleted file mode 100644 index e69de29b..00000000 diff --git a/themes/buha/layouts/partials.old/layout/misc b/themes/buha/layouts/partials.old/layout/misc deleted file mode 100644 index e69de29b..00000000 diff --git a/themes/buha/layouts/partials.old/layout/tags b/themes/buha/layouts/partials.old/layout/tags deleted file mode 100644 index e69de29b..00000000 diff --git a/themes/buha/layouts/partials.old/misc/expand.html b/themes/buha/layouts/partials.old/misc/expand.html deleted file mode 100644 index 7929c0a3..00000000 --- a/themes/buha/layouts/partials.old/misc/expand.html +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/themes/buha/layouts/partials.old/misc/form.html b/themes/buha/layouts/partials.old/misc/form.html deleted file mode 100644 index ee3ac831..00000000 --- a/themes/buha/layouts/partials.old/misc/form.html +++ /dev/null @@ -1,142 +0,0 @@ -{{ $pageform := (index .context.Page.Params.forms .form) }} -{{ $group := slice }} -{{ $divide := .context.Page.Params.divide }} -
    - - -{{ range $pageform.fields }} - {{ $title := .title }} - {{ $name := $title }} - {{ if .name }} - {{ $name = .name }} - {{ end }} - - {{ if and .group (not (in $group .group))}} -
    - {{ if i18n (singularize .group) }}{{ i18n (singularize .group) }}{{ else }}{{ humanize .group }}{{ end }} - {{ partial "misc/expand" (dict "name" (printf "%sgroup" .group)) }} -
    - {{ $group = $group | append .group }} - {{ end }} - - {{ if eq .input_type "title" }} -

    {{- $name -}}{{- if .required -}}{{- " *" -}}{{- end -}}

    - {{ else if eq .input_type "textarea" }} -
    - - -
    - {{ else if eq .input_type "radio" }} -
    - -
    - {{ else if eq .input_type "checkbox" }} -
    - -
    - {{ else if eq .input_type "results" }} - - {{ else if eq .input_type "submit" }} -
    - -
    - - - - - - - - - {{ else if eq .input_type "mc" }} - {{ $in0 := .title }} - - {{- $finale := slice -}} - {{ $pages := where site.RegularPages "Type" "in" site.Params.searchSections }} - {{ if eq .title "tags" }} - {{ range $pages }} - {{- if .Params.tags -}} - {{- $finale = $finale | append .Params.tags -}} - {{ end }} - {{ end }} - {{ else }} - {{ range $pages }} - {{ range .Param $in0 }} - {{- $finale = $finale | append . -}} - {{ end }} - {{ end }} - {{ end }} - {{- $finale = $finale | uniq -}} - -
    -
    - {{ .name }} - {{ if ne .expanded true }}{{ partial "misc/expand" (dict "name" (printf "%scat" $in0)) }}{{ end }}{{- if .required -}}{{- " *" -}}{{- end -}} -
    - - - -
    - - -
    -
    - {{ range sort $finale }} - - {{ end }} -
    - {{ if .new }} - - - {{ end }} -
    -
    - -
    - - - - - - - - - - - {{ else }} - {{ if eq .title "name" }} -
    - - -
    -
    - - -
    - {{ else if eq .title "address" }} -
    - - -
    -
    - - -
    - -
    - - -
    - {{ else }} -
    -
    - - -
    -
    - {{ end }} - {{ end }} - -{{ end }} - -
    diff --git a/themes/buha/layouts/partials.old/misc/generator.html b/themes/buha/layouts/partials.old/misc/generator.html deleted file mode 100644 index d0182756..00000000 --- a/themes/buha/layouts/partials.old/misc/generator.html +++ /dev/null @@ -1,18 +0,0 @@ -{{ define "css" }} - -{{ end }} - - -
    -
    -{{ .Content }} -
    - - -{{ if (index .Page.Params.forms 0) }} - {{ partial "misc/form" (dict "context" . "form" 0) }} -{{ end }} - -
    - - diff --git a/themes/buha/layouts/partials.old/misc/nottranslated.html b/themes/buha/layouts/partials.old/misc/nottranslated.html deleted file mode 100644 index 91ca96e3..00000000 --- a/themes/buha/layouts/partials.old/misc/nottranslated.html +++ /dev/null @@ -1,25 +0,0 @@ -{{ $l1 := slice }} -{{ $l2 := slice }} -{{ range $.Site.Home.Translations }} - {{ $l1 = $l1 | append .Language }} -{{ end }} - -{{ $all_lang := $.Site.Home.Translations }} -{{ range where .Site.RegularPages "Type" "in" site.Params.searchSections }} - {{ $missing := slice}} - {{ if .Translations }} - {{ range .Translations }} - {{ $l2 = $l2 | append .Language }} - {{ end }} - {{ $final := $l1 | complement $l2 }} - {{ range $final }} - {{ $missing = $missing | append . }} - {{ end }} - {{ else }} - {{ $missing = $missing | append "all translations" }} - {{ end }} - {{ if $missing }} - {{ .Name }}: -
    missing: {{ index $missing 0 }}
    - {{ end }} -{{ end }} diff --git a/themes/buha/layouts/partials.old/rrule.html b/themes/buha/layouts/partials.old/rrule.html deleted file mode 100644 index a026f304..00000000 --- a/themes/buha/layouts/partials.old/rrule.html +++ /dev/null @@ -1,13 +0,0 @@ - {{ $byday := "" }} - {{ $bymonth := "" }} - {{ partial "debug" (dict "context" . "filename" "index.html") }} - {{ range $rrule := split "RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10" ";" }} - {{ if in . "BYDAY" }}
    - {{ $byday = index (split . "=") 1 }} - {{ end }} - {{ if in . "BYMONTH" }}
    - {{ $bymonth = index (split . "=") 1 }} - {{ end }} - {{ end }} - {{ $byday }}
    - {{ $bymonth }}
    diff --git a/themes/buha/layouts/partials.old/structure/contact.html b/themes/buha/layouts/partials.old/structure/contact.html deleted file mode 100644 index d8b273c9..00000000 --- a/themes/buha/layouts/partials.old/structure/contact.html +++ /dev/null @@ -1,6 +0,0 @@ -{{ site.Title }}
    -{{ site.Params.imprintdata.street }}
    -{{ if i18n "pobox" }}{{ i18n "pobox" }}{{ else }}{{ "Po.Box" }}{{ end }} {{ site.Params.imprintdata.pobox }}
    -{{ site.Params.imprintdata.city }}
    -{{ if site.Params.imprintdata.tel }}

    {{ if i18n "phone" }}{{ i18n "phone" }}{{ else }}{{ "phone" }}{{ end }}: {{ site.Params.imprintdata.tel }}

    {{ end }} -{{ if site.Params.imprintdata.mail }}

    {{ if i18n "mail" }}{{ i18n "mail" }}{{ else }}{{ "mail" }}{{ end }}: {{ site.Params.imprintdata.mail | markdownify }}{{ end }}

    diff --git a/themes/buha/layouts/partials.old/structure/empty.html b/themes/buha/layouts/partials.old/structure/empty.html deleted file mode 100644 index e69de29b..00000000 diff --git a/themes/buha/layouts/partials.old/structure/head.html b/themes/buha/layouts/partials.old/structure/head.html deleted file mode 100644 index e747c552..00000000 --- a/themes/buha/layouts/partials.old/structure/head.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - -{{ $stylecolor := resources.Get "css/color.css" }} -{{ $stylelayout := resources.Get "css/layout.css" }} -{{ $allcss := slice $stylecolor $stylelayout | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }} - - -{{ $title := print .Site.Title " | " .Title }} -{{ if .IsHome }}{{ $title = .Site.Title }}{{ end }} -{{ $title }} - - - -{{ range .AlternativeOutputFormats -}} - {{ printf `` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} -{{ end -}} - -{{ if .Site.Params.keywords -}} - -{{- end }} - - - -{{ template "_internal/opengraph.html" . }} - diff --git a/themes/buha/layouts/partials.old/structure/header.html b/themes/buha/layouts/partials.old/structure/header.html deleted file mode 100644 index 8e4fae9a..00000000 --- a/themes/buha/layouts/partials.old/structure/header.html +++ /dev/null @@ -1,15 +0,0 @@ -
    - - SVG mit img laden - - -
    diff --git a/themes/buha/layouts/partials.old/structure/langs.html b/themes/buha/layouts/partials.old/structure/langs.html deleted file mode 100644 index c5921c14..00000000 --- a/themes/buha/layouts/partials.old/structure/langs.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ if not .IsHome }} - {{ if .Translations }} -

  • {{ "Languages" }}

    • - {{ range .Translations }} - {{ if ne .Lang $.Lang }} -
  • {{- if i18n .Lang -}}{{- i18n .Lang -}}{{- else -}}{{- humanize .Lang -}}{{ end }}
    • - {{ end }} - {{ end }} - {{ end }} -{{ end }} diff --git a/themes/buha/layouts/partials.old/structure/paginator.html b/themes/buha/layouts/partials.old/structure/paginator.html deleted file mode 100644 index 71895c3b..00000000 --- a/themes/buha/layouts/partials.old/structure/paginator.html +++ /dev/null @@ -1,102 +0,0 @@ - {{ $paginator := .paginator}} -
    - -
    \ No newline at end of file diff --git a/themes/buha/layouts/partials.old/structure/sidebar.html b/themes/buha/layouts/partials.old/structure/sidebar.html deleted file mode 100644 index 0d5ca4a4..00000000 --- a/themes/buha/layouts/partials.old/structure/sidebar.html +++ /dev/null @@ -1,2 +0,0 @@ -{{ partial "contentlayouts/menu.html" . }} - diff --git a/themes/buha/layouts/partials.old/structure/submenu.html b/themes/buha/layouts/partials.old/structure/submenu.html deleted file mode 100644 index c5c83f2d..00000000 --- a/themes/buha/layouts/partials.old/structure/submenu.html +++ /dev/null @@ -1,8 +0,0 @@ -
    -
    - Menü ☰ -

    - {{ partial "contentlayouts/menu.html" . }} -

    -
    -
    diff --git a/themes/buha/layouts/partials/l1/article_list.html b/themes/buha/layouts/partials/l1/article_list.html index 5b6cd4ec..9d04fbdd 100644 --- a/themes/buha/layouts/partials/l1/article_list.html +++ b/themes/buha/layouts/partials/l1/article_list.html @@ -1,14 +1,16 @@ -{{ if and .amount (or .paginator .pages) }} + {{ if and .amount (or .paginator .pages) }} {{ $amount := .amount }} - {{ $pages := "" }} - {{ if .pages }} - {{ $pages = .pages.ByLastmod.Reverse }} - {{ else if .paginator }} + {{ $pages := .pages.ByLastmod.Reverse }} + {{ if .paginator }} {{ $pages = .paginator.Pages.ByLastmod.Reverse }} {{ end }} - {{ if .content }} - {{ partial "snippets/content" (dict "content" .content) }} - {{ end }} + + {{- $paginator := .context.Paginate $pages -}} + {{ 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 -}} @@ -25,5 +27,10 @@
    {{ end }} + {{ if .paginate }} +
    + {{ partial "snippets/paginator" (dict "paginator" $paginator) }} +
    + {{ end }} {{ end }} {{ end }}