-
- {{- .Title -}}
-
-
+ {{ .Content }}
+
+ {{ end }}
+ {{ end }}
+ {{- range first 5 $paginator.Pages -}}
+ {{ partial "structure/list_article" . }}
+ {{- end }}
+
-
- {{ if and (ne .Params.when "") (ne .Params.when nil) }}
-
- {{ .Params.when }}
- {{ $meta = "true" }}
- {{ end }}
- {{ if and (ne .Params.price "") (ne .Params.price nil) }}
- {{ if eq .Params.price "free" }}
- Der Eintritt ist frei.
- {{ $meta = "true" }}
- {{ else }}
- Eintritt: {{ .Params.price }}
- {{ $meta = "true" }}
- {{ end }}
- {{ end }}
-
-
-
-
- {{- end }}
-
- {{- if .Resources.ByType "image" -}}
- {{- $pic := index (.Resources.ByType "image") 0 -}}
- {{ $thumb := "" }}
- {{ if eq .Content "" }}
-
-
- {{- $thumb = $pic.Resize "1024x" }}
- {{ else }}
-
-
- {{- $thumb = $pic.Resize "2048x" }}
- {{ end }}
-
- 
-
- {{- end }}
-
- {{- if .Params.description -}}
- {{- .Params.description -}}
- {{- else -}}
- {{- .Summary -}}
- {{- end }}
- {{ if .Truncated }}
-
- {{- i18n "readmore" -}}..
- {{ end }}
-
-
- {{ $adjacent_links := 2 }}
-
-
- {{ $max_links := (add (mul $adjacent_links 2) 1) }}
-
-
- {{ $lower_limit := (add $adjacent_links 1) }}
-
-
- {{ $upper_limit := (sub $paginator.TotalPages $adjacent_links) }}
-
-
- {{ if gt $paginator.TotalPages 1 }}
-
-
-
- {{ if ne $paginator.PageNumber 1 }}
-
- ««
-
- {{ end }}
-
-
- {{ if $paginator.HasPrev }}
-
- «
-
- {{ end }}
-
-
- {{ range $paginator.Pagers }}
-
- {{ $.Scratch.Set "page_number_flag" false }}
-
-
-
- {{ if gt $paginator.TotalPages $max_links }}
-
-
-
-
- {{ if le $paginator.PageNumber $lower_limit }}
-
-
- {{ if le .PageNumber $max_links }}
- {{ $.Scratch.Set "page_number_flag" true }}
- {{ end }}
-
-
-
-
- {{ else if ge $paginator.PageNumber $upper_limit }}
-
-
- {{ if gt .PageNumber (sub $paginator.TotalPages $max_links) }}
- {{ $.Scratch.Set "page_number_flag" true }}
- {{ end }}
-
-
-
- {{ else }}
-
- {{ if and ( ge .PageNumber (sub $paginator.PageNumber $adjacent_links) ) ( le .PageNumber (add $paginator.PageNumber $adjacent_links) ) }}
- {{ $.Scratch.Set "page_number_flag" true }}
- {{ end }}
-
- {{ end }}
-
-
-
- {{ else }}
-
- {{ $.Scratch.Set "page_number_flag" true }}
-
- {{ end }}
-
-
- {{ if eq ($.Scratch.Get "page_number_flag") true }}
-
- {{ .PageNumber }}
-
- {{ end }}
-
- {{ end }}
-
-
- {{ if $paginator.HasNext }}
-
- »
-
- {{ end }}
-
-
- {{ if ne $paginator.PageNumber $paginator.TotalPages }}
-
- »»
-
- {{ end }}
-
- {{ end }}
-
+ {{ partial "list/misc.html" . }}
{{- end -}}
{{ define "sidebar" }}
diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html
index f07bfe3f..d545d01d 100644
--- a/themes/buha/layouts/_default/single.html
+++ b/themes/buha/layouts/_default/single.html
@@ -10,3 +10,28 @@
{{ partial "single/article" . }}
{{ end }}
{{ end }}
+
+{{ define "ab" }}
+
+{{ end }}
\ No newline at end of file
diff --git a/themes/buha/layouts/_default/taxonomy.html b/themes/buha/layouts/_default/taxonomy.html
new file mode 100644
index 00000000..39ebe765
--- /dev/null
+++ b/themes/buha/layouts/_default/taxonomy.html
@@ -0,0 +1,45 @@
+{{- 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" -}}
+ {{ $title := lower .Title }}
+ {{ $s := .Site.Params }}
+ {{- $paginator := slice -}}
+ {{ $what := printf ".Params.%s" $title }}
+ {{ if or (eq $title "about") (eq $title "featured") }}
+ {{- $paginator = .Paginate (where (where .Site.RegularPages "Type" "in" site.Params.mainSections) $what "eq" true) -}}
+ {{ else if eq $title "events" }}
+ {{- $paginator = .Paginate (where (where .Site.RegularPages "Type" "in" site.Params.mainSections) ".Params.when" "ne" nil) -}}
+ {{ else if eq $title "news" }}
+ {{- $paginator = .Paginate .Site.RegularPages -}}
+ {{ else }}
+ {{- $paginator = .Paginate .Data.Pages -}}
+ {{ end }}
+ {{ if eq $paginator.PageNumber 1 }}
+ {{ if ne .Content "" }}
+
+ {{ partial "structure/paginator" (dict "paginator" $paginator) }}
+
+{{- end -}}
+
+{{ define "sidebar" }}
+ {{- partial "structure/empty" . }}
+{{ end }}
\ No newline at end of file
diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html
index 42bcdbcd..6ed67fe4 100644
--- a/themes/buha/layouts/index.html
+++ b/themes/buha/layouts/index.html
@@ -18,110 +18,17 @@
{{ .Content }}
{{ end }}
- {{ $meta := false }}
{{ range first 3 (where (where .Site.RegularPages "Type" "in" site.Params.mainSections) ".Params.featured" "=" true) }}
{{ $article_age := sub now.Unix (int .Date.Unix) }}
{{ if lt $article_age "1209600" }}
-
-
- {{- .Title -}}
featured -
-
-
- {{ if and (ne .Params.when "") (ne .Params.when nil) }}
-
- {{ .Params.when }}
- {{ end }}
- {{ if and (ne .Params.price "") (ne .Params.price nil) }}
- {{ if eq .Params.price "free" }}
- Der Eintritt ist frei.
- {{ else }}
- Eintritt: {{ .Params.price }}
- {{ end }}
- {{ end }}
-
-
-
+ {{ partial "structure/list_article.html" . }}
{{ end }}
{{ end }}
{{ end }}
{{- range first 5 $paginator.Pages -}}
{{ $article_age := sub now.Unix (int .Date.Unix) }}
{{ if or (ne .Params.featured true) (ge $article_age "1209600") }}
-
- {{- if .Resources.ByType "image" -}}
- {{- $pic := index (.Resources.ByType "image") 0 -}}
- {{ $thumb := "" }}
- {{ if eq .Content "" }}
-
-
- {{- $thumb = $pic.Resize "1024x" }}
- {{ else }}
-
-
- {{- $thumb = $pic.Resize "2048x" }}
- {{ end }}
-
-
-
- {{- end }}
-
- {{- if .Params.description -}}
- {{- .Params.description -}}
- {{- else -}}
- {{- .Summary -}}
- {{- end }}
- {{ if .Truncated }}
-
- {{- i18n "readmore" -}}..
- {{ end }}
-
-
- {{- .Title -}}
-
- 
- {{ if and (ne .Params.when "") (ne .Params.when nil) }}
-
- {{ .Params.when }}
- {{ end }}
- {{ if and (ne .Params.price "") (ne .Params.price nil) }}
- {{ if eq .Params.price "free" }}
- Der Eintritt ist frei.
- {{ else }}
- Eintritt: {{ .Params.price }}
- {{ end }}
- {{ end }}
-
-
-
+ {{ partial "structure/list_article.html" . }}
{{ end }}
{{- end }}
- {{- if .Resources.ByType "image" -}}
- {{- $pic := index (.Resources.ByType "image") 0 -}}
- {{ $thumb := "" }}
- {{ if eq .Content "" }}
-
-
- {{- $thumb = $pic.Resize "1024x" }}
- {{ else }}
-
-
- {{- $thumb = $pic.Resize "2048x" }}
- {{ end }}
-
-
-
- {{- end }}
-
- {{- if .Params.description -}}
- {{- .Params.description -}}
- {{- else -}}
- {{- .Summary -}}
- {{- end }}
- {{ if .Truncated }}
-
- {{- i18n "readmore" -}}..
- {{ end }}
-
@@ -233,4 +140,5 @@
{{ define "sidebar" }}
{{- partial "structure/sidebar" . }}
-{{ end }}
\ No newline at end of file
+{{ end }}
+
diff --git a/themes/buha/layouts/partials/contact.html b/themes/buha/layouts/partials/contact.html
index 3c80603c..3cc48063 100644
--- a/themes/buha/layouts/partials/contact.html
+++ b/themes/buha/layouts/partials/contact.html
@@ -1,7 +1,7 @@
{{ site.Title }}
{{ site.Params.imprintdata.street }}
-{{ site.Params.imprintdata.pobox }}
+{{ if i18n "pobox" }}{{ i18n "pobox" }}{{ else }}{{ "pobox" }}{{ end }} {{ site.Params.imprintdata.pobox }}
{{ site.Params.imprintdata.city }}
-Telefon: {{ site.Params.imprintdata.tel }}
-
+
+ {{ .Content }}
+
+ {{ end }}
+ {{ end }}
+ {{- range first 5 $paginator.Pages -}}
+ {{ partial "structure/list_article.html" . }}
+ {{- end }}
+ {{ partial "structure/paginator" "paginator" $paginator }}
+
diff --git a/themes/buha/layouts/partials/list/featured.html b/themes/buha/layouts/partials/list/featured.html
new file mode 100644
index 00000000..fe5a1b72
--- /dev/null
+++ b/themes/buha/layouts/partials/list/featured.html
@@ -0,0 +1,118 @@
+ {{ $s := .Site.Params }}
+ {{- $paginator := slice -}}
+ {{- $posts := where .Site.RegularPages "Type" "in" $s.mainSections }}
+ {{- $paginator = .Paginate (where $posts "Params.featured" true) -}}
+ {{ if eq $paginator.PageNumber 1 }}
+ {{ if ne .Content "" }}
+
+ {{ .Content }}
+
+ {{ end }}
+ {{ end }}
+ {{- range first 5 $paginator.Pages -}}
+ {{ partial "structure/list_article.html" . }}
+
+ {{- end }}
+
+ {{ .Content }}
+
+ {{ end }}
+ {{ end }}
+ {{- range first 5 $paginator.Pages -}}
+ {{ partial "structure/list_article.html" . }}
+
+ {{- end }}
+
+
+ {{ .Content }}
+
+ {{ end }}
+ {{ end }}
+ {{- range first 5 $paginator.Pages -}}
+ {{ partial "structure/list_article.html" . }}
+
+ {{- end }}
+
+ {{ .Content }}
+
+ {{ end }}
+ {{ end }}
+ {{- range first 5 $paginator.Pages -}}
+ {{ partial "structure/list_article.html" . }}
+
+ {{- end }}
+
- diff --git a/themes/buha/layouts/partials/orga/generator/content.html b/themes/buha/layouts/partials/orga/generator/content.html new file mode 100644 index 00000000..537f15ec --- /dev/null +++ b/themes/buha/layouts/partials/orga/generator/content.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/themes/buha/layouts/partials/orga/generator/partials/categories.html b/themes/buha/layouts/partials/orga/generator/partials/categories.html new file mode 100644 index 00000000..e3e03d80 --- /dev/null +++ b/themes/buha/layouts/partials/orga/generator/partials/categories.html @@ -0,0 +1,31 @@ +{{ $in0 := printf "%s" .name }} +{{ $in1 := printf "%scategories" .name }} +{{ $in2 := printf "%scategory" .name }} +{{ $openname := printf "open%s" .name }} +{{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} +{{- $categories := slice -}} +{{ range $pages }} + {{ range .Param $in1 }} + {{- $categories = $categories | append . -}} + {{ end }} +{{ end }} +{{- $categories := $categories | uniq -}} +{{ if eq .expanded "true" }} +
-
+
+
+{{ define "sidebar" }}
+
+{{ site.Params.imprintdata.street }}
-{{ site.Params.imprintdata.pobox }}
+{{ if i18n "pobox" }}{{ i18n "pobox" }}{{ else }}{{ "pobox" }}{{ end }} {{ site.Params.imprintdata.pobox }}
{{ site.Params.imprintdata.city }}
-Telefon: {{ site.Params.imprintdata.tel }}
-
E-Mail: {{ site.Params.imprintdata.mail | markdownify }}
\ No newline at end of file +{{ if i18n "phone" }}{{ i18n "phone" }}{{ else }}{{ "phone" }}{{ end }}: {{ site.Params.imprintdata.tel }}+
{{ if i18n "mail" }}{{ i18n "mail" }}{{ else }}{{ "mail" }}{{ end }}: {{ site.Params.imprintdata.mail | markdownify }}
\ No newline at end of file diff --git a/themes/buha/layouts/partials/list/events.html b/themes/buha/layouts/partials/list/events.html new file mode 100644 index 00000000..a4ed6ffe --- /dev/null +++ b/themes/buha/layouts/partials/list/events.html @@ -0,0 +1,15 @@ + {{ $s := .Site.Params }} + {{- $paginator := slice -}} + {{- $paginator = .Paginate (where site.RegularPages.ByDate.Reverse ".Params.when" "ne" nil) -}} + {{ if eq $paginator.PageNumber 1 }} + {{ if ne .Content "" }} +
+
+ {{ $adjacent_links := 2 }}
+
+
+ {{ $max_links := (add (mul $adjacent_links 2) 1) }}
+
+
+ {{ $lower_limit := (add $adjacent_links 1) }}
+
+
+ {{ $upper_limit := (sub $paginator.TotalPages $adjacent_links) }}
+
+
+ {{ if gt $paginator.TotalPages 1 }}
+
+
+
+ {{ if ne $paginator.PageNumber 1 }}
+
+ ««
+
+ {{ end }}
+
+
+ {{ if $paginator.HasPrev }}
+
+ «
+
+ {{ end }}
+
+
+ {{ range $paginator.Pagers }}
+
+ {{ $.Scratch.Set "page_number_flag" false }}
+
+
+
+ {{ if gt $paginator.TotalPages $max_links }}
+
+
+
+
+ {{ if le $paginator.PageNumber $lower_limit }}
+
+
+ {{ if le .PageNumber $max_links }}
+ {{ $.Scratch.Set "page_number_flag" true }}
+ {{ end }}
+
+
+
+
+ {{ else if ge $paginator.PageNumber $upper_limit }}
+
+
+ {{ if gt .PageNumber (sub $paginator.TotalPages $max_links) }}
+ {{ $.Scratch.Set "page_number_flag" true }}
+ {{ end }}
+
+
+
+ {{ else }}
+
+ {{ if and ( ge .PageNumber (sub $paginator.PageNumber $adjacent_links) ) ( le .PageNumber (add $paginator.PageNumber $adjacent_links) ) }}
+ {{ $.Scratch.Set "page_number_flag" true }}
+ {{ end }}
+
+ {{ end }}
+
+
+
+ {{ else }}
+
+ {{ $.Scratch.Set "page_number_flag" true }}
+
+ {{ end }}
+
+
+ {{ if eq ($.Scratch.Get "page_number_flag") true }}
+
+ {{ .PageNumber }}
+
+ {{ end }}
+
+ {{ end }}
+
+
+ {{ if $paginator.HasNext }}
+
+ »
+
+ {{ end }}
+
+
+ {{ if ne $paginator.PageNumber $paginator.TotalPages }}
+
+ »»
+
+ {{ end }}
+
+ {{ end }}
+
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/list/misc.html b/themes/buha/layouts/partials/list/misc.html
new file mode 100644
index 00000000..f390a955
--- /dev/null
+++ b/themes/buha/layouts/partials/list/misc.html
@@ -0,0 +1,18 @@
+ {{ $s := .Site.Params }}
+ {{- $paginator := slice -}}
+ {{- $paginator = .Paginate .RegularPagesRecursive.ByDate.Reverse -}}
+ {{ if eq $paginator.PageNumber 1 }}
+ {{ if ne .Content "" }}
+
+ {{ partial "structure/paginator" (dict "paginator" $paginator) }}
+
diff --git a/themes/buha/layouts/partials/list/news.html b/themes/buha/layouts/partials/list/news.html
new file mode 100644
index 00000000..8c88d764
--- /dev/null
+++ b/themes/buha/layouts/partials/list/news.html
@@ -0,0 +1,117 @@
+ {{ $s := .Site.Params }}
+ {{- $paginator := slice -}}
+ {{- $paginator = .Paginate (where (where .Site.RegularPages.ByDate.Reverse "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.mainSections) }}
+ {{ if eq $paginator.PageNumber 1 }}
+ {{ if ne .Content "" }}
+
+
+ {{ $adjacent_links := 2 }}
+
+
+ {{ $max_links := (add (mul $adjacent_links 2) 1) }}
+
+
+ {{ $lower_limit := (add $adjacent_links 1) }}
+
+
+ {{ $upper_limit := (sub $paginator.TotalPages $adjacent_links) }}
+
+
+ {{ if gt $paginator.TotalPages 1 }}
+
+
+
+ {{ if ne $paginator.PageNumber 1 }}
+
+ ««
+
+ {{ end }}
+
+
+ {{ if $paginator.HasPrev }}
+
+ «
+
+ {{ end }}
+
+
+ {{ range $paginator.Pagers }}
+
+ {{ $.Scratch.Set "page_number_flag" false }}
+
+
+
+ {{ if gt $paginator.TotalPages $max_links }}
+
+
+
+
+ {{ if le $paginator.PageNumber $lower_limit }}
+
+
+ {{ if le .PageNumber $max_links }}
+ {{ $.Scratch.Set "page_number_flag" true }}
+ {{ end }}
+
+
+
+
+ {{ else if ge $paginator.PageNumber $upper_limit }}
+
+
+ {{ if gt .PageNumber (sub $paginator.TotalPages $max_links) }}
+ {{ $.Scratch.Set "page_number_flag" true }}
+ {{ end }}
+
+
+
+ {{ else }}
+
+ {{ if and ( ge .PageNumber (sub $paginator.PageNumber $adjacent_links) ) ( le .PageNumber (add $paginator.PageNumber $adjacent_links) ) }}
+ {{ $.Scratch.Set "page_number_flag" true }}
+ {{ end }}
+
+ {{ end }}
+
+
+
+ {{ else }}
+
+ {{ $.Scratch.Set "page_number_flag" true }}
+
+ {{ end }}
+
+
+ {{ if eq ($.Scratch.Get "page_number_flag") true }}
+
+ {{ .PageNumber }}
+
+ {{ end }}
+
+ {{ end }}
+
+
+ {{ if $paginator.HasNext }}
+
+ »
+
+ {{ end }}
+
+
+ {{ if ne $paginator.PageNumber $paginator.TotalPages }}
+
+ »»
+
+ {{ end }}
+
+ {{ end }}
+
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/list/recurrent.html b/themes/buha/layouts/partials/list/recurrent.html
new file mode 100644
index 00000000..97876a7a
--- /dev/null
+++ b/themes/buha/layouts/partials/list/recurrent.html
@@ -0,0 +1,117 @@
+ {{ $s := .Site.Params }}
+ {{- $paginator := slice -}}
+ {{- $paginator = .Paginate (where .Site.RegularPages "Params.recurrent" true) -}}
+ {{ if eq $paginator.PageNumber 1 }}
+ {{ if ne .Content "" }}
+
+
+ {{ $adjacent_links := 2 }}
+
+
+ {{ $max_links := (add (mul $adjacent_links 2) 1) }}
+
+
+ {{ $lower_limit := (add $adjacent_links 1) }}
+
+
+ {{ $upper_limit := (sub $paginator.TotalPages $adjacent_links) }}
+
+
+ {{ if gt $paginator.TotalPages 1 }}
+
+
+
+ {{ if ne $paginator.PageNumber 1 }}
+
+ ««
+
+ {{ end }}
+
+
+ {{ if $paginator.HasPrev }}
+
+ «
+
+ {{ end }}
+
+
+ {{ range $paginator.Pagers }}
+
+ {{ $.Scratch.Set "page_number_flag" false }}
+
+
+
+ {{ if gt $paginator.TotalPages $max_links }}
+
+
+
+
+ {{ if le $paginator.PageNumber $lower_limit }}
+
+
+ {{ if le .PageNumber $max_links }}
+ {{ $.Scratch.Set "page_number_flag" true }}
+ {{ end }}
+
+
+
+
+ {{ else if ge $paginator.PageNumber $upper_limit }}
+
+
+ {{ if gt .PageNumber (sub $paginator.TotalPages $max_links) }}
+ {{ $.Scratch.Set "page_number_flag" true }}
+ {{ end }}
+
+
+
+ {{ else }}
+
+ {{ if and ( ge .PageNumber (sub $paginator.PageNumber $adjacent_links) ) ( le .PageNumber (add $paginator.PageNumber $adjacent_links) ) }}
+ {{ $.Scratch.Set "page_number_flag" true }}
+ {{ end }}
+
+ {{ end }}
+
+
+
+ {{ else }}
+
+ {{ $.Scratch.Set "page_number_flag" true }}
+
+ {{ end }}
+
+
+ {{ if eq ($.Scratch.Get "page_number_flag") true }}
+
+ {{ .PageNumber }}
+
+ {{ end }}
+
+ {{ end }}
+
+
+ {{ if $paginator.HasNext }}
+
+ »
+
+ {{ end }}
+
+
+ {{ if ne $paginator.PageNumber $paginator.TotalPages }}
+
+ »»
+
+ {{ end }}
+
+ {{ end }}
+
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/orga/generator.html b/themes/buha/layouts/partials/orga/generator.html
index 2f5757fd..5e4e2960 100644
--- a/themes/buha/layouts/partials/orga/generator.html
+++ b/themes/buha/layouts/partials/orga/generator.html
@@ -20,16 +20,25 @@
- diff --git a/themes/buha/layouts/partials/orga/generator/content.html b/themes/buha/layouts/partials/orga/generator/content.html new file mode 100644 index 00000000..537f15ec --- /dev/null +++ b/themes/buha/layouts/partials/orga/generator/content.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/themes/buha/layouts/partials/orga/generator/partials/categories.html b/themes/buha/layouts/partials/orga/generator/partials/categories.html new file mode 100644 index 00000000..e3e03d80 --- /dev/null +++ b/themes/buha/layouts/partials/orga/generator/partials/categories.html @@ -0,0 +1,31 @@ +{{ $in0 := printf "%s" .name }} +{{ $in1 := printf "%scategories" .name }} +{{ $in2 := printf "%scategory" .name }} +{{ $openname := printf "open%s" .name }} +{{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} +{{- $categories := slice -}} +{{ range $pages }} + {{ range .Param $in1 }} + {{- $categories = $categories | append . -}} + {{ end }} +{{ end }} +{{- $categories := $categories | uniq -}} +{{ if eq .expanded "true" }} +
+ {{ if i18n .name }}{{ i18n .name }}{{ else }}{{ .name }}{{ end }}{{- if eq .mandatory "true" -}}*{{- end -}}
+{{ else }}
+ {{ partial "orga/generator/partials/expand" (dict "id" $in0 "name" $openname "translation" "aufklappen" ) }}
+
+{{ end }}
+
+
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/orga/generator/partials/expand.html b/themes/buha/layouts/partials/orga/generator/partials/expand.html
new file mode 100644
index 00000000..6832adaa
--- /dev/null
+++ b/themes/buha/layouts/partials/orga/generator/partials/expand.html
@@ -0,0 +1,2 @@
+ {{ .id }}
+
diff --git a/themes/buha/layouts/partials/orga/generator/partials/input_line.html b/themes/buha/layouts/partials/orga/generator/partials/input_line.html
new file mode 100644
index 00000000..7b89ad76
--- /dev/null
+++ b/themes/buha/layouts/partials/orga/generator/partials/input_line.html
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/orga/generator/partials/truefalse.html b/themes/buha/layouts/partials/orga/generator/partials/truefalse.html
new file mode 100644
index 00000000..06a3205d
--- /dev/null
+++ b/themes/buha/layouts/partials/orga/generator/partials/truefalse.html
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/tools/submit.html b/themes/buha/layouts/partials/orga/generator/submit.html
similarity index 100%
rename from themes/buha/layouts/partials/tools/submit.html
rename to themes/buha/layouts/partials/orga/generator/submit.html
diff --git a/themes/buha/layouts/partials/orga/generator/tags.html b/themes/buha/layouts/partials/orga/generator/tags.html
new file mode 100644
index 00000000..524ffad2
--- /dev/null
+++ b/themes/buha/layouts/partials/orga/generator/tags.html
@@ -0,0 +1,25 @@
+{{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }}
+{{- $tags := slice -}}
+{{ range $pages }}
+ {{- if .Params.tags -}}
+ {{- $tags = $tags | append .Params.tags -}}
+ {{ end }}
+{{ end }}
+{{- $tags := $tags | uniq -}}
+{{ partial "orga/generator/partials/expand" (dict "id" "tags" "name" "opentag" "translation" "aufklappen" ) }}
+{{ .translation }}{{- if eq .mandatory "true" -}}*{{- end -}}
+
+
+
+
+
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/single/article.html b/themes/buha/layouts/partials/single/article.html
index f945b08a..3ab21ae7 100644
--- a/themes/buha/layouts/partials/single/article.html
+++ b/themes/buha/layouts/partials/single/article.html
@@ -3,27 +3,7 @@
-
- {{ if and (ne .Params.when "") (ne .Params.when nil) }}
-
+ {{ partial "structure/article_meta" (dict "context" .) }}
{{ .Params.when }}
- {{ end }}
- {{ if and (ne .Params.price "") (ne .Params.price nil) }}
- {{ if eq .Params.price "free" }}
- Der Eintritt ist frei.
- {{ else }}
- Eintritt: {{ .Params.price }}
- {{ end }}
- {{ end }}
- {{ if and (ne .Params.register "") (ne .Params.register nil) }}
- Anmeldung unter {{ .Params.register | markdownify }} erwünscht
- {{ end }}
- {{ if and (ne .Params.covid "") (ne .Params.covid nil) }}
- Es gilt die {{ .Params.covid }} Regel
- {{ end }}
- {{ if and (ne .Params.contact "") (ne .Params.contact nil) }}
- Kontakt: {{ .Params.contact }}
- {{ end }}
-
{{- if .Resources.ByType "image" -}}
@@ -35,7 +15,7 @@
{{ range .Resources.ByType "image" }}
{{- $pic := . -}}
{{- $thumb := $pic.Resize "1024x" }}
-
+
{{ end }}
{{- end }}
@@ -45,20 +25,19 @@
{{ T "tags" }}
+ +{{ end }} \ No newline at end of file diff --git a/themes/buha/layouts/partials/structure/article_meta.html b/themes/buha/layouts/partials/structure/article_meta.html new file mode 100644 index 00000000..b69356d7 --- /dev/null +++ b/themes/buha/layouts/partials/structure/article_meta.html @@ -0,0 +1,43 @@ +{{ $invis := "none" }} +{{ $covid := "true" }} +{{ $price := "true" }} +{{ $contact := "true" }} +{{ $registeremail := "true" }} +{{ if .invis }} + {{ $invis = split .invis "," }} + {{ range $invis }} + {{ if eq . "covid" }} + {{ $covid = "false" }} + {{ end }} + {{ if eq . "price" }} + {{ $price = "false" }} + {{ end }} + {{ if eq . "contact" }} + {{ $contact = "false" }} + {{ end }} + {{ if eq . "registeremail" }} + {{ $registeremail = "false" }} + {{ end }} + {{ end }} +{{ end }} +
+ {{ if and (ne .context.Params.when "") (ne .context.Params.when nil) }}
+
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/structure/empty.html b/themes/buha/layouts/partials/structure/empty.html
new file mode 100644
index 00000000..e69de29b
diff --git a/themes/buha/layouts/partials/structure/footer.html b/themes/buha/layouts/partials/structure/footer.html
index d6a63af5..c219b481 100644
--- a/themes/buha/layouts/partials/structure/footer.html
+++ b/themes/buha/layouts/partials/structure/footer.html
@@ -1,6 +1,10 @@
{{- if eq site.Params.contact true }}
{{ .context.Params.when }}
+ {{ end }}
+ {{ if and (ne .context.Params.price "") (ne .context.Params.price nil) (eq $price "true") }}
+ {{ if eq .context.Params.price "free" }}
+ Der Eintritt ist frei.
+ {{ else }}
+ Eintritt: {{ .context.Params.price }}
+ {{ end }}
+ {{ end }}
+ {{ if and (ne .context.Params.registeremail "") (ne .context.Params.registeremail nil) (eq $registeremail "true")}}
+ Anmeldung unter {{ .context.Params.registeremail | markdownify }} erwünscht
+ {{ end }}
+ {{ if and (ne .context.Params.covid "") (ne .context.Params.covid nil) (eq $covid "true") }}
+ Es gilt die {{ .context.Params.covid }} Regel
+ {{ end }}
+ {{ if and (ne .context.Params.contact "") (ne .context.Params.contact nil) (eq $contact "true") }}
+ Kontakt: {{ .context.Params.contact }}
+ {{ end }}
+
- {{- i18n "contact" | strings.FirstUpper -}}:
+ {{ $contact := "contact" }} + {{ if i18n $contact }} + {{ $contact = i18n "contact" }} + {{ end }} + {{- $contact | strings.FirstUpper -}}:
{{- partial "contact.html" -}}
{{- end -}}
@@ -8,10 +12,18 @@
+ {{ $contact := "contact" }} + {{ if i18n $contact }} + {{ $contact = i18n "contact" }} + {{ end }} + {{- $contact | strings.FirstUpper -}}:
{{- partial "contact.html" -}}
Orga
{{- if eq site.Params.archive true -}} - {{- i18n "archive" | strings.FirstUpper -}}
+ {{ $archive := "archive" }} + {{ if i18n $archive }} + {{ $archive = i18n "archive" }} + {{ end }} + {{- $archive | strings.FirstUpper -}}
{{- end -}} {{- if eq site.Params.imprint true -}} - {{- i18n "imprint" | strings.FirstUpper -}}
+ {{ $imprint := "imprint" }} + {{ if i18n $imprint }} + {{ $imprint = i18n "imprint" }} + {{ end }} + {{- $imprint | strings.FirstUpper -}}
{{- end -}}
diff --git a/themes/buha/layouts/partials/structure/header.html b/themes/buha/layouts/partials/structure/header.html
index c9c5a10f..5e978f3a 100644
--- a/themes/buha/layouts/partials/structure/header.html
+++ b/themes/buha/layouts/partials/structure/header.html
@@ -3,13 +3,17 @@
{{- if eq site.Params.archive true -}} - {{- i18n "archive" | strings.FirstUpper -}}
+ {{ $archive := "archive" }} + {{ if i18n $archive }} + {{ $archive = i18n "archive" }} + {{ end }} + {{- $archive | strings.FirstUpper -}}
{{- end -}} {{- if eq site.Params.imprint true -}} - {{- i18n "imprint" | strings.FirstUpper -}}
+ {{ $imprint := "imprint" }} + {{ if i18n $imprint }} + {{ $imprint = i18n "imprint" }} + {{ end }} + {{- $imprint | strings.FirstUpper -}}
{{- end -}}
+ {{ $visible := site.Params.mainMenu }}
{{- range site.Params.mainSections -}}
- {{ if eq . "about" }}
- {{ $name := . | T }}
- {{ if eq $name "" }}
- {{ $name = . }}
+ {{ $section := . }}
+ {{ range $visible }}
+ {{ if eq $section . }}
+ {{ $name := . | T }}
+ {{ if eq $name "" }}
+ {{ $name = . }}
+ {{ end }}
+ {{- $name | humanize -}}
{{ end }}
- {{- $name | humanize -}}
{{ end }}
{{- end -}}
diff --git a/themes/buha/layouts/partials/structure/list_article.html b/themes/buha/layouts/partials/structure/list_article.html
new file mode 100644
index 00000000..6f3ffb5a
--- /dev/null
+++ b/themes/buha/layouts/partials/structure/list_article.html
@@ -0,0 +1,37 @@
+{{ if .Title }}
+
+
+
+ {{- .Title -}}
+
+ {{ partial "structure/article_meta" (dict "context" . "invis" "covid,registeremail,contact") }}
+ {{ "all" | T }}
- {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.categories }}
+ {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.eventcategories }}
{{ $orig := $taxonomyname }}
{{ if ne (i18n $taxonomyname) "" }}
{{ $taxonomyname = i18n $taxonomyname }}
diff --git a/themes/buha/layouts/partials/tools/categories.html b/themes/buha/layouts/partials/tools/categories.html
deleted file mode 100644
index 3cb6ca05..00000000
--- a/themes/buha/layouts/partials/tools/categories.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }}
-{{- $tags := slice -}}
-{{- $categories := slice -}}
-{{ range $pages }}
- {{- if .Params.tags -}}
- {{- $tags = $tags | append .Params.tags -}}
- {{ end }}
- {{- if .Params.categories -}}
- {{- $categories = $categories | append .Params.categories -}}
- {{ end }}
-{{ end }}
-{{- $categories := $categories | uniq -}}
-{{- $tags := $tags | uniq -}}
-
-
+
+
+{{ end }}
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/structure/paginator.html b/themes/buha/layouts/partials/structure/paginator.html
new file mode 100644
index 00000000..65ad767f
--- /dev/null
+++ b/themes/buha/layouts/partials/structure/paginator.html
@@ -0,0 +1,102 @@
+{{ $paginator := .paginator}}
+
+ {{- if .Resources.ByType "image" -}}
+ {{- $pic := index (.Resources.ByType "image") 0 -}}
+ {{ $thumb := "" }}
+ {{ if eq .Content "" }}
+
+
+ {{- $thumb = $pic.Resize "1024x" }}
+ {{ else }}
+
+
+ {{- $thumb = $pic.Resize "2048x" }}
+ {{ end }}
+
+
+ {{- end }}
+
+ {{- if .Params.description -}}
+ {{- .Params.description -}}
+ {{- else -}}
+ {{- .Summary -}}
+ {{- end }}
+ {{ if .Truncated }}
+
+ {{- i18n "readmore" -}}..
+ {{ end }}
+
+
+ {{ $adjacent_links := 2 }}
+
+
+ {{ $max_links := (add (mul $adjacent_links 2) 1) }}
+
+
+ {{ $lower_limit := (add $adjacent_links 1) }}
+
+
+ {{ $upper_limit := (sub $paginator.TotalPages $adjacent_links) }}
+
+
+ {{ if gt $paginator.TotalPages 1 }}
+
+
+
+ {{ if ne $paginator.PageNumber 1 }}
+
+ ««
+
+ {{ end }}
+
+
+ {{ if $paginator.HasPrev }}
+
+ «
+
+ {{ end }}
+
+ {{ range $paginator.Pagers }}
+ {{ $page_number_flag := false }}
+
+
+
+ {{ if gt $paginator.TotalPages $max_links }}
+
+
+
+
+ {{ if le $paginator.PageNumber $lower_limit }}
+
+
+ {{ if le .PageNumber $max_links }}
+ {{ $page_number_flag = true }}
+ {{ end }}
+
+
+
+
+ {{ else if ge $paginator.PageNumber $upper_limit }}
+
+
+ {{ if gt .PageNumber (sub $paginator.TotalPages $max_links) }}
+ {{ $page_number_flag = true }}
+ {{ end }}
+
+
+
+ {{ else }}
+
+ {{ if and ( ge .PageNumber (sub $paginator.PageNumber $adjacent_links) ) ( le .PageNumber (add $paginator.PageNumber $adjacent_links) ) }}
+ {{ $page_number_flag = true }}
+ {{ end }}
+
+ {{ end }}
+
+
+
+ {{ else }}
+
+ {{ $page_number_flag = true }}
+
+ {{ end }}
+
+
+ {{ if eq $page_number_flag true }}
+
+ {{ .PageNumber }}
+
+ {{ end }}
+
+ {{ end }}
+
+
+ {{ if $paginator.HasNext }}
+
+ »
+
+ {{ end }}
+
+
+ {{ if ne $paginator.PageNumber $paginator.TotalPages }}
+
+ »»
+
+ {{ end }}
+
+ {{ end }}
+
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/structure/sidebar.html b/themes/buha/layouts/partials/structure/sidebar.html
index 47afe100..fbfdd238 100644
--- a/themes/buha/layouts/partials/structure/sidebar.html
+++ b/themes/buha/layouts/partials/structure/sidebar.html
@@ -1,16 +1,30 @@
{{ $s := .Site.Params }}
diff --git a/themes/buha/layouts/partials/structure/submenu.html b/themes/buha/layouts/partials/structure/submenu.html
index 74602973..a80ebf22 100644
--- a/themes/buha/layouts/partials/structure/submenu.html
+++ b/themes/buha/layouts/partials/structure/submenu.html
@@ -5,7 +5,7 @@
Kategorien aufklappen
-
-
-
-
-
-
-
-
-
- Tags aufklappen
-
-
-
-
-
-
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/tools/content.html b/themes/buha/layouts/partials/tools/content.html
deleted file mode 100644
index 76c352ba..00000000
--- a/themes/buha/layouts/partials/tools/content.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/tools/covid.html b/themes/buha/layouts/partials/tools/covid.html
deleted file mode 100644
index f62a28e9..00000000
--- a/themes/buha/layouts/partials/tools/covid.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/themes/buha/layouts/partials/tools/event.html b/themes/buha/layouts/partials/tools/event.html
deleted file mode 100644
index 76322278..00000000
--- a/themes/buha/layouts/partials/tools/event.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/tools/featured.html b/themes/buha/layouts/partials/tools/featured.html
deleted file mode 100644
index 86563d67..00000000
--- a/themes/buha/layouts/partials/tools/featured.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/tools/price.html b/themes/buha/layouts/partials/tools/price.html
deleted file mode 100644
index 0904145e..00000000
--- a/themes/buha/layouts/partials/tools/price.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/themes/buha/layouts/partials/tools/registermail.html b/themes/buha/layouts/partials/tools/registermail.html
deleted file mode 100644
index 31ff0798..00000000
--- a/themes/buha/layouts/partials/tools/registermail.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/themes/buha/layouts/partials/tools/title.html b/themes/buha/layouts/partials/tools/title.html
deleted file mode 100644
index db81e9c8..00000000
--- a/themes/buha/layouts/partials/tools/title.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/themes/buha/static/js/generator.js b/themes/buha/static/js/generator.js
index 49384719..acf15a65 100644
--- a/themes/buha/static/js/generator.js
+++ b/themes/buha/static/js/generator.js
@@ -35,24 +35,16 @@ function showInput(e) {
var form = document.querySelector('form[id="myform"]');
var title = form.elements['title'].value;
var content = form.elements['content'].value;
- var event = form.elements['event'].value;
- var cats = check_checkboxes('category');
- var newcat = testor(form.elements['newcat'].value.split(','));
+ var when = form.elements['when'].value;
+ var covid = form.elements['covid'].value;
+ var price = form.elements['price'].value;
+ var registeremail = form.elements['registeremail'].value;
+ var cats_event = check_checkboxes('eventcategory');
+ var cats_news = check_checkboxes('newscategory');
var tags = check_checkboxes('tags');
var newtag = testor(form.elements['newtag'].value.split(','));
var featured = check_checkboxes('featured');
- if (newcat != '""') {
- var ncats = newcat;
- }
-
- if (cats != '') {
- var ncats = cats;
- }
-
- if (cats != '' && newcat != '""') {
- var ncats = cats + "," + newcat;
- }
if (newtag != '""') {
var ntags = newtag;
@@ -77,6 +69,7 @@ function showInput(e) {
if (title && content) {
+ display.innerHTML += "";
display.innerHTML += "date: \"" + datestring + "
"; @@ -85,17 +78,32 @@ function showInput(e) { display.innerHTML += "featured: true
"; } - if (event) { - display.innerHTML += "when: \"" + event + "\"
"; + if (when) { + display.innerHTML += "when: \"" + when + "\"
"; + } + + if (cats_news != '') { + display.innerHTML += "categories: \[" + cats_news + "]
"; } - if (ncats) { - display.innerHTML += "categories: \[" + ncats + "]
"; + if (cats_event != '') { + display.innerHTML += "events: \[" + cats_event + "]
"; } + if (ntags) { display.innerHTML += "tags: \[" + ntags + "]
"; } + if (covid) { + display.innerHTML += "covid: \"" + covid + "\"
"; + } + if (price) { + display.innerHTML += "price: \"" + price + "\"
"; + } + if (registeremail) { + display.innerHTML += "registeremail: \"" + registeremail + "\"
"; + } display.innerHTML += "---
"; + display.innerHTML += "
";
if (content) {
display.innerHTML += content;
}
"; @@ -85,17 +78,32 @@ function showInput(e) { display.innerHTML += "featured: true
"; } - if (event) { - display.innerHTML += "when: \"" + event + "\"
"; + if (when) { + display.innerHTML += "when: \"" + when + "\"
"; + } + + if (cats_news != '') { + display.innerHTML += "categories: \[" + cats_news + "]
"; } - if (ncats) { - display.innerHTML += "categories: \[" + ncats + "]
"; + if (cats_event != '') { + display.innerHTML += "events: \[" + cats_event + "]
"; } + if (ntags) { display.innerHTML += "tags: \[" + ntags + "]
"; } + if (covid) { + display.innerHTML += "covid: \"" + covid + "\"
"; + } + if (price) { + display.innerHTML += "price: \"" + price + "\"
"; + } + if (registeremail) { + display.innerHTML += "registeremail: \"" + registeremail + "\"
"; + } display.innerHTML += "---
"; + display.innerHTML += "