From 391b9e3e76c9f5411c59ef3e5798f77b0c7fd544 Mon Sep 17 00:00:00 2001 From: DO1JLR Date: Tue, 24 Apr 2018 23:20:20 +0200 Subject: [PATCH] Waffelupdates zum neuen Design Former-commit-id: 18652fbea6ffa1879194c376f70307c1b09528f4 [formerly 28608f5f7650ae86cc13a2ea60b9ec2023833a45] Former-commit-id: 113e10e57eb00b1ba268a560e0506042527ccd8d --- content/blog/contents.lr | 2 ++ content/blog/eh18/contents.lr | 2 ++ content/blog/first-post/contents.lr | 2 ++ content/contents.lr | 26 +++++++++++--- content/impressum/contents.lr | 35 +++++++++++-------- content/projects/contents.lr | 21 ----------- models/blog-post.ini | 6 ++++ models/page.ini | 2 +- models/site.ini | 38 +++++--------------- templates/blog.html | 8 +++++ templates/layout.html | 4 +-- templates/macros/blog.html | 54 ++++++++++++++++++++--------- templates/macros/pagination.html | 22 ++++++++---- templates/site.html | 22 +++++++++--- 14 files changed, 145 insertions(+), 99 deletions(-) delete mode 100644 content/projects/contents.lr diff --git a/content/blog/contents.lr b/content/blog/contents.lr index 41754c5..0610502 100644 --- a/content/blog/contents.lr +++ b/content/blog/contents.lr @@ -1 +1,3 @@ _model: blog +--- +title: Neuigkeiten diff --git a/content/blog/eh18/contents.lr b/content/blog/eh18/contents.lr index de39994..bba22bd 100644 --- a/content/blog/eh18/contents.lr +++ b/content/blog/eh18/contents.lr @@ -17,3 +17,5 @@ Das nächste größere Chaosevent mit Waffelunterstützung ist die Es ist etwas unglaubliches geschehen! + Das c3woc hat nun endlich eine Webseite \o/ Mehr dazu auf [git.see-base.de](https://git.see-base.de/l3d/c3woc). diff --git a/content/contents.lr b/content/contents.lr index 77e59d4..eee1eba 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -50,10 +50,28 @@ Und natürlich wird darüber auch hier berichtet. [Abonier](https://c3woc.de/fee Unsere nächsten Events === -* [Flash in den Mai](https://freifunk-stuttgart.de/2018/04/17/flash-in-den-mai-2018/) im Shackspace
-* [Hackerthon](https://uh18.diin.io/) auf dem Bodensee
-* [GPN](https://gulas.ch) in karlsruhe
-* [Congress](https://events.ccc.de) in Leipzig + + + + + + + + + + + + + + + + + + + +
DatumVeranstaltungOrt
28. April 2018Flash in den MaiStuttgart
4.-5. Mai 2018UH18 HackerthonBodensee
10.-13. Mai 2018GPNKarlsruhe
26-30 Dezember 201835. Chaos Communication CongressLeipzig
+ + --- where: Wo sind wir als nächstes diff --git a/content/impressum/contents.lr b/content/impressum/contents.lr index 2e1bd15..9df4544 100644 --- a/content/impressum/contents.lr +++ b/content/impressum/contents.lr @@ -1,26 +1,33 @@ -title: Kontakt +_model: site +--- +title: Impressum --- body: -IRC: + IRC: +----- -```` +``` Server: irc.hackint.org Channel: #waffel -```` -[irc://irc.hackint.org](ircs://irc.hackint.org:6697/#waffel) - [Web IRC](https://webirc.hackint.org/#irc://irc.hackint.org/#waffel) +``` +[irc://irc.hackint.org](ircs://irc.hackint.org/#waffel) - [Web IRC](https://webirc.hackint.org/#irc://irc.hackint.org/#waffel) - -Mail: -```` + Mail: +---- +``` waffel@c3woc.de -```` +``` -Postanschrift: - -```` + Postanschrift: +---- +``` Toolbox Bodensee e.V. c3WOC Bergheimer Str. 6-12 -88677 Markdorf -```` +88677 Markdorf +``` +--- +subtitle: Kontaktmöglichkeiten +--- +spruch: So kann man uns erreichen... diff --git a/content/projects/contents.lr b/content/projects/contents.lr deleted file mode 100644 index eb40a25..0000000 --- a/content/projects/contents.lr +++ /dev/null @@ -1,21 +0,0 @@ -title: Equipment ---- -body: - -Wir haben an strategisch wichtigen Standorten gute Waffeleisen deponiert. -Hier eine Übersicht der Waffeleisen: - - Bartscher Herz-Waffeleisen -======================== - - - - Leistung: ----- -``` - Verbrauch bis zu: 2,2 kW - Temperaturregler bis 300°C - Waffelform: Herzwaffel - Waffelgröße: Ø 210 mm, Höhe 16 mm - Gewicht: 15,5 kg -``` diff --git a/models/blog-post.ini b/models/blog-post.ini index edccc34..a35d389 100644 --- a/models/blog-post.ini +++ b/models/blog-post.ini @@ -24,6 +24,12 @@ label = Publication date type = date width = 1/4 +[fields.subtitle] +label = Untertitle +type = string +size = large + + [fields.body] label = Body type = markdown diff --git a/models/page.ini b/models/page.ini index af9fa7a..6ed67b7 100644 --- a/models/page.ini +++ b/models/page.ini @@ -1,5 +1,5 @@ [model] -name = Home +name = Home (page.html) label = {{ this.title }} [fields.title] diff --git a/models/site.ini b/models/site.ini index 31cdac9..6452dcf 100644 --- a/models/site.ini +++ b/models/site.ini @@ -1,39 +1,19 @@ [model] -name = Home +name = Seiten (site.html) label = {{ this.title }} [fields.title] label = Title type = string +[fields.spruch] +label = Spruch +type = markdown + +[fields.subtitle] +label = Subtitle +type = string + [fields.body] label = Body type = markdown - ----------------------- - -[fields.as01h1] -label = Überschrift #1 -type = string - -[fields.as01b1] -label = Body #1 -txpe = markdown - -[fields.as02h1] -label = Überschrift #2 -type = string - -[fields.as02b1] -label = Body #2 -txpe = markdown - -[fields.as03h1] -label = Überschrift #3 -type = string - -[fields.as03b1] -label = Body #3 -txpe = markdown - - diff --git a/templates/blog.html b/templates/blog.html index cb79934..fac9a92 100644 --- a/templates/blog.html +++ b/templates/blog.html @@ -3,6 +3,14 @@ {% from "macros/pagination.html" import render_pagination %} {% block title %}{{ this.title }}{% endblock %} {% block body %} +
+
+ +
+

{{ this.title }}

+ Waffeltastische Neuigkeiten. Jetzt auch als RSS +
+
{% for child in this.pagination.items %} {{ render_blog_post(child, from_index=true) }} {% endfor %} diff --git a/templates/layout.html b/templates/layout.html index 0ad06ea..c2fd8e3 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -43,7 +43,7 @@ for href, title in [ ['/blog', 'Neuigkeiten'], ['/projects', 'Projekte'], - ['/impressum', 'Kontakt'] + ['/impressum', 'Impressum'] ] %} {{ title }}{% @@ -56,7 +56,7 @@