diff --git a/themes/buha/assets/foundations/aktionmensch.png b/assets/foundations/aktionmensch.png similarity index 100% rename from themes/buha/assets/foundations/aktionmensch.png rename to assets/foundations/aktionmensch.png diff --git a/themes/buha/assets/foundations/brentrup.jpg b/assets/foundations/brentrup.jpg similarity index 100% rename from themes/buha/assets/foundations/brentrup.jpg rename to assets/foundations/brentrup.jpg diff --git a/content/imprint/_index.de.md b/content/imprint/_index.de.md index 331aa1d1..b621805b 100644 --- a/content/imprint/_index.de.md +++ b/content/imprint/_index.de.md @@ -1,6 +1,6 @@ --- title: "Impressum" -layout: "imprint" +layout: "generic_single" --- Angaben gemäß § 5 TMG diff --git a/content/newsletter/_index.de.md b/content/newsletter/_index.de.md index 0d71e630..4e38d088 100644 --- a/content/newsletter/_index.de.md +++ b/content/newsletter/_index.de.md @@ -1,6 +1,6 @@ --- title: "Newsletter" -layout: "newsletter" +layout: "generic_single" --- Wenn ihr in unseren Newsletter aufgenommen werden wollt, schickt uns eine email! diff --git a/docs/todo.de b/docs/todo.de index bb21981b..00545064 100644 --- a/docs/todo.de +++ b/docs/todo.de @@ -9,19 +9,14 @@ todo buha.de - links in content unterstrichen -- runde ecken? 2px - - stiftung via prefix filename vom bild. maximale hoehe =s wenigst hohe bild. beim footer -- generator "nachtrag": lastmod in frontmatter - - dokumentiere, das artikel der alten homepage "lastmod" mit demgenau bis ungefaehren datum der damligen erstellung, im frontmatter haben sollten, wann sie erstellt wurden. - rss: das macht, das nur neue und if (Lastmod = Date) or (Lastmod gt Date.AddDate 0 0 -1) - push.sh: pushen optional? commit extra? commit --amend? -- https://schlomp.space/Bunteshaus/bunteshaus.de/src/branch/main/docs/artikel_formatierung.md#absatz: durcheinander listen: mit preview: @@ -45,8 +40,5 @@ article _default/list.html entscheided ueber home oder section - laedt dann partial/layout/$section - -partial/layout/$section - definend dann titel, content, main - snippets dafuer + laedt dann partial/l1/$layout oder spezielle vorlagen, je nach layout: der section. + diff --git a/themes/buha/assets/css/article.css b/themes/buha/assets/css/article.css new file mode 100644 index 00000000..c179196e --- /dev/null +++ b/themes/buha/assets/css/article.css @@ -0,0 +1,76 @@ +article { + flex-grow: 1; + flex-shrink: 0; + margin-left: 1rem; + background-color: var(--background); + padding: 1rem; + margin-bottom: 2rem; + border-radius: 10px; +} + +#articletitle h2 { + margin-top: 0; +} + +article a { + text-decoration: underline; +} + +#article_list a { + text-decoration: none; +} + +article p:first-child { + margin-top: 0; +} + +article #readmore { + margin-top: 1rem; +} + +#articlemeta { + margin-bottom: 1rem; +} + +#articletext img { + width: 80%; +} + +#articlemeta div:first-child { + font-size: medium; + font-weight: bold; +} + +#articletext { + margin-bottom: 1rem; +} + +.multiple_small { + flex: 0 0 24%; + margin-right: 1rem; +} + +.multiple_big { + flex: 0 0 72%; +} + +.solo { + flex: 0 0 100%; +} + +#articleinner { + display: flex; + flex-direction: column-reverse; +} + +#article_footer { + margin-left: 1rem; + margin-top: 0rem; + margin-bottom: 0rem; + display: flex; + flex-direction: column; + align-items: stretch; + font-size: x-small; + color: var(--text-muted); + flex-grow: 1; +} diff --git a/themes/buha/assets/css/big.css b/themes/buha/assets/css/big.css new file mode 100644 index 00000000..3f9257e6 --- /dev/null +++ b/themes/buha/assets/css/big.css @@ -0,0 +1,44 @@ +@media only screen and (min-width: 600px) { + content { + min-height: 60vh; + } + details { + display: none; + } + #sidebar { + display: flex; + flex-direction: column; + margin-left: 2rem; + } + #main { + padding-top: 1rem; + } + footer { + padding-left: 10px; + padding-right: 10px; + flex-direction: row; + } + .infobox { + text-align: left; + } + .minmax { + width: calc(100vw - 5rem); + max-width: 800px; + } + article { + margin-left: 0rem; + } + #article_footer { + margin-left: .8rem; + } + #articlemeta { + margin-bottom: 1.5rem; + } + #articletext { + margin-top: -0.4rem; + } + #articleinner { + display: flex; + flex-direction: row; + } +} diff --git a/themes/buha/assets/css/classes.css b/themes/buha/assets/css/classes.css new file mode 100644 index 00000000..74aa0ac9 --- /dev/null +++ b/themes/buha/assets/css/classes.css @@ -0,0 +1,62 @@ +.minmax { + width: auto; + max-width: auto; +} + +.dfjcc { + display: flex; + justify-content: center; +} + +.stretch { + display: flex; + flex-direction: column; + align-items: stretch; +} + +.grow { + flex-grow: 1; +} + +.column { + display: flex; + flex-direction: column; +} + +.style_less { + list-style: none; +} + +.font_size_smaller { + font-size: smaller; +} + +.margin_left_1rem { + margin-left: 1rem; +} + +.margin_top_1rem { + margin-top: 1.1rem; +} + +.underline { + text-decoration: underline; +} + +.align_menu { + list-style: none; + text-align: right; +} + +.notgrow { + display: flex; flex-grow: 0; +} + +.min_height { + min-height: 50vh; + min-width: auto; +} + +.no_underline { + text-decoration: none; +} diff --git a/themes/buha/assets/css/color.css b/themes/buha/assets/css/color.css index ed8d31d9..a7224b58 100644 --- a/themes/buha/assets/css/color.css +++ b/themes/buha/assets/css/color.css @@ -259,8 +259,8 @@ h3, h4, h5, h6 { - margin-bottom: 12px; - margin-top: 24px; + margin-bottom: 1rem; + margin-top: 1rem; } h1 { diff --git a/themes/buha/assets/css/footer.css b/themes/buha/assets/css/footer.css new file mode 100644 index 00000000..2208eebd --- /dev/null +++ b/themes/buha/assets/css/footer.css @@ -0,0 +1,21 @@ +footer { + display: flex; + justify-content: space-between; + flex-wrap: wrap; + margin-top: 1rem; + margin-left: 1rem; + margin-right: 1rem; + flex-direction: column-reverse; +} + +.footer_color { + color: var(--links); +} + +.infobox { + text-align: center; +} + +footer div { + margin-top: 1rem; +} diff --git a/themes/buha/assets/css/generator.css b/themes/buha/assets/css/generator.css new file mode 100644 index 00000000..3ad4f378 --- /dev/null +++ b/themes/buha/assets/css/generator.css @@ -0,0 +1,17 @@ +fieldset { + display: flex; flex-direction: row; padding: 0; border: none; margin: 0 0 .3rem .5rem; +} + +#result { + white-space: pre; display: none; background: var(--background-body); padding: .6rem 0 1rem 1rem; margin-top: 1rem; +} + +#display { + -webkit-user-select: all; + user-select: all; + +} + +input, textarea { + background-color: var(--background-body); +} diff --git a/themes/buha/assets/css/header.css b/themes/buha/assets/css/header.css new file mode 100644 index 00000000..d5900ab6 --- /dev/null +++ b/themes/buha/assets/css/header.css @@ -0,0 +1,25 @@ +#headerinner { + display: flex; + align-items: center; + justify-content: space-between; + flex-direction: row; + flex-wrap: wrap; + background-color: #741e94; + background: url(/images/logo_back_full.svg); + padding: .2rem; + padding-right: .7rem; +} + + +details { + margin-top: 0; + margin-bottom: 0; +} + +summary { + background-color: var(--background-alt); + padding-bottom: .2rem; + padding-top: .2rem; + list-style: none; + text-align: right; +} diff --git a/themes/buha/assets/css/layout.css b/themes/buha/assets/css/layout.css deleted file mode 100644 index 77e697c4..00000000 --- a/themes/buha/assets/css/layout.css +++ /dev/null @@ -1,307 +0,0 @@ -#headerinner { - display: flex; - align-items: center; - justify-content: space-between; - flex-direction: row; - flex-wrap: wrap; - background-color: #741e94; - background: url(/images/logo_back_full.svg); -} - -.container { - background-color: var(--background-alt); - background-image: linear-gradient(var(--background-alt), var(--background)); -} - -details { - margin-top: 0; -} - -summary { - background-color: var(--background-alt); - padding-bottom: 0; -} - -details p, details section { - text-align: right; -} - -aside { - display: none; -} - -h1 { - margin-left: .4rem; - font-size: 180%; - margin-top: 1rem; -} - -.right-sidebar { - display: none; - margin-left: 1rem; - justify-content: flex-end; - margin-right: 1rem; -} - -.right-sidebar a { - color: var(--text-muted); -} - -#pagination { - display: flex; - justify-content: flex-start; - margin: 1rem; -} - -#pagination a { - padding-right: 1rem; -} - -#menu { - display: flex; - justify-content: flex-end; - flex-wrap: wrap; - padding-right: .5rem; - align-items: center; -} - -#menu a { - margin-left: .5rem; - color: var(--text-header); -} - -footer { - display: flex; - justify-content: space-between; - flex-wrap: wrap; - margin-top: 1rem; - margin-left: 1rem; - margin-right: 1rem; - flex-direction: column-reverse; -} - -.footer_color { - color: var(--links); -} - -.infobox { - text-align: center; -} - -footer div { - margin-top: 1rem; -} - -p a { - text-decoration: underline; -} - -#articletitle h2 { - margin-top: 0; -} - -article a:hover { - text-decoration: none; -} - -article p:first-child { - margin: 0; -} - -article #readmore { - margin-top: 1rem; -} - -article { - display: flex; - flex-direction: column; - margin-bottom: 2rem; - padding: 1rem; -} - -#articletext img { - - width: 80%; -} - - -#articlemeta { - margin-bottom: 1rem; - margin-left: 1rem; -} - -#articlemeta div:first-child { - font-size: medium; - font-weight: bold; -} - -#articleinner { - display: flex; - flex-direction: column-reverse; - margin-left: 1rem; -} - -#articletext { - margin-bottom: 1rem; -} - -#articlepicture { - margin-top: .3rem; -} - -#articledata { - display: flex; - flex-direction: column-reverse; -} - -#article_footer { - margin-left: 1rem; - margin-top: 2rem; - display: flex; - flex-direction: column; - align-items: stretch; - font-size: x-small; - border-top: 1px solid var(--background); - color: var(--text-muted); - flex-grow: 1; -} - -.articlebgcol1 { - background-color: var(--background); -} - -#nav-posts { - display: flex; - flex-direction: column; -} - -.post_tag { - text-transform: capitalize; - margin-left: .5rem; -} - -.result { - -webkit-user-select: all; - user-select: all; -} - -input, textarea { - background-color: var(--background-body); -} - -.underline { - text-decoration: underline; -} - -.multiple_small { - flex: 0 0 24%; - margin-right: 1rem; -} - -.multiple_big { - flex: 0 0 72%; -} - -.solo { - flex: 0 0 100%; -} - -.borderrad25 { - border-radius: 15px; -} - -.borderrad4px { - border-radius: 4px; -} - -.minmax { - width: auto; - max-width: auto; -} - -.align_menu { - list-style: none; text-align: right; -} - -.margin_left_1rem { - margin-left: 1rem; -} -.margin_top_1rem { - margin-top: 1rem; -} - -.lightborder { -} - - /* Extra small devices (phones, 600px and down) */ -@media only screen and (max-width: 600px) {...} - -/* Small devices (portrait tablets and large phones, 600px and up) */ -@media only screen and (min-width: 600px) { - details { - display: none; - } - - - - #headerinner { - padding: 10px; - } - .container { - min-height: 100vh; - } - - .content { - padding-left: 10px; - padding-right: 10px; - display: flex; - justify-content: space-between; - min-height: 70vh; - } - - .right-sidebar { - display: flex; - flex-shrink: 0; - flex-grow: 0; - margin-left: 2rem; - text-align: right; - flex-direction: column; - min-width: 15%; - min-height: 100vh; - margin-top: 1rem; - margin-right: .5rem; - justify-content: flex-start; - } - - footer { - padding-left: 10px; - padding-right: 10px; - flex-direction: row; - } - - .infobox { - text-align: left; - } - - #articleinner { - display: flex; - flex-direction: row; - } - - #article_footer { - margin-left: 2rem; - } - .minmax { - width: calc(100vw - 5rem); - max-width: 800px; - } -} - -/* Medium devices (landscape tablets, 768px and up) */ -@media only screen and (min-width: 768px) {...} - -/* Large devices (laptops/desktops, 992px and up) */ -@media only screen and (min-width: 992px) {...} - -/* Extra large devices (large laptops and desktops, 1200px and up) */ -@media only screen and (min-width: 1200px) {...} diff --git a/themes/buha/assets/css/main.css b/themes/buha/assets/css/main.css new file mode 100644 index 00000000..ea9519dc --- /dev/null +++ b/themes/buha/assets/css/main.css @@ -0,0 +1,60 @@ +img { + border-radius: 4px; + margin-bottom: .5rem; +} + +#container { + background-color: var(--background); + background-image: linear-gradient(var(--background-alt), var(--background)); +} + +main { + min-height: 60vh; +} + +h1 { + margin-left: .4rem; + font-size: 180%; + margin-top: 0rem; +} + +#main { + padding-left: 1rem; + padding-right: 1rem; + padding-bottom: 1rem; + display: flex; + flex-direction: row; + padding: 1rem; +} + +#content { + display: flex; + flex-direction: column; + flex-grow: 1; +} + +aside { + display: none; +} + +section { + margin-left: 1rem; + display: flex; + flex-direction: column; + justify-content: flex-start; + margin-bottom: 1rem; +} + +@keyframes color { + 0% { background: #00007f; } + 20% { background: #550000; } + 40% { background: #005500; } + 60% { background: #55007f; } + 80% { background: #00557f; } + 100% { background: #00007f; } +} + +body { + background: #33CCCC; /* Fallback */ + animation: color 60s infinite linear; +} diff --git a/themes/buha/assets/css/paginator.css b/themes/buha/assets/css/paginator.css new file mode 100644 index 00000000..679a39f6 --- /dev/null +++ b/themes/buha/assets/css/paginator.css @@ -0,0 +1,9 @@ +#pagination { + display: flex; + justify-content: center; + margin: 1rem; +} + +#pagination a { + padding-right: 1rem; +} diff --git a/themes/buha/i18n/de.toml b/themes/buha/i18n/de.toml index d26f1d71..24e182d4 100644 --- a/themes/buha/i18n/de.toml +++ b/themes/buha/i18n/de.toml @@ -1,18 +1,14 @@ [news] -one = "Neuigkeit" other = "Neuigkeiten" [events] -one = "Termin" other = "Termine" [event] -one = "Termin" other = "Termine" [contact] -one = "Kontakt" -other = "Kontakte" +other = "Kontakt" [pobox] other = "Posfach" @@ -36,23 +32,15 @@ other = "Über uns" other = "weiterlesen" [content] -one = "Inhalt" other = "Inhalte" [categories] -one = "Kategorie" other = "Kategorien" [category] -one = "Kategorie" other = "Kategorien" [tags] -one = "Tag" -other = "Tags" - -[tag] -one = "Tag" other = "Tags" [new] diff --git a/themes/buha/layouts/_default/_markup/render-heading.html b/themes/buha/layouts/_default/_markup/render-heading.html index 7afe29a0..496b2d7c 100644 --- a/themes/buha/layouts/_default/_markup/render-heading.html +++ b/themes/buha/layouts/_default/_markup/render-heading.html @@ -1,7 +1,7 @@ {{ $url := (printf "%s#%s" .Page.Permalink .Anchor) | safeURL }} - + {{ .Text | safeHTML }} diff --git a/themes/buha/layouts/_default/_markup/render-image.html b/themes/buha/layouts/_default/_markup/render-image.html index 5b4116c3..91540a23 100644 --- a/themes/buha/layouts/_default/_markup/render-image.html +++ b/themes/buha/layouts/_default/_markup/render-image.html @@ -1,10 +1,10 @@ {{- if strings.HasPrefix .Destination "http" -}} - + {{ .Text }} -
{{ .Text }}
+
{{ .Text }}
 {{- else -}} {{ if .Page.Resources.ByType "image" }} @@ -12,24 +12,24 @@ {{- $pic := index (.Page.Resources.ByType "image") (int $nr) -}} {{- $image := .Page.Resources.GetMatch (printf "%s" ($pic | safeURL)) -}}
- - {{- $permalink := "" -}} + + {{- $permalink := "" -}} - {{- if ne $image nil -}} - {{- $permalink = $image.RelPermalink -}} - {{- else -}} - {{- $image = imageConfig (printf "static/%s" (.Destination | safeURL)) -}} - {{- $permalink = (printf "/%s" (.Destination | safeURL)) -}} - {{- end -}} + {{- if ne $image nil -}} + {{- $permalink = $image.RelPermalink -}} + {{- else -}} + {{- $image = imageConfig (printf "static/%s" (.Destination | safeURL)) -}} + {{- $permalink = (printf "/%s" (.Destination | safeURL)) -}} + {{- end -}} -
{{ .Text }}
-
{{ .Text }}
- +
{{ .Text }}
+
{{ .Text }}
+
{{ end }} {{- end -}} diff --git a/themes/buha/layouts/_default/baseof.html b/themes/buha/layouts/_default/baseof.html index a12a179d..e768e6f1 100644 --- a/themes/buha/layouts/_default/baseof.html +++ b/themes/buha/layouts/_default/baseof.html @@ -3,22 +3,22 @@ {{- partial "structure/head.html" . -}} {{ block "css" . -}}{{- end }} -
+
{{ partialCached "structure/header" . }} {{ partial "structure/submenu" . }}
-
-
+
+
{{ block "title" . -}}{{- end }} {{ block "calc" . -}}{{- end }} {{ block "content" . -}}{{- end }} -
-
+ -
- {{ block "pagefooter" . -}}{{- end }} + diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html index 92bc4007..f873601a 100644 --- a/themes/buha/layouts/index.html +++ b/themes/buha/layouts/index.html @@ -17,7 +17,7 @@ {{ end }} {{ if gt (len $posts) 1 }} {{ partial "l1/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News" "type" "list") }} -
+
{{ partial "snippets/paginator" (dict "paginator" $paginator) }}
{{ end }} diff --git a/themes/buha/layouts/partials/l1/archive.html b/themes/buha/layouts/partials/l1/archive.html index f28f6a54..4131cb8e 100644 --- a/themes/buha/layouts/partials/l1/archive.html +++ b/themes/buha/layouts/partials/l1/archive.html @@ -1,4 +1,9 @@ -
+{{ if ne .context.Content "" }} +
+ {{ partial "snippets/content" (dict "content" .context.Content) }} +
+{{ end }} +
{{ partial "debug" (dict "context" . "caller" "archive.html" )}} {{ $prev := 3000}} {{range where site.RegularPages "Type" "in" site.Params.searchSections }} @@ -7,9 +12,9 @@

{{ $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" }}

+
{{ .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/l1/article_list.html b/themes/buha/layouts/partials/l1/article_list.html index 9d04fbdd..9f48ac7f 100644 --- a/themes/buha/layouts/partials/l1/article_list.html +++ b/themes/buha/layouts/partials/l1/article_list.html @@ -12,9 +12,9 @@ {{ end }} {{ end }} {{- if gt (len $pages) 0 -}} - {{ if .title }}

{{ .title }}

{{ end }} + {{ if .title }}

{{ .title }}

{{ end }} {{- range first $amount $pages -}} -
+ {{ end }} {{ if .paginate }} -
{{ partial "snippets/paginator" (dict "paginator" $paginator) }} -
{{ end }} {{ end }} {{ end }} diff --git a/themes/buha/layouts/partials/l1/contact.html b/themes/buha/layouts/partials/l1/contact.html index d32809c9..8a1fa367 100644 --- a/themes/buha/layouts/partials/l1/contact.html +++ b/themes/buha/layouts/partials/l1/contact.html @@ -1,7 +1,12 @@ -{{ $small := "solo" }} -{{ $big := "solo" }} +{{ $pic := "solo" }} +{{ $text := "solo" }} +{{- if and (.context.Resources.ByType "image") (.content) -}} + {{ $pic = "multiple_small" }} + {{ $text = "multiple_big" }} +{{ end }} {{ $img := "" }} {{ $thumb := "" }} +{{- .Resources.ByType "image" -}} {{- if .context.Resources.ByType "image" -}} {{- $img = index (.context.Resources.ByType "image") 0 -}} {{- $thumb = $img.Resize "1024x" }} @@ -9,25 +14,21 @@ {{- $thumb = $img.Resize "500x" }} {{ end }} {{ end }} -{{- if or (.context.Resources.ByType "image") (.context.Summary) ($img) -}} - {{ $small = "multiple_small" }} - {{ $big = "multiple_big" }} -{{ else }} - {{ $small = "multiple_big"}} -{{ end }} +
{{ if and (ne $img "") (eq .pic true)}} -
+ {{ end }} -
+
{{ if .partial_before }} {{ partial .partial_before (dict "context" .context "pic" .pic) }} {{ end }} {{ .content }}
+
diff --git a/themes/buha/layouts/partials/l1/imprint.html b/themes/buha/layouts/partials/l1/generic_single.html similarity index 71% rename from themes/buha/layouts/partials/l1/imprint.html rename to themes/buha/layouts/partials/l1/generic_single.html index d32809c9..809249aa 100644 --- a/themes/buha/layouts/partials/l1/imprint.html +++ b/themes/buha/layouts/partials/l1/generic_single.html @@ -1,5 +1,9 @@ -{{ $small := "solo" }} -{{ $big := "solo" }} +{{ $pic := "solo" }} +{{ $text := "solo" }} +{{- if and (.context.Resources.ByType "image") (.context.Content) -}} + {{ $pic = "multiple_small" }} + {{ $text = "multiple_big" }} +{{ end }} {{ $img := "" }} {{ $thumb := "" }} {{- if .context.Resources.ByType "image" -}} @@ -9,25 +13,22 @@ {{- $thumb = $img.Resize "500x" }} {{ end }} {{ end }} -{{- if or (.context.Resources.ByType "image") (.context.Summary) ($img) -}} - {{ $small = "multiple_small" }} - {{ $big = "multiple_big" }} -{{ else }} - {{ $small = "multiple_big"}} -{{ end }} + +
{{ if and (ne $img "") (eq .pic true)}} -
+
{{ if and (ne .type "list") (.context.Resources.ByType "image") }}{{ end }} {{ if ne .type "list" }}{{ end }} {{ if eq .type "article" }}{{ end }}
{{ end }} -
+
{{ if .partial_before }} {{ partial .partial_before (dict "context" .context "pic" .pic) }} {{ end }} {{ .content }}
+
diff --git a/themes/buha/layouts/partials/l1/links.html b/themes/buha/layouts/partials/l1/links.html index 156030af..3132060d 100644 --- a/themes/buha/layouts/partials/l1/links.html +++ b/themes/buha/layouts/partials/l1/links.html @@ -1,6 +1,12 @@ -{{ range .context.Pages }} - +{{ if ne .context.Content "" }} +
+ {{ partial "snippets/content" (dict "content" .context.Content) }} +
+{{ end }} +{{ range .context.Pages }} +
+ {{ .Params.link }}
+ {{ .Title }}
+
+
{{ end }} diff --git a/themes/buha/layouts/partials/l1/media.html b/themes/buha/layouts/partials/l1/media.html index 9f89d962..e3390493 100644 --- a/themes/buha/layouts/partials/l1/media.html +++ b/themes/buha/layouts/partials/l1/media.html @@ -1,5 +1,10 @@ -
+{{ if ne .context.Content "" }} +
+ {{ partial "snippets/content" (dict "content" .context.Content) }} +
+{{ end }} +
{{ range .context.Resources.ByType "image" }} {{ end }} -
+ diff --git a/themes/buha/layouts/partials/l1/newsletter.html b/themes/buha/layouts/partials/l1/newsletter.html deleted file mode 100644 index d32809c9..00000000 --- a/themes/buha/layouts/partials/l1/newsletter.html +++ /dev/null @@ -1,33 +0,0 @@ -{{ $small := "solo" }} -{{ $big := "solo" }} -{{ $img := "" }} -{{ $thumb := "" }} -{{- if .context.Resources.ByType "image" -}} - {{- $img = index (.context.Resources.ByType "image") 0 -}} - {{- $thumb = $img.Resize "1024x" }} - {{ if .content }} - {{- $thumb = $img.Resize "500x" }} - {{ end }} -{{ end }} -{{- if or (.context.Resources.ByType "image") (.context.Summary) ($img) -}} - {{ $small = "multiple_small" }} - {{ $big = "multiple_big" }} -{{ else }} - {{ $small = "multiple_big"}} -{{ end }} -
- {{ if and (ne $img "") (eq .pic true)}} -
- {{ if and (ne .type "list") (.context.Resources.ByType "image") }}{{ end }} - - {{ if ne .type "list" }}{{ end }} - {{ if eq .type "article" }}{{ end }} -
- {{ end }} -
- {{ if .partial_before }} - {{ partial .partial_before (dict "context" .context "pic" .pic) }} - {{ end }} - {{ .content }} -
-
diff --git a/themes/buha/layouts/partials/l1/section_list b/themes/buha/layouts/partials/l1/section_list deleted file mode 100644 index 12e3b5f8..00000000 --- a/themes/buha/layouts/partials/l1/section_list +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/themes/buha/layouts/partials/l1/section_list.html b/themes/buha/layouts/partials/l1/section_list.html new file mode 100644 index 00000000..f8f8c97c --- /dev/null +++ b/themes/buha/layouts/partials/l1/section_list.html @@ -0,0 +1,11 @@ +{{ if ne .context.Content "" }} +
+ {{ partial "snippets/content" (dict "content" .context.Content) }} +
+{{ end }} + +
+{{ range .context.Pages }} +
🗀 {{ .Title }}
+{{ end }} +
diff --git a/themes/buha/layouts/partials/layout/archive.html b/themes/buha/layouts/partials/layout/archive.html deleted file mode 100644 index d9ac9716..00000000 --- a/themes/buha/layouts/partials/layout/archive.html +++ /dev/null @@ -1,14 +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/layout/article.html b/themes/buha/layouts/partials/layout/article.html index fae956a8..f3935573 100644 --- a/themes/buha/layouts/partials/layout/article.html +++ b/themes/buha/layouts/partials/layout/article.html @@ -4,20 +4,16 @@ {{ $metas = dict "when" .context.Params.when "price" .context.Params.price }} {{ end }} -{{ $small := "solo" }} -{{ $big := "solo" }} +{{ $pic := "solo" }} +{{ $text := "solo" }} -{{- if or (.context.Resources.ByType "image") (.context.Summary) -}} - {{ $small = "multiple_small" }} - {{ $big = "multiple_big" }} -{{ else }} - {{ $small = "multiple_big"}} +{{- if and (.context.Resources.ByType "image") (.context.Content) -}} + {{ $pic = "multiple_small" }} + {{ $text = "multiple_big" }} {{ end }} - - {{ partial "snippets/article_metadata" $metas }} -
+
{{- if and (.context.Resources.ByType "image") (eq .pic "true") -}} {{ $resize := "500x" }} {{- $img := index (.context.Resources.ByType "image") 0 -}} @@ -28,7 +24,7 @@ {{- $thumb = $img.Resize "500x" }} {{ end }} {{- $thumb = $img.Resize $resize }} -
+
{{ if and (ne .type "list") (.context.Resources.ByType "image") }}{{ end }} {{ if ne .type "list" }}{{ end }} @@ -36,7 +32,7 @@
{{ 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") }} @@ -51,7 +47,7 @@
{{ with .Params.foundations }} Träger der Veranstaltung: -
+
{{ range . }} {{ $l := . }} {{ $url := "" }} @@ -69,14 +65,14 @@ {{ end }}
{{ end }} -
+
- {{ if i18n "created" }}{{ i18n "created" }}{{ else }}{{ "Created" }}{{ end }}
+ {{ 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 }}
+ {{ if i18n "lastmod" }}{{ i18n "lastmod" }}{{ else }}{{ "Last modification" }}{{ end }} {{ .Lastmod | time.Format ":date_full" }}
{{ end }} diff --git a/themes/buha/layouts/partials/layout/generator.html b/themes/buha/layouts/partials/layout/generator.html index 3e835d2d..5a0c050f 100644 --- a/themes/buha/layouts/partials/layout/generator.html +++ b/themes/buha/layouts/partials/layout/generator.html @@ -4,7 +4,7 @@
-
+
{{ .context.Content }}
diff --git a/themes/buha/layouts/partials/layout/generator/form.html b/themes/buha/layouts/partials/layout/generator/form.html index 92cf0823..3eff57f8 100644 --- a/themes/buha/layouts/partials/layout/generator/form.html +++ b/themes/buha/layouts/partials/layout/generator/form.html @@ -35,7 +35,7 @@
{{ else if eq .input_type "results" }} - +
{{ else if eq .input_type "submit" }}
@@ -55,8 +55,14 @@ {{ $pages := where site.RegularPages "Type" "in" site.Params.searchSections }} {{ if eq .title "tags" }} {{ range $pages }} - {{- if .Params.tags -}} - {{- $finale = $finale | append .Params.tags -}} + {{- with .Params.tags -}} + {{- $finale = $finale | append . -}} + {{ end }} + {{ end }} + {{ else if eq .title "foundations" }} + {{ range $pages }} + {{- with .Params.foundations -}} + {{- $finale = $finale | append . -}} {{ end }} {{ end }} {{ else }} @@ -68,7 +74,7 @@ {{ end }} {{- $finale = $finale | uniq -}} -
+
{{ .name }} {{ if ne .expanded true }}{{ partial "layout/generator/expand" (dict "name" (printf "%scat" $in0)) }}{{ end }}{{- if .required -}}{{- " *" -}}{{- end -}} @@ -76,17 +82,17 @@ -
+
-
-
+
+
{{ range sort $finale }} {{ end }}
{{ if .new }} - + {{ end }}
@@ -128,8 +134,8 @@
{{ else }} -
-
+
+
diff --git a/themes/buha/layouts/partials/layout/nottranslated.html b/themes/buha/layouts/partials/layout/nottranslated.html index 9a16e2b1..6bc4bdfd 100644 --- a/themes/buha/layouts/partials/layout/nottranslated.html +++ b/themes/buha/layouts/partials/layout/nottranslated.html @@ -19,7 +19,7 @@ {{ $missing = $missing | append "all translations" }} {{ end }} {{ if $missing }} - {{ .Name }}: + {{ .Name }}:
missing: {{ index $missing 0 }}
{{ end }} {{ end }} diff --git a/themes/buha/layouts/partials/snippets/article_metadata.html b/themes/buha/layouts/partials/snippets/article_metadata.html index 77514389..2fd50d99 100644 --- a/themes/buha/layouts/partials/snippets/article_metadata.html +++ b/themes/buha/layouts/partials/snippets/article_metadata.html @@ -1,6 +1,6 @@ {{ if or .when .price .contact .covid }} -
+
{{ if .when }}
{{ .when }}
{{ end }} diff --git a/themes/buha/layouts/partials/snippets/content.html b/themes/buha/layouts/partials/snippets/content.html index 50c5652e..61ed44b5 100644 --- a/themes/buha/layouts/partials/snippets/content.html +++ b/themes/buha/layouts/partials/snippets/content.html @@ -1 +1 @@ -
{{ .content }}
+
{{ .content }}
diff --git a/themes/buha/layouts/partials/snippets/menu.html b/themes/buha/layouts/partials/snippets/menu.html index 9b1a5573..8b0e661c 100644 --- a/themes/buha/layouts/partials/snippets/menu.html +++ b/themes/buha/layouts/partials/snippets/menu.html @@ -1,5 +1,5 @@ {{ if gt .Site.Taxonomies.categories 0 }} -

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

    • +

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

     {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.categories }} {{ $orig := $taxonomyname }} {{ if ne (i18n $taxonomyname) "" }} @@ -11,7 +11,7 @@ {{ end }} {{ end }} {{ if gt .Site.Taxonomies.events 0 }} -

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

    • +

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

     {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.events }} {{ $orig := $taxonomyname }} {{ if ne (i18n $taxonomyname) "" }} diff --git a/themes/buha/layouts/partials/snippets/paginator.html b/themes/buha/layouts/partials/snippets/paginator.html index 71895c3b..2843aefd 100644 --- a/themes/buha/layouts/partials/snippets/paginator.html +++ b/themes/buha/layouts/partials/snippets/paginator.html @@ -1,5 +1,5 @@ {{ $paginator := .paginator}} -
    +
    -
    \ No newline at end of file +
    diff --git a/themes/buha/layouts/partials/structure/head.html b/themes/buha/layouts/partials/structure/head.html index e747c552..6939aafe 100644 --- a/themes/buha/layouts/partials/structure/head.html +++ b/themes/buha/layouts/partials/structure/head.html @@ -2,9 +2,16 @@ -{{ $stylecolor := resources.Get "css/color.css" }} -{{ $stylelayout := resources.Get "css/layout.css" }} -{{ $allcss := slice $stylecolor $stylelayout | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }} +{{ $water := resources.Get "css/color.css" }} +{{ $header := resources.Get "css/header.css" }} +{{ $main := resources.Get "css/main.css" }} +{{ $article := resources.Get "css/article.css" }} +{{ $paginator := resources.Get "css/paginator.css" }} +{{ $footer := resources.Get "css/footer.css" }} +{{ $classes := resources.Get "css/classes.css" }} +{{ $generator := resources.Get "css/generator.css" }} +{{ $big := resources.Get "css/big.css" }} +{{ $allcss := slice $water $header $main $article $paginator $footer $generator $big $classes | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }} {{ $title := print .Site.Title " | " .Title }} diff --git a/themes/buha/layouts/partials/structure/paginator.html b/themes/buha/layouts/partials/structure/paginator.html deleted file mode 100644 index 71895c3b..00000000 --- a/themes/buha/layouts/partials/structure/paginator.html +++ /dev/null @@ -1,102 +0,0 @@ - {{ $paginator := .paginator}} -
    - -
    \ No newline at end of file diff --git a/themes/buha/layouts/partials/structure/submenu.html b/themes/buha/layouts/partials/structure/submenu.html index 24ed887e..03c42153 100644 --- a/themes/buha/layouts/partials/structure/submenu.html +++ b/themes/buha/layouts/partials/structure/submenu.html @@ -1,6 +1,6 @@
    - Menü ☰ + Menü ☰

    {{ partial "snippets/menu" . }}

    diff --git a/themes/buha/static/css/visibleIf.css b/themes/buha/static/css/visibleIf.css index 40623b30..9255b187 100644 --- a/themes/buha/static/css/visibleIf.css +++ b/themes/buha/static/css/visibleIf.css @@ -21,4 +21,4 @@ tr.visibleIf-visible, tr.visibleif-visible { .visibleIf-rule, .mandatoryIf-rule, .visibleif-rule, .mandatoryif-rule { display: none; } - \ No newline at end of file +