From bf8f6317fcb9213c235d91b6f3730caf3c9ff5e2 Mon Sep 17 00:00:00 2001
From: DO1JLR <l3d@see-base.de>
Date: Tue, 24 Apr 2018 23:36:01 +0200
Subject: [PATCH] Publish new site layout \o/

Former-commit-id: ea2b44b8b3267f7d8b6de7c4faa93e0c68f4db1b [formerly ba1f20b9a5936a4914b1a399bbd957836ad018ab]
Former-commit-id: 56619a0c16627d862166c040ce6b7aeb542e29ae
---
 content/contents.lr           | 16 ++++++++++++++--
 content/equipment/contents.lr |  9 +++++++++
 content/rezepte/contents.lr   | 13 +++++++++++++
 models/material.ini           | 19 +++++++++++++++++++
 templates/layout.html         |  5 +++--
 templates/material.html       | 21 +++++++++++++++++++++
 6 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 content/equipment/contents.lr
 create mode 100644 content/rezepte/contents.lr
 create mode 100644 models/material.ini
 create mode 100644 templates/material.html

diff --git a/content/contents.lr b/content/contents.lr
index eee1eba..5b40424 100644
--- a/content/contents.lr
+++ b/content/contents.lr
@@ -10,11 +10,11 @@ as01d1: Unser Equipment
 ---
 as01l1: https://c3woc.de/equipment
 ---
-as02d1: Unser Rezept
+as02d1: Unsere Rezepte
 ---
 as02h1: Wie backen wir Waffeln
 ---
-as02l1: https://c3woc.de/rezept
+as02l1: https://c3woc.de/rezepte
 ---
 as02b1:
 
@@ -64,6 +64,18 @@ Und natürlich wird darüber auch hier berichtet. [Abonier](https://c3woc.de/fee
     <td>10.-13. Mai  2018</td>
     <td><a href="https://gulas.ch">GPN</a></td>
     <td>Karlsruhe</td>
+</tr><tr>    
+    <td>2.-3. Juni  2018</td>
+    <td><a href="https://makerfairebodensee.com">Makerfaire Bodensee</a></td>
+    <td>Friedrichshafen</td>
+</tr><tr>    
+    <td>15.-17. Juni  2018</td>
+    <td><a href="https://cosin.ch">CoSin</a></td>
+    <td>Biel/Bienne</td>
+</tr><tr> 
+   <td>9.-11. November 2018</td>
+    <td><a href="https://c3c3.de">C6 Geekend</a></td>
+    <td>Kiel</td>
 </tr><tr>
     <td>26-30 Dezember 2018</td>
     <td><a href="https://events.ccc.de/">35. Chaos Communication Congress</a></td>
diff --git a/content/equipment/contents.lr b/content/equipment/contents.lr
new file mode 100644
index 0000000..74e2b31
--- /dev/null
+++ b/content/equipment/contents.lr
@@ -0,0 +1,9 @@
+_model: material
+---
+title: Unser Equipment
+---
+body: Hier steht demnächst, was wir haben um Waffeln zu backen...
+---
+spruch: Ohne Waffeleisen kann man auch keine Waffeln backen
+---
+subtitle: Unsere Gerätschaften
diff --git a/content/rezepte/contents.lr b/content/rezepte/contents.lr
new file mode 100644
index 0000000..c100ad0
--- /dev/null
+++ b/content/rezepte/contents.lr
@@ -0,0 +1,13 @@
+_model: material
+---
+title: Rezepte
+---
+body:
+
+Und mit ein paar mehr Zutaten. Mehr dazu später.
+
+Für den Waffelnotfall gibt es aber auch [hier](http://lmgtfy.com/?s=d&iie=1&q=Waffelteig+Rezept)...
+---
+spruch: Ohne guten Teig hilft auch das beste Waffeleisen nicht weiter
+---
+subtitle: Waffelteig wird mit Liebe gemacht!
diff --git a/models/material.ini b/models/material.ini
new file mode 100644
index 0000000..83dd813
--- /dev/null
+++ b/models/material.ini
@@ -0,0 +1,19 @@
+[model]
+name = Material (material.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
diff --git a/templates/layout.html b/templates/layout.html
index c2fd8e3..71ec207 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -41,8 +41,9 @@
             <li{% if this._path == '/' %} class="active"{% endif
               %}><a href="{{ '/'|url }}">Home</a></li>{%
              for href, title in [
-              ['/blog', 'Neuigkeiten'],
-              ['/projects', 'Projekte'],
+              ['/blog',      'Neuigkeiten'],
+              ['/equipment', 'Equipment'],
+              ['/rezepte',   'Rezepte'],
               ['/impressum', 'Impressum']
             ] %}
             <li{% if this.is_child_of(href) %} class="active"{% endif
diff --git a/templates/material.html b/templates/material.html
new file mode 100644
index 0000000..5502f8a
--- /dev/null
+++ b/templates/material.html
@@ -0,0 +1,21 @@
+{% extends "layout.html" %}
+{% block title %}{{ this.title }}{% endblock %}
+{% block body %}
+                <section class="wrapper alt spotlight style2">
+                  <div class="inner">
+                    <div class="content">
+                      <h2 class="major">{{ this.title }}</h2>
+                      {{ this.spruch }}
+                    </div>
+                  </div>
+                </section>
+
+                <!-- Content -->
+                <div class="wrapper">
+                  <div class="inner">
+                    <h3 class="major">{{ this.subtitle }}</h3>
+                    {{ this.body }}
+                  </div>
+                </div>
+
+{% endblock %}