From d5ce174908a68e71f40350daee4a7238f53c5571 Mon Sep 17 00:00:00 2001 From: teldra Date: Thu, 28 Apr 2022 17:55:16 +0200 Subject: [PATCH] many changes --- config/_default/taxonomies.toml | 1 + .../news/1998-10-12-Antifa-Cafe/index.de.md | 1 - content/news/2002-01-01-Vokü-Plan/index.de.md | 1 - content/recurrent/_index.de.md | 4 +++ content/tools/generator.de.md | 25 +++++++++++-------- themes/buha/layouts/index.html | 5 +--- themes/buha/static/js/generator.js | 5 ++++ 7 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 content/recurrent/_index.de.md 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/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/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/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 a66e36b..278b2c9 100644 --- a/content/tools/generator.de.md +++ b/content/tools/generator.de.md @@ -46,6 +46,11 @@ forms: 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 @@ -69,11 +74,13 @@ forms: 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/foundations mit dem gleichen Namen hinterlegt werden" - title: tags group: misc input_type: mc @@ -82,13 +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" - help: "es muss ein Bild in assets/foundations mit dem gleichen Namen hinterlegt werden" + input_type: date + name: "Zurueckdatieren" + help: "falls ein Artikel nachgetragen werden muss" - title: results input_type: results - title: submit diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html index 0ff400f..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,6 +6,7 @@ {{ $posts := $all | complement $featured }} {{- $paginator := .Paginate $posts -}} {{ if eq $paginator.PageNumber 1 }} +

{{ .Title }}

{{ if ne .Content "" }} {{ partial "snippets/content" (dict "content" .Content) }} {{ end }} diff --git a/themes/buha/static/js/generator.js b/themes/buha/static/js/generator.js index 9f7477a..c138386 100644 --- a/themes/buha/static/js/generator.js +++ b/themes/buha/static/js/generator.js @@ -51,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(',')); } @@ -140,6 +141,10 @@ function showInput(e) { display.innerHTML += "about: true
"; } + if (recurrent != '') { + display.innerHTML += "recurrent: true
"; + } + if (when) { display.innerHTML += "when: \"" + when + "\"
"; }