diff --git a/config/_default/params.toml b/config/_default/params.toml index 7a57a66..479a525 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -26,7 +26,7 @@ mainMenu = ['about'] searchSections = ['news'] # how long stays a featrued article on frontpage as featured (in weeks) -featured_expire = "1" +featured_expire = "28" placeholder = "/images/no_article_pic.png" diff --git a/config/_default/permalinks.toml b/config/_default/permalinks.toml index ff75402..fdde6eb 100644 --- a/config/_default/permalinks.toml +++ b/config/_default/permalinks.toml @@ -1 +1 @@ -news = '/:year/:month/:day/:title/' +news = '/news/:year/:month/:day/:title/' diff --git a/content/news/1997-08-30-Party-Traumfabrik/index.de.md b/content/news/1997-08-30-Party-Traumfabrik/index.de.md index ec80274..988aae7 100644 --- a/content/news/1997-08-30-Party-Traumfabrik/index.de.md +++ b/content/news/1997-08-30-Party-Traumfabrik/index.de.md @@ -6,4 +6,3 @@ events: ["Party"] tags: ["Holzi","Christoph U","Walter B 38","Kicki","E R K","Traumfabrik"] price: "8DM" --- -![](1) diff --git a/content/news/1997-09-04-Antifa-Cafe/index.de.md b/content/news/1997-09-04-Antifa-Cafe/index.de.md index 265fab1..6815fbb 100644 --- a/content/news/1997-09-04-Antifa-Cafe/index.de.md +++ b/content/news/1997-09-04-Antifa-Cafe/index.de.md @@ -4,4 +4,3 @@ lastmod: 1997-09-04T14:00:00+02:00 when: "04.09.1997, 19Uhr" tags: ["Antifa","Cafe"] --- -![](1) diff --git a/content/news/1997-10-27-Frauenblicke-Tupamaros/index.de.md b/content/news/1997-10-27-Frauenblicke-Tupamaros/index.de.md index 2c050eb..51dfbb8 100644 --- a/content/news/1997-10-27-Frauenblicke-Tupamaros/index.de.md +++ b/content/news/1997-10-27-Frauenblicke-Tupamaros/index.de.md @@ -4,4 +4,3 @@ lastmod: 1997-10-25T14:00:00+02:00 when: "27.10.1997, 20Uhr" events: ["Kino"] --- -![](1) diff --git a/content/news/1997-11-29-Theater-Mazzoni-Mörderischer-Freund/index.de.md b/content/news/1997-11-29-Theater-Mazzoni-Mörderischer-Freund/index.de.md index 9aa7258..96d222d 100644 --- a/content/news/1997-11-29-Theater-Mazzoni-Mörderischer-Freund/index.de.md +++ b/content/news/1997-11-29-Theater-Mazzoni-Mörderischer-Freund/index.de.md @@ -5,4 +5,3 @@ when: "Premiere: 29.11.1997, 20Uhr" events: ["Theater"] tags: ["Theater Mazzoni"] --- -![](1) diff --git a/content/news/1998-10-28-Verbrechen-der-Wehrmacht-1941-1944/index.de.md b/content/news/1998-10-28-Verbrechen-der-Wehrmacht-1941-1944/index.de.md index 7a5fe75..48e68a9 100644 --- a/content/news/1998-10-28-Verbrechen-der-Wehrmacht-1941-1944/index.de.md +++ b/content/news/1998-10-28-Verbrechen-der-Wehrmacht-1941-1944/index.de.md @@ -4,4 +4,3 @@ lastmod: 1998-10-28T14:00:00+02:00 when: "28.10.1998 - 05.12.1998" tags: ["Antifa","Antifachismus","CD-Kaserne","Informationsveranstaltungen","Kino","Kino 8 1/2","Soli","Verbrechen der Wehrmacht","Begleitveranstaltung","Hannover","Begleitveranstaltung zur Ausstellung","Hannover","Urbanus Rhegius Haus","AntiFa Info-Café","Archiv für neue soziale Bewegungen","Gertrud Schröter","Soli-Party","Theater Gegendruck","Historisches Seminar Universität Hannover","Universität Hannover","Hamburger Institut für Sozialforschung","Begleitprogramm","Ludwig Baumann","Vortrag","Kai-Uwe Geissler","FU Berlin","Bergen-Belsen","Andrej Turkovskij"] --- -![Flyer Begleitveranstaltung Frontseite](1), ![Flyer Begleitveranstaltung Programm](2), ![Flyer Begleitveranstaltung letzte Seite](3) diff --git a/content/news/2002-02-10-Ausstellung-Neofaschismus/indes.de.md b/content/news/2002-02-10-Ausstellung-Neofaschismus/index.de.md similarity index 100% rename from content/news/2002-02-10-Ausstellung-Neofaschismus/indes.de.md rename to content/news/2002-02-10-Ausstellung-Neofaschismus/index.de.md diff --git a/content/news/2002-02-11-VVN-BdA-Neofaschismus-Austellung/index.de.md b/content/news/2002-02-11-VVN-BdA-Neofaschismus-Austellung/index.de.md index 31b10a4..eae4f97 100644 --- a/content/news/2002-02-11-VVN-BdA-Neofaschismus-Austellung/index.de.md +++ b/content/news/2002-02-11-VVN-BdA-Neofaschismus-Austellung/index.de.md @@ -5,4 +5,3 @@ when: "11.02.2002" tags: ["Antifaschismus","Antirassismus","Ausstellung","Buntes Haus","Informationsveranstaltungen","VVN","BdA","Neofaschismus","Neonazis","Neonazis in Celle",VVN BdA","Bund der Antifaschistinnen und Antifaschisten","Vereinigung der Verfolgten des Naziregimes"] price: "free" --- -![Bild zur Ausstellung Neofaschismus im Bunten Haus](1), ![Bild eines Ausstellungsplakats über Neofaschismus in Celle und Umgebung](2) diff --git a/content/news/2002-09-01-Film-Nackt-unter-Woelfen/index.de.md b/content/news/2002-09-01-Film-Nackt-unter-Woelfen/index.de.md index 3f9f65e..87b0ef3 100644 --- a/content/news/2002-09-01-Film-Nackt-unter-Woelfen/index.de.md +++ b/content/news/2002-09-01-Film-Nackt-unter-Woelfen/index.de.md @@ -5,4 +5,3 @@ when: "01.09.2002, 19:00 Uhr" events: ["Kino"] tags: ["Antifaschismus","Antikrieg","Antirassismus","Film","Nackt unter Wölfen","Regier","Frank Beyer","Buchenwald","Widerstand","Nationalsozialismus","DEFA"] --- -![Flyer Front](1), ![Flyer Rückseite](2) diff --git a/content/news/2022-04-10-Matrix-Space/index.de.md b/content/news/2022-04-10-Matrix-Space/index.de.md index 9c737bc..7561708 100644 --- a/content/news/2022-04-10-Matrix-Space/index.de.md +++ b/content/news/2022-04-10-Matrix-Space/index.de.md @@ -3,6 +3,7 @@ title: "Matrix Space" date: "2022-04-11T20:37:00+02:00" about: true categories: ["Buha"] +featured: true --- Wir betreiben einen Space im Matrix Netzwerk. diff --git a/content/tools/generator.de.md b/content/tools/generator.de.md index b5a693e..a66e36b 100644 --- a/content/tools/generator.de.md +++ b/content/tools/generator.de.md @@ -36,11 +36,16 @@ forms: input_type: text name: "Preis" placeholder: "3€ oder \"free\" oder \"donation\"" - - title: contact + - title: contact_mail group: events input_type: text - name: "Kontakt" + name: "Kontaktmail" placeholder: "info@bunteshaus.de" + - title: insta + group: events + input_type: text + name: "Instagram" + placeholder: "foodsavingcelle" - title: events group: events input_type: mc @@ -58,7 +63,7 @@ forms: group: misc input_type: checkbox name: "Featured" - help: "Damit erscheint der Artikel für 2 Wochen auf der Startseite" + help: "Damit erscheint der Artikel für 4 Wochen auf der Startseite" - title: about group: misc input_type: checkbox @@ -83,6 +88,7 @@ forms: name: "Stiftungen" expanded: false new: "Neue Stiftung" + help: "es muss ein Bild in assets/foundations mit dem gleichen Namen hinterlegt werden" - title: results input_type: results - title: submit diff --git a/assets/images/no_article_pic.png b/themes/buha/assets/images/no_article_pic.png similarity index 100% rename from assets/images/no_article_pic.png rename to themes/buha/assets/images/no_article_pic.png diff --git a/themes/buha/layouts/partials/layout/article.html b/themes/buha/layouts/partials/layout/article.html index 181b57d..b2b9d6c 100644 --- a/themes/buha/layouts/partials/layout/article.html +++ b/themes/buha/layouts/partials/layout/article.html @@ -15,29 +15,47 @@ {{ partial "snippets/article_metadata" $metas }}
-{{- if and (.context.Resources.ByType "image") (eq .pic "true") -}} - {{ $resize := "500x" }} - {{- $img := index (.context.Resources.ByType "image") 0 -}} - {{- $thumb := index (.context.Resources.ByType "image") 0 -}} - {{ if ne .context.Content "" }} - {{- $resize = "2048x" }} - {{ else if eq .type "list" }} - {{- $resize = "500x" }} - {{ end }} - {{- $thumb = $img.Resize $resize }} -
- {{ if and (ne .type "list") (.context.Resources.ByType "image") }}{{ end }} - - {{ if and (ne .type "list") (.context.Resources.ByType "image") }}{{ end }} -
-{{ end }} - {{- if or .context.Content .context.Summary -}} -
- {{ 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 -}}..
+ {{- if .context.Content -}} + {{- if and (.context.Resources.ByType "image") (eq .pic "true") -}} + + {{ $resize := "500x" }} + {{- $img := index (.context.Resources.ByType "image") 0 -}} + {{- $thumb := index (.context.Resources.ByType "image") 0 -}} + {{ if ne .context.Content "" }} + {{- $resize = "2048x" }} + {{ else if eq .type "list" }} + {{- $resize = "300x" }} {{ end }} -
+ {{- $thumb = $img.Resize $resize }} +
+ {{ if and (ne .type "list") (.context.Resources.ByType "image") }}{{ end }} + + {{ if and (ne .type "list") (.context.Resources.ByType "image") }}{{ end }} +
+ {{ end }} + {{- if or .context.Content .context.Summary -}} +
+ {{ 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 }} + {{ else }} + {{ $type := .type }} + {{ if eq $type "article" }} +
+ {{ range .context.Resources.ByType "image" }} + {{ $img := . }} + {{ $thumb := $img.Resize "500x" }} + + {{- end }} +
+ {{ else }} + {{- $img := index (.context.Resources.ByType "image") 0 -}} + {{ $thumb := $img.Resize "300x" }} + + {{ end }} {{- end }}
diff --git a/themes/buha/layouts/partials/layout/generator/form.html b/themes/buha/layouts/partials/layout/generator/form.html index 4e7c8dc..01e232e 100644 --- a/themes/buha/layouts/partials/layout/generator/form.html +++ b/themes/buha/layouts/partials/layout/generator/form.html @@ -64,12 +64,6 @@ {{ $n := path.Base (strings.TrimSuffix (path.Ext .Name) .Name) }} {{- $finale = $finale | append $n -}} {{ end }} - {{ range $pages }} - {{- with .Params.foundations -}} - {{- $finale = $finale | append . -}} - {{ end }} - {{ end }} - {{ else }} {{ range $pages }} {{ range .Param $in0 }} @@ -104,70 +98,6 @@ - {{ else if eq .input_type "rb" }} - {{ $in0 := .title }} - - {{- $finale := slice -}} - {{ $pages := where site.RegularPages "Type" "in" site.Params.searchSections }} - {{ if eq .title "tags" }} - {{ range $pages }} - {{- with .Params.tags -}} - {{- $finale = $finale | append . -}} - {{ end }} - {{ end }} - {{ else if eq .title "foundations" }} - {{ range resources.Match "/foundations/*" }} - {{ $n := path.Base (strings.TrimSuffix (path.Ext .Name) .Name) }} - {{- $finale = $finale | append $n -}} - {{ end }} - {{ range $pages }} - {{- with .Params.foundations -}} - {{- $finale = $finale | append . -}} - {{ end }} - {{ end }} - - {{ else }} - {{ range $pages }} - {{ range .Param $in0 }} - {{- $finale = $finale | append . -}} - {{ end }} - {{ end }} - {{ end }} - {{- $finale = $finale | uniq -}} - -
-
- {{ .name }} - {{ if ne .expanded true }}{{ partial "layout/generator/expand" (dict "name" (printf "%scat" $in0)) }}{{ end }}{{- if .required -}}{{- " *" -}}{{- end -}} -
- - - -
- - -
-
- {{ range sort $finale }} - - {{ end }} -
- {{ if .new }} - - - {{ end }} -
-
- -
- - - - - - - - {{ else }} {{ if eq .title "name" }}
diff --git a/themes/buha/layouts/partials/layout/tags_n_categories.html b/themes/buha/layouts/partials/layout/tags_n_categories.html index 86f60a9..fffd49c 100644 --- a/themes/buha/layouts/partials/layout/tags_n_categories.html +++ b/themes/buha/layouts/partials/layout/tags_n_categories.html @@ -1,6 +1,6 @@
{{ $type := .type }} {{ range .pages }} - {{ .Page.Title }} {{ if eq $type "taxonomy"}}{{ .Count }}{{ end }} + {{ .Page.Title }} {{ if eq $type "tags"}}{{ .Count }}{{ end }} {{ end }}
diff --git a/themes/buha/static/js/generator.js b/themes/buha/static/js/generator.js index 9502022..9f7477a 100644 --- a/themes/buha/static/js/generator.js +++ b/themes/buha/static/js/generator.js @@ -41,7 +41,8 @@ function showInput(e) { var when = form.elements['when'].value; var covid = form.elements['covid'].value; var price = form.elements['price'].value; - var contact = form.elements['contact'].value; + var contact_mail = form.elements['contact_mail'].value; + var insta = form.elements['insta'].value; var events = check_checkboxes('events'); if (form.elements['newevents']) { var newevents = testor(form.elements['newevents'].value.split(',')); } var categories = check_checkboxes('categories'); @@ -120,14 +121,9 @@ function showInput(e) { if (!title) { display.innerHTML += "Title is missing..
" } + - if (!content) { - display.innerHTML += "Content is missing..
" - } - - - - if (title && content) { + if (title) { display.innerHTML += "---
"; display.innerHTML += "title: \"" + title + "\"
"; @@ -170,8 +166,11 @@ function showInput(e) { display.innerHTML += "price: \"" + price + "\"
"; } - if (contact) { - display.innerHTML += "contact: \"" + contact + "\"
"; + if (contact_mail) { + display.innerHTML += "contact_mail: \"" + contact_mail + "\"
"; + } + if (insta) { + display.innerHTML += "insta: \"" + insta + "\"
"; } display.innerHTML += "---
"; if (content) {