diff --git a/config.toml b/config.toml index f7badae9..143200a5 100644 --- a/config.toml +++ b/config.toml @@ -28,8 +28,16 @@ featured = 'featured' # keywords for seo keywords = "buntes haus celle, buntes haus, bunteshaus, celle, buntes haus e.V., www.bunteshaus.de, celle, punk, reggae, ska, konzerte, partys, soziokultur, soziokulturelles zentrum celle, elektro, electroe, jugendzentrum, celle, dum n bass, konzert, musik, politik, kultur, alternativ, cd kaserne celle, cd kaserne, plenum, celle, antifa, antira, anti akw, anti atom celle, veranstaltungen, infoladen, proberaum celle, archiv für neue soziale bewegungen in celle, hartz 4 IV beratung celle, skaten, graffiti, sprayen, kunst, fahrradwerkstatt, deka dance celle, dekadance, Revista, probably the friendliest Place on Earth" + debug = false + #do you want a contact page? contact = true + + #do you want a newsletter page? + newsletter = true + + #do you want a links page? + links = true #do you want an archive? archive = true diff --git a/content/links/rheinmetall.md b/content/links/rheinmetall.md new file mode 100644 index 00000000..998d94bf --- /dev/null +++ b/content/links/rheinmetall.md @@ -0,0 +1,5 @@ +--- +title: "Aktionstage, Camp & Demonstration “Rheinmetall entwaffnen” in Unterlüß" +link: "https://rheinmetallentwaffnen.noblogs.org/" +--- +Sind freunde, also kriegen die nen Link! diff --git a/content/newsletter/_index.de.md b/content/newsletter/_index.de.md new file mode 100644 index 00000000..f33cad99 --- /dev/null +++ b/content/newsletter/_index.de.md @@ -0,0 +1,10 @@ +--- +title: "Newsletter" +--- +Wenn ihr in unseren Newsletter aufgenommen werden wollt, schickt uns eine email! + +Wenn ihr den Newsletter nicht mehr erhalten wollt, schreibt uns ebenfalls eine mail. + +**info@bunteshaus.de** + +Um den Newsletter verschicken zu können müssen wir eure Email-Adresse speichern. Wir speichern die Adresse ausschließlich für den Versand des Newsletters. Wir geben die Adressen nicht an Dritte weiter. Mit der Anmeldung zu unserem Newsletter erklärst du dich mit der Speicherung einverstanden. Du kannst den Newsletter jeder Zeit abbestellen. Eine kurze formlose Mail an uns reicht aus. Wir löschen in diesem Fall deine Adresse unverzüglich. diff --git a/themes/buha/i18n/de.toml b/themes/buha/i18n/de.toml index a4e00ed8..a9575f81 100644 --- a/themes/buha/i18n/de.toml +++ b/themes/buha/i18n/de.toml @@ -90,3 +90,6 @@ other = "Der Eintritt ist kostenlos." [register] other = "Anmeldung" + +[executive] +other = "Vorstand" diff --git a/themes/buha/i18n/en.toml b/themes/buha/i18n/en.toml deleted file mode 100644 index c4681500..00000000 --- a/themes/buha/i18n/en.toml +++ /dev/null @@ -1,221 +0,0 @@ -[home] -other = "home" - -[executive] -other = "Executive Board" - -[and] -other = "and" - -[events] -other = "Events" - -[event] -other = "Event" - -[archive] -other = "Archive" - -[imprint] -other = "Imprint" - -[no] -other = "No" - -[yes] -other = "Yes" - -[recurrent] -other = "Recurrent" - -[contact] -other = "Contact" - -[mail] -other = "Email" - -[tel] -other = "Phone" - -[news] -other = "News" - -[from] -other = "from" - -[at] -other = "at" - -[everyfemale] -other = "every" - -[everymale] -other = "every" - -[everysubject] -other = "every" - -[since] -other = "since" - -[days] -other = "Days" - -[calendar] -other = "Calender" - -[MO] -other = "Monday" -[TU] -other = "Tuesday" -[WE] -other = "Wednesday" -[TH] -other = "Thursday" -[FR] -other = "Friday" -[SA] -other = "Saturday" -[SU] -other = "Sunday" - -[date] -other = "Date" - -[time] -other = "Time" - -[categories] -other = "Categories" - -[tags] -other = "Tags" - -[repeat] -other = "Repeat" - -[end] -other = "End" - -[after] -other = "after" - -[never] -other = "never" - -[duration] -other = "Duration" - -[minutes] -other = "Minutes" - -[daily] -other = "Daily" - -[DAILY] -other = "Day" - -[weekly] -other = "Weekly" - -[WEEKLY] -other = "Week" - -[monthly] -other = "Monthly" - -[MONTHLY] -other = "Month" - -[yearly] -other = "Yearly" - -[YEARLY] -other = "Year" - -[title] -other = "Title" - -[description] -other = "Description" - -[location] -other = "LOcation" - -[subject] -other = "Subject" - -[new] -other = "New" - -[generate] -other = "Generate" - -[first] -other = "First" - -[second] -other = "Second" - -[third] -other = "Third" - -[fourth] -other = "Fourth" - -[last] -other = "Last" - -[Jan] -other = "January" - -[Feb] -other = "February" - -[Mar] -other = "March" - -[Apr] -other = "April" - -[May] -other = "May" - -[Jun] -other = "Juni" - -[Jul] -other = "Juli" - -[Aug] -other = "August" - -[Sep] -other = "September" - -[Oct] -other = "October" - -[Nov] -other = "November" - -[Dec] -other = "December" - -[price] -other = "Price" - -[nothing] -other = "free" - -[entry] -other = "Entry" - -[free] -other = "Entry for free." - -[upcoming] -other = "Upcoming Events" - -[readmore] -other = "Read more" \ No newline at end of file diff --git a/themes/buha/i18n/ku.toml b/themes/buha/i18n/ku.toml deleted file mode 100644 index b3af97c9..00000000 --- a/themes/buha/i18n/ku.toml +++ /dev/null @@ -1,43 +0,0 @@ -[home] -other = "Xane" - -[events] -other = "Bûyerên" - -[recurrent] -other = "Hevdîtinên birêkûpêk" - -[from] -other = "Ji" - -[at] -other = "Roja" - -[every] -other = "her" - -[days] -other = "Rojan" - -[calendar] -other = "salname" - -[Mon] -other = "Duşem" -[Tue] -other = "Sêşem" -[Wed] -other = "Çarşem" -[Thu] -other = "Pêncşem" -[Fr] -other = "Fridayemî" -[Sat] -other = "Şemî" -[Sun] -other = "Yekşem" - -[categories] -other = "Kategorî" -[news] -other = "Nûçe" \ No newline at end of file diff --git a/themes/buha/layouts/_default/imprint.html b/themes/buha/layouts/_default/imprint.html index a5cfc28f..dadd8f60 100644 --- a/themes/buha/layouts/_default/imprint.html +++ b/themes/buha/layouts/_default/imprint.html @@ -21,8 +21,8 @@ {{ end }}
-{{ partial "contentlayouts/contact" }} -{{ i18n "executive" }}: {{ site.Params.imprintdata.executive }} +{{ partial "structure/contact" }} +{{ if i18n "executive" }}{{ i18n "executive" }}{{ else }}{{ "Executive" }}{{ end }}: {{ site.Params.imprintdata.executive }} {{ .Content }}
{{ end }} diff --git a/themes/buha/layouts/_default/links.html b/themes/buha/layouts/_default/links.html new file mode 100644 index 00000000..289a9b6c --- /dev/null +++ b/themes/buha/layouts/_default/links.html @@ -0,0 +1,31 @@ +{{- 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/newsletter.html b/themes/buha/layouts/_default/newsletter.html new file mode 100644 index 00000000..f5793fae --- /dev/null +++ b/themes/buha/layouts/_default/newsletter.html @@ -0,0 +1,24 @@ +{{- 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" -}} + {{ if ne .Content "" }} +
+ {{ .Content }} +
+ {{ end }} +{{- end -}} + +{{ define "sidebar" }} + {{- partial "contentlayouts/menu.html" . }} +{{ end }} diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html index 313a63c3..e4eb2157 100644 --- a/themes/buha/layouts/index.html +++ b/themes/buha/layouts/index.html @@ -5,8 +5,9 @@ {{ end }} {{ define "main" }} - {{ partial "debug" (dict "context" . "filename" "index.html") }} - + {{ partial "rrule" . }} + + {{ $s := .Site.Params }} {{- $posts := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" $s.searchSections }} {{- $featured := where (where $posts ".Params.featured" "=" true) "Type" "in" $s.searchSections }} diff --git a/themes/buha/layouts/partials/contentlayouts/article.html b/themes/buha/layouts/partials/contentlayouts/article.html index 492d682c..fa665f24 100644 --- a/themes/buha/layouts/partials/contentlayouts/article.html +++ b/themes/buha/layouts/partials/contentlayouts/article.html @@ -78,7 +78,7 @@ {{ end }} {{- if or .context.Content .context.Summary -}}
- {{ if eq .type "contact" }}{{ partial "contentlayouts/contact" }}{{ end }} + {{ 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") }}
{{- i18n "readmore" -}}..
diff --git a/themes/buha/layouts/partials/contentlayouts/contact.html b/themes/buha/layouts/partials/contentlayouts/contact.html deleted file mode 100644 index 3cc48063..00000000 --- a/themes/buha/layouts/partials/contentlayouts/contact.html +++ /dev/null @@ -1,7 +0,0 @@ -{{ site.Title }}
-{{ site.Params.imprintdata.street }}
-{{ if i18n "pobox" }}{{ i18n "pobox" }}{{ else }}{{ "pobox" }}{{ end }} {{ site.Params.imprintdata.pobox }}
-{{ site.Params.imprintdata.city }}
-
-{{ 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/contentlayouts/menu.html b/themes/buha/layouts/partials/contentlayouts/menu.html index 683485a4..9b1a5573 100644 --- a/themes/buha/layouts/partials/contentlayouts/menu.html +++ b/themes/buha/layouts/partials/contentlayouts/menu.html @@ -1,5 +1,5 @@ {{ if gt .Site.Taxonomies.categories 0 }} -

  • {{ T "news" }}

    • +

  • {{ 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 }} -

  • {{ T "events" }}

    • +

  • {{ 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/rrule.html b/themes/buha/layouts/partials/rrule.html new file mode 100644 index 00000000..a026f304 --- /dev/null +++ b/themes/buha/layouts/partials/rrule.html @@ -0,0 +1,13 @@ + {{ $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/structure/contact.html b/themes/buha/layouts/partials/structure/contact.html new file mode 100644 index 00000000..d8b273c9 --- /dev/null +++ b/themes/buha/layouts/partials/structure/contact.html @@ -0,0 +1,6 @@ +{{ 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/structure/footer.html b/themes/buha/layouts/partials/structure/footer.html index 49993363..a5d4ab60 100644 --- a/themes/buha/layouts/partials/structure/footer.html +++ b/themes/buha/layouts/partials/structure/footer.html @@ -5,7 +5,7 @@ {{ $contact = i18n "contact" }} {{ end }} {{- $contact | strings.FirstUpper -}}:

    - {{- partial "contentlayouts/contact" -}} + {{- partial "structure/contact" -}}
    {{- end -}} @@ -17,6 +17,13 @@ {{ 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