diff --git a/assets/foundations/aktionmensch.png b/assets/foundations/aktionmensch.png deleted file mode 100644 index efd32c1..0000000 Binary files a/assets/foundations/aktionmensch.png and /dev/null differ diff --git a/assets/foundations/brentrup.jpg b/assets/foundations/brentrup.jpg deleted file mode 100644 index 5fc5204..0000000 Binary files a/assets/foundations/brentrup.jpg and /dev/null differ diff --git a/assets/images/foundations/jusos.jpg b/assets/images/foundations/jusos.jpg new file mode 100644 index 0000000..2c358ca Binary files /dev/null and b/assets/images/foundations/jusos.jpg differ diff --git a/config/_default/outputs.toml b/config/_default/outputs.toml index f2d39fa..e07b0a9 100644 --- a/config/_default/outputs.toml +++ b/config/_default/outputs.toml @@ -2,4 +2,4 @@ section = ["HTML", "RSS"] page = ["HTML"] taxonomy = ["HTML", "RSS"] - term = ["HTML", "RSS"] + term = ["HTML"] diff --git a/config/_default/params.toml b/config/_default/params.toml index d0cfcde..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" @@ -42,4 +42,4 @@ placeholder = "/images/no_article_pic.png" nonprofit = true [foundations] - brentrup = "https://heise.de" + jusos = "https://jusos.de/" 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/config/_default/taxonomies.toml b/config/_default/taxonomies.toml index 420008d..787af30 100644 --- a/config/_default/taxonomies.toml +++ b/config/_default/taxonomies.toml @@ -4,3 +4,4 @@ events = 'events' about = 'about' featured = 'featured' foundations = 'foundations' +recurrent = 'recurrent' diff --git a/content/archive/_index.de.md b/content/archive.de.md similarity index 100% rename from content/archive/_index.de.md rename to content/archive.de.md diff --git a/content/contact/_index.de.md b/content/contact.de.md similarity index 100% rename from content/contact/_index.de.md rename to content/contact.de.md diff --git a/content/contact/kontakt_anfahrt.png b/content/contact/kontakt_anfahrt.png deleted file mode 100644 index b8584d0..0000000 Binary files a/content/contact/kontakt_anfahrt.png and /dev/null differ diff --git a/content/imprint/_index.de.md b/content/imprint.de.md similarity index 100% rename from content/imprint/_index.de.md rename to content/imprint.de.md diff --git a/content/links.de.md b/content/links.de.md new file mode 100644 index 0000000..4e9bebc --- /dev/null +++ b/content/links.de.md @@ -0,0 +1,9 @@ +--- +title: "Links" +layout: "links" +--- +http://list-celle.over-blog.com/ +Gruppe LiST: Land in Sicht - Transition Celle + +https://rheinmetallentwaffnen.noblogs.org/ +Aktionstage, Camp & Demonstration “Rheinmetall entwaffnen” in Unterlüß diff --git a/content/links/_index.de.md b/content/links/_index.de.md deleted file mode 100644 index 23bcfd8..0000000 --- a/content/links/_index.de.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: "Links" -layout: "links" ---- diff --git a/content/links/list.md b/content/links/list.md deleted file mode 100644 index 4fbb592..0000000 --- a/content/links/list.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: "Gruppe LiST: Land in Sicht - Transition Celle" -link: "http://list-celle.over-blog.com/" ---- diff --git a/content/links/rheinmetall.md b/content/links/rheinmetall.md deleted file mode 100644 index 06658ee..0000000 --- a/content/links/rheinmetall.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: "Aktionstage, Camp & Demonstration “Rheinmetall entwaffnen” in Unterlüß" -link: "https://rheinmetallentwaffnen.noblogs.org/" ---- diff --git a/content/media/nabu_vdj2018_broschuere.pdf b/content/media/nabu_vdj2018_broschuere.pdf new file mode 100644 index 0000000..0e2c342 Binary files /dev/null and b/content/media/nabu_vdj2018_broschuere.pdf differ 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-12-Antifa-Cafe/index.de.md b/content/news/1998-10-12-Antifa-Cafe/index.de.md index 44112ec..fddbcbf 100644 --- a/content/news/1998-10-12-Antifa-Cafe/index.de.md +++ b/content/news/1998-10-12-Antifa-Cafe/index.de.md @@ -2,6 +2,5 @@ title: "Antifa-Cafe" lastmod: 1998-10-12T14:00:00+02:00 when: "12.10.1998, 20 Uhr" -events: ["Regelmäßig"] tags: ["Antifa","Informationsveranstaltungen","Antifachismus","Arbeitskreis Antifaschismus Magdeburg","Antifaschistische Aktion","Vortrag","Diskussionsveranstaltung"] --- 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-01-01-Vokü-Plan/index.de.md b/content/news/2002-01-01-Vokü-Plan/index.de.md index 2c457be..3f45cf9 100644 --- a/content/news/2002-01-01-Vokü-Plan/index.de.md +++ b/content/news/2002-01-01-Vokü-Plan/index.de.md @@ -2,7 +2,6 @@ title: "Der Volxkuechenplan 2002" lastmod: 2001-12-28T14:00:00+02:00 when: "Jeden Sonntag 30.12.2001 - 28.04.2002" -events: ["Regelmäßig"] tags: ["Volxküche","Volksküche","Spicegirls","Fairbrutzelt","Flitze Feuerzahn","Cocina Fina","jeden Sonntag","Volxkuechenplan","Essen","Kochen"] price: "free" --- 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-02-20-Informationsveranstaltung-PKK-Verbot/index.de.md b/content/news/2002-02-20-Informationsveranstaltung-PKK-Verbot/index.de.md index f89752a..7016380 100644 --- a/content/news/2002-02-20-Informationsveranstaltung-PKK-Verbot/index.de.md +++ b/content/news/2002-02-20-Informationsveranstaltung-PKK-Verbot/index.de.md @@ -4,5 +4,5 @@ lastmod: 2002-02-20T14:00:00+02:00 when: "20.02.,2002, 19:00 Uhr" tags: ["Antifa","Informationsveranstaltungen","PKK Verbot","Antifa Celle","Kurdistan","Kurdistan Solidarität Uelzen","AZADI","Repression","Kazim E","Manfred Kanther","Bundesinnenministerium","OLG Celle","Oberlandesgericht","Kurden","Türkei"] price: "free" -contact: "kurd-soli-uelzen@gmx.net" +contact_mail: "kurd-soli-uelzen@gmx.net" --- 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-04-Konzert-Katzengejammer/index.de.md b/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md index 4a77eff..fb98f22 100644 --- a/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md +++ b/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md @@ -4,7 +4,7 @@ date: "2022-04-04T23:16:00+02:00" when: "Montag, 04.04.2022, 23.23 Uhr" events: ["Konzerte"] price: "free" -foundations: ["brentrup","aktionmensch"] +foundations: ["rote_hilfe"] covid: "Keine Masken mehr!" --- diff --git a/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md b/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md index 0d47da2..3fa4cf4 100644 --- a/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md +++ b/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md @@ -2,7 +2,7 @@ title: "Gedenken an Arkan" date: 2022-04-05T09:31:00+02:00 when: "Donnerstag, 07.04.2022, 18:00 Uhr, Celler Triftpark" -contact: "ArkanGedenken@riseup.net" +contact_mail: "ArkanGedenken@riseup.net" featured: true --- 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/news/foodsaving/index.de.md b/content/news/foodsaving/index.de.md index 03841d5..7837d5b 100644 --- a/content/news/foodsaving/index.de.md +++ b/content/news/foodsaving/index.de.md @@ -5,7 +5,8 @@ lastmod: "2021-04-06T19:00:00+02:00" about: true when: "Jeden Mittwoch 18:30-19:00Uhr & Samstags 15:00-15:30Uhr" events: ["Regelmäßig"] -contact: "foodsavingcelle@riseup.net" +contact_mail: "foodsavingcelle@riseup.net" +insta: "foodsavingcelle" featured: true --- Die **kostenfreie** Verteilung von gespendeten und geretteten **Lebensmitteln** geht auch nach der Wiedereröffnung der Tafel weiter. @@ -53,7 +54,4 @@ Natürlich wollen die Aktiven sich und alle anderen schützen: Deswegen wird das „Sagt Menschen Bescheid, die wenig Geld haben und sich über Obst und Gemüse freuen würden!“ ruft Nina auf, „Engagiert euch, bietet eure Unterstützung an, wenn ihr könnt, sprecht Nachbar_innen und Wohnungslose an, damit sie vom Projekt erfahren. Denn Menschen zu helfen und Unterstützung zu erfahren ist wertvoller für die Gesellschaft als Geld und Banken. Nicht nur während Corona.“ -Kontakt: -Mail: foodsavingcelle@riseup.net -Instagram: www.instagram.com/foodsavingcelle Nebenan.de: https://nebenan.de/places/organizations/6021 diff --git a/content/newsletter/_index.de.md b/content/newsletter.de.md similarity index 100% rename from content/newsletter/_index.de.md rename to content/newsletter.de.md diff --git a/content/recurrent/_index.de.md b/content/recurrent/_index.de.md new file mode 100644 index 0000000..7bc2eb4 --- /dev/null +++ b/content/recurrent/_index.de.md @@ -0,0 +1,4 @@ +--- +title: "Regelmässig" +layout: "article_list" +--- diff --git a/content/tools/generator.de.md b/content/tools/generator.de.md index b5a693e..837ada6 100644 --- a/content/tools/generator.de.md +++ b/content/tools/generator.de.md @@ -36,11 +36,21 @@ 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: recurrent + group: events + input_type: checkbox + name: "Regelmässig" + help: "Ist es ein regelässiger Termin" - title: events group: events input_type: mc @@ -58,17 +68,19 @@ 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 name: "Über uns" help: "Falls der Artikel eine Gruppe des Hauses beschreibt" - - title: lastmod + - title: foundations group: misc - input_type: date - name: "Zurueckdatieren" - help: "falls ein Artikel nachgetragen werden muss" + input_type: mc + name: "Stiftungen" + expanded: false + new: "Neue Stiftung" + help: "es muss ein Bild in assets/images/foundations mit dem gleichen Namen hinterlegt werden" - title: tags group: misc input_type: mc @@ -77,12 +89,11 @@ forms: new: "Neue Tags" help: "hier gerne austoben, von der Anzahl her" placeholder: "Untitled Band,Tour,Band die Begleitet" - - title: foundations + - title: lastmod group: misc - input_type: mc - name: "Stiftungen" - expanded: false - new: "Neue Stiftung" + input_type: date + name: "Zurueckdatieren" + help: "falls ein Artikel nachgetragen werden muss" - title: results input_type: results - title: submit diff --git a/themes/buha/assets/css/article.css b/themes/buha/assets/css/article.css index cff3f6f..8386603 100644 --- a/themes/buha/assets/css/article.css +++ b/themes/buha/assets/css/article.css @@ -1,7 +1,6 @@ article { flex-grow: 1; flex-shrink: 0; - background-color: var(--background); padding: 1rem; margin-bottom: 2rem; border-radius: 10px; 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/_default/list.html b/themes/buha/layouts/_default/list.html index 73b1da1..fd74850 100644 --- a/themes/buha/layouts/_default/list.html +++ b/themes/buha/layouts/_default/list.html @@ -8,7 +8,7 @@ {{ $partial := "" }} {{ $title := "" }} {{ $pic := "true" }} - {{ $pre := "l1" }} + {{ $pre := "layout" }} {{- $paginator := "" -}} {{ $part := .Layout }} {{ $partial_before := "" }} @@ -24,13 +24,11 @@ {{ else if eq .Section "featured" }} {{- $pages = where $pages ".Params.featured" "=" true -}} {{ end }} - {{ else if or (eq .Layout "contact") (eq .Layout "imprint") }} - {{ $partial_before = "snippets/contact" }} {{ else }} {{ if eq .Kind "term" }} {{- $pages = .Data.Pages -}} {{ $part = "article_list" }} - {{ else if or (eq .Kind "taxonomy") }} + {{ else if eq .Kind "taxonomy" }} {{- $pages = .Data.Terms.Alphabetical -}} {{ $part = "tags_n_categories" }} {{ end }} diff --git a/themes/buha/layouts/_default/rss.xml b/themes/buha/layouts/_default/rss.xml index 43190f9..73e89ae 100644 --- a/themes/buha/layouts/_default/rss.xml +++ b/themes/buha/layouts/_default/rss.xml @@ -1,6 +1,6 @@ {{- $pages := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections -}} {{- $title := lower .Title -}} -{{- if eq $title "events" -}} +{{- if eq .Section "events" -}} {{- $pages = where $pages ".Params.when" "ne" nil -}} {{- end -}} {{- $limit := .Site.Config.Services.RSS.Limit -}} @@ -64,7 +64,7 @@ {{- end -}} {{- $img := index (.Resources.ByType "image") 0 -}} {{- with $img -}} - {{- $img := .Resize "640x" -}} + {{- $img := .Resize "500x" -}} {{- $c = printf "%s" $c $img.Permalink $img.Width $img.Height -}} {{- end -}} {{- printf "" $c | safeHTML -}} diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html index 5da31df..fc2c695 100644 --- a/themes/buha/layouts/_default/single.html +++ b/themes/buha/layouts/_default/single.html @@ -11,6 +11,11 @@ {{ $partial = "layout/generator" }} {{ else if eq .Params.tool "nottranslated" }} {{ $partial = "layout/nottranslated" }} + {{ else if or (eq .Layout "contact") (eq .Layout "imprint") }} + {{ $partial_before = "snippets/contact" }} + {{ $partial = printf "layout/%s" .Layout }} + {{ else if eq .Layout "archive" }} + {{ $partial = printf "layout/%s" .Layout }} {{ end }}
{{ partial $partial (dict "context" . "pic" $pic "content" .Content "partial_before" $partial_before "type" "article") }} diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html index 04761c3..26027a1 100644 --- a/themes/buha/layouts/index.html +++ b/themes/buha/layouts/index.html @@ -1,7 +1,3 @@ -{{ define "title" }} -

{{ .Title }}

-{{ end }} - {{ define "content" }} {{- $all := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections }} {{ $days := int (mul (mul (int .Site.Params.featured_expire) 7) -1) }} @@ -10,13 +6,14 @@ {{ $posts := $all | complement $featured }} {{- $paginator := .Paginate $posts -}} {{ if eq $paginator.PageNumber 1 }} +

{{ .Title }}

{{ if ne .Content "" }} {{ partial "snippets/content" (dict "content" .Content) }} {{ end }} - {{ partial "l1/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }} + {{ partial "layout/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }} {{ end }} {{ if gt (len $posts) 1 }} - {{ partial "l1/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News" "type" "list") }} + {{ partial "layout/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News" "type" "list") }} {{ partial "snippets/paginator" (dict "paginator" $paginator) }} {{ end }} {{ end }} diff --git a/themes/buha/layouts/partials/l1/generic_single.html b/themes/buha/layouts/partials/l1/generic_single.html deleted file mode 100644 index c3c31b5..0000000 --- a/themes/buha/layouts/partials/l1/generic_single.html +++ /dev/null @@ -1,34 +0,0 @@ -{{ $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" -}} - {{- $img = index (.context.Resources.ByType "image") 0 -}} - {{- $thumb = $img.Resize "1024x" }} - {{ if .content }} - {{- $thumb = $img.Resize "500x" }} - {{ end }} -{{ 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 deleted file mode 100644 index 3132060..0000000 --- a/themes/buha/layouts/partials/l1/links.html +++ /dev/null @@ -1,12 +0,0 @@ -{{ 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/tags_n_categories.html b/themes/buha/layouts/partials/l1/tags_n_categories.html deleted file mode 100644 index 86f60a9..0000000 --- a/themes/buha/layouts/partials/l1/tags_n_categories.html +++ /dev/null @@ -1,6 +0,0 @@ -
-{{ $type := .type }} -{{ range .pages }} - {{ .Page.Title }} {{ if eq $type "taxonomy"}}{{ .Count }}{{ end }} -{{ end }} -
diff --git a/themes/buha/layouts/partials/l1/archive.html b/themes/buha/layouts/partials/layout/archive.html similarity index 100% rename from themes/buha/layouts/partials/l1/archive.html rename to themes/buha/layouts/partials/layout/archive.html diff --git a/themes/buha/layouts/partials/layout/article.html b/themes/buha/layouts/partials/layout/article.html index 826f3ac..5eb0ee3 100644 --- a/themes/buha/layouts/partials/layout/article.html +++ b/themes/buha/layouts/partials/layout/article.html @@ -1,5 +1,4 @@ -{{ $metas := dict "when" .context.Params.when "price" .context.Params.price "contact" .context.Params.contact "covid" -.context.Params.covid }} +{{ $metas := dict "when" .context.Params.when "price" .context.Params.price "contact_mail" .context.Params.contact_mail "covid" .context.Params.covid "insta" .context.Params.insta }} {{ if eq .type "list" }} {{ $metas = dict "when" .context.Params.when "price" .context.Params.price }} {{ end }} @@ -16,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 }}
@@ -55,12 +72,16 @@ {{ $url = index site.Params.foundations $l }} {{ end }} - - {{- $res_im := resources.GetMatch (printf "/foundations/%s*" $l ) -}} + + {{- $res_im := resources.GetMatch (printf "/images/foundations/%s*" $l ) -}} {{ if $res_im }}
{{ if $url }}{{ end }} {{ if $url }}{{ end }}
+ {{ else }} +
+ assets/images/foundations/{{- $l -}} .* missing +
{{ end }} {{ end }} diff --git a/themes/buha/layouts/partials/l1/article_list.html b/themes/buha/layouts/partials/layout/article_list.html similarity index 100% rename from themes/buha/layouts/partials/l1/article_list.html rename to themes/buha/layouts/partials/layout/article_list.html diff --git a/themes/buha/layouts/partials/l1/contact.html b/themes/buha/layouts/partials/layout/contact.html similarity index 100% rename from themes/buha/layouts/partials/l1/contact.html rename to themes/buha/layouts/partials/layout/contact.html diff --git a/themes/buha/layouts/partials/layout/content_single.html b/themes/buha/layouts/partials/layout/content_single.html deleted file mode 100644 index d32809c..0000000 --- a/themes/buha/layouts/partials/layout/content_single.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/layout/generator/form.html b/themes/buha/layouts/partials/layout/generator/form.html index 4e7c8dc..db7ffd6 100644 --- a/themes/buha/layouts/partials/layout/generator/form.html +++ b/themes/buha/layouts/partials/layout/generator/form.html @@ -60,16 +60,10 @@ {{ end }} {{ end }} {{ else if eq .title "foundations" }} - {{ range resources.Match "/foundations/*" }} + {{ range resources.Match "/images/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 }} @@ -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/l1/media.html b/themes/buha/layouts/partials/layout/media.html similarity index 63% rename from themes/buha/layouts/partials/l1/media.html rename to themes/buha/layouts/partials/layout/media.html index e339049..6f036e0 100644 --- a/themes/buha/layouts/partials/l1/media.html +++ b/themes/buha/layouts/partials/layout/media.html @@ -4,7 +4,7 @@ {{ end }}
-{{ range .context.Resources.ByType "image" }} - +{{ range .context.Resources }} +
🗀 {{ . }}
{{ end }}
diff --git a/themes/buha/layouts/partials/l1/section_list.html b/themes/buha/layouts/partials/layout/section_list.html similarity index 100% rename from themes/buha/layouts/partials/l1/section_list.html rename to themes/buha/layouts/partials/layout/section_list.html diff --git a/themes/buha/layouts/partials/layout/tags_n_categories.html b/themes/buha/layouts/partials/layout/tags_n_categories.html new file mode 100644 index 0000000..fffd49c --- /dev/null +++ b/themes/buha/layouts/partials/layout/tags_n_categories.html @@ -0,0 +1,6 @@ + diff --git a/themes/buha/layouts/partials/snippets/article_metadata.html b/themes/buha/layouts/partials/snippets/article_metadata.html index aad40bb..33ace3b 100644 --- a/themes/buha/layouts/partials/snippets/article_metadata.html +++ b/themes/buha/layouts/partials/snippets/article_metadata.html @@ -1,4 +1,4 @@ -{{ if or .when .price .contact .covid }} +{{ if or .when .price .contact_mail .covid .insta }}
{{ if .when }} @@ -13,8 +13,11 @@
{{ if i18n "entry" }}{{ i18n "entry" }}{{ else }}{{ "Entry" }}{{ end }}: {{ .price }}
{{ end }} {{ end }} - {{ if .contact }} -
{{ if i18n "contact" }}{{ i18n "contact" }}{{ else }}{{ "Contact" }}{{ end }} {{ .contact | markdownify }} {{ if i18n "or" }}{{ i18n "or" }}{{ else }}{{ "or" }}{{ end }} {{ site.Params.imprintdata.tel }}
+ {{ if .insta }} +
Instagram: https://instagram.com/{{- .insta -}}
+ {{ end }} + {{ if .contact_mail }} +
{{ if i18n "mail" }}{{ i18n "mail" }}{{ else }}{{ "mail" }}{{ end }} {{ .contact_mail | markdownify }}
{{ end }} {{ if .covid }}
Covid: {{ .covid }}
diff --git a/themes/buha/layouts/partials/snippets/single_chooser.html b/themes/buha/layouts/partials/snippets/single_chooser.html deleted file mode 100644 index 8f2ba07..0000000 --- a/themes/buha/layouts/partials/snippets/single_chooser.html +++ /dev/null @@ -1,12 +0,0 @@ - {{ partial "debug" (dict "context" .context "caller" "single_chooser.html")}} - {{ $partial_before := "" }} - {{ $partial := "layout/single/article" }} - {{ $pic := .pic }} - {{ if eq .context.Params.tool "generator" }} - {{ $partial = "layout/single/generator" }} - {{ else if eq .context.Params.tool "nottranslated" }} - {{ $partial = "layout/single/nottranslated" }} - {{ end }} -
- {{ partial $partial (dict "context" .context "pic" $pic "content" .context.Content "partial_before" $partial_before) }} -
diff --git a/themes/buha/static/js/generator.js b/themes/buha/static/js/generator.js index 9502022..c138386 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'); @@ -50,6 +51,7 @@ function showInput(e) { if (form.elements['newtags']) { var newtags = testor(form.elements['newtags'].value.split(',')); } var featured = check_checkboxes('featured'); var about = check_checkboxes('about'); + var recurrent = check_checkboxes('recurrent'); var foundations = check_checkboxes('foundations'); if (form.elements['newfoundations']) { var newfoundations = testor(form.elements['newfoundations'].value.split(',')); } @@ -120,14 +122,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 + "\"
"; @@ -144,6 +141,10 @@ function showInput(e) { display.innerHTML += "about: true
"; } + if (recurrent != '') { + display.innerHTML += "recurrent: true
"; + } + if (when) { display.innerHTML += "when: \"" + when + "\"
"; } @@ -170,8 +171,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) {