Waffelupdates zum neuen Design

Former-commit-id: 18652fbea6ffa1879194c376f70307c1b09528f4 [formerly 28608f5f7650ae86cc13a2ea60b9ec2023833a45]
Former-commit-id: 113e10e57eb00b1ba268a560e0506042527ccd8d

content/blog/contents.lr

@@ -1 +1,3 @@
 _model: blog
+---
+title: Neuigkeiten

content/blog/eh18/contents.lr

@@ -17,3 +17,5 @@ Das nächste größere Chaosevent mit Waffelunterstützung ist die <a href="http
 pub_date: 2018-04-02
 ---
 twitter_handle: c3woc
+---
+subtitle: In Würzburg wollte es keine Waffeln geben

content/blog/first-post/contents.lr

@@ -6,6 +6,8 @@ author: L3D
 ---
 body:
 
+<h3 class="major"> Es ist etwas unglaubliches geschehen!</h3>
+
 Das c3woc hat nun endlich eine Webseite \o/
 
 Mehr dazu auf [git.see-base.de](https://git.see-base.de/l3d/c3woc).

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<br/>
+
-*  [Hackerthon](https://uh18.diin.io/) auf dem Bodensee<br/>
+<table><thead><tr><th>Datum</th><th>Veranstaltung</th><th>Ort</th></tr></thead>
-*  [GPN](https://gulas.ch) in karlsruhe<br/>
+<tbody><tr>
-*  [Congress](https://events.ccc.de) in Leipzig
+    <td>28. April 2018</td>
+    <td><a href="https://freifunk-stuttgart.de/2018/04/17/flash-in-den-mai-2018/">Flash in den Mai</a></td>
+    <td>Stuttgart</td>
+</tr><tr>
+    <td>4.-5. Mai 2018</td>
+    <td><a href="https://uh18.diin.io">UH18 Hackerthon</a></td>
+    <td>Bodensee</td>
+</tr><tr>
+    <td>10.-13. Mai  2018</td>
+    <td><a href="https://gulas.ch">GPN</a></td>
+    <td>Karlsruhe</td>
+</tr><tr>
+    <td>26-30 Dezember 2018</td>
+    <td><a href="https://events.ccc.de/">35. Chaos Communication Congress</a></td>
+    <td>Leipzig</td>
+</tr><tr>
+</tr></tfoot></table>
+										
+
 
 ---
 where: Wo sind wir als nächstes

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
-````
+```
+---
+subtitle: Kontaktmöglichkeiten
+---
+spruch: So kann man uns erreichen...

content/projects/contents.lr

@@ -1,21 +0,0 @@
-title: Equipment
----
-body:
-
-Wir haben an strategisch wichtigen Standorten gute Waffeleisen deponiert.
-Hier eine Übersicht der Waffeleisen:
-
- Bartscher Herz-Waffeleisen
-========================
-<span class="image main">
-<img src="/images/toolbox-kiste.jpg" />
-</span>
- 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
-```

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

models/page.ini

@@ -1,5 +1,5 @@
 [model]
-name = Home
+name = Home (page.html)
 label = {{ this.title }}
 
 [fields.title]

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
-
-

templates/blog.html

@@ -3,6 +3,14 @@
 {% from "macros/pagination.html" import render_pagination %}
 {% block title %}{{ this.title }}{% endblock %}
 {% block body %}
+<section id="one" class="wrapper alt spotlight style2">
+  <div class="inner">
+    <a class="image"><img src="{{ '/images/c3woc/c3woc.svg'|url }}" alt="" /></a>
+      <div class="content">
+        <h2 class="major">{{ this.title }}</h2>
+        <a>Waffeltastische Neuigkeiten. Jetzt auch als </a><a href="{{ '/feed.xml'|url }}">RSS  <span class="icon fa-rss"></span></a>
+  </div>
+</section> 
   {% for child in this.pagination.items %}
     {{ render_blog_post(child, from_index=true) }}
   {% endfor %}

templates/layout.html

@@ -43,7 +43,7 @@
              for href, title in [
               ['/blog', 'Neuigkeiten'],
               ['/projects', 'Projekte'],
-              ['/impressum', 'Kontakt']
+              ['/impressum', 'Impressum']
             ] %}
             <li{% if this.is_child_of(href) %} class="active"{% endif
                 %}><a href="{{ href|url }}">{{ title }}</a></li>{%
@@ -56,7 +56,7 @@
       <!-- Banner -->
       <section id="banner">
         <div class="inner">
-          <div class="logo"><span class="icon fa-heart"></span></div>
+          <div class="logo"><a href="{{ '/'|url }}"><span class="icon fa-heart"></span></a></div>
             <h2>C3WOC</h2>
             <p>C3 Waffel Operation Center  <span class="icon fa-heart"></span>  Wir machen Waffeln</p>
           </div>

templates/macros/blog.html

@@ -1,20 +1,40 @@
 {% macro render_blog_post(post, from_index=false) %}
-  <div class="blog-post">
+{% if from_index == True %}
+            <!-- Wrapper -->
+            <!-- <section id="wrapper"> -->
+                <header>
+                  <div class="inner">
                     {% if from_index %}
-    <h2><a href="{{ post|url }}#Cyber">{{ post.title }}</a></h2>
+                      <h2><a href="{{ post|url }}">{{ post.title }}</a></h2>
                     {% else %}
                      <h2>{{ post.title }}</h2>
                     {% endif %}
-  <p class="meta">
+                    <p class="meta">Written by {%
-    written by
+                      if post.twitter_handle %}<a href="https://chaos.social/@{{ post.twitter_handle }}">{{ post.author or post.twitter_handle }}</a>{%
-    {% if post.twitter_handle %}
+                      else %}{{ post.author }}{%
-      <a href="https://twitter.com/{{ post.twitter_handle
+                      endif %} on {{ post.pub_date }}</p>
-        }}">{{ post.author or post.twitter_handle }}</a>
-    {% else %}
-      {{ post.author }}
-    {% endif %}
-    on {{ post.pub_date }}
-  </p>
-  {{ post.body }}
                   </div>
+                </header>
+{% else %}
+<section class="wrapper alt spotlight style2">
+  <div class="inner">
+      <div class="content">
+        <h2 class="major">{{ post.title }}</h2>
+    <p class="meta">Written by {%
+                      if post.twitter_handle %}<a href="https://chaos.social/@{{ post.twitter_handle }}">{{ post.author or post.twitter_handle }}</a>{%
+                      else %}{{ post.author }}{%
+                      endif %} on {{ post.pub_date }}</p>
+  </div>
+</section> 
+{% endif %} 
+              <!-- Content -->
+			  <div class="wrapper">
+			    <div class="inner">
+                  <h2 class="major">{{ post.subtitle }}</h2>
+{{ post.body }}
+                </div>
+              </div>
+            <!-- </section>-->
+	
+
 {% endmacro %}

templates/macros/pagination.html

@@ -1,15 +1,25 @@
 {% macro render_pagination(pagination) %}
-  <div class="pagination">
+<section id="two" class="wrapper alt spotlight style2">
+  <div class="inner">
+    <style>
+      #two li {
+        list-style: none;
+      }
+    </style>
+    <ul class="pagination">
     {% if pagination.has_prev %}
-      <a href="{{ pagination.prev|url }}">&laquo; Previous</a>
+      <li><a href="{{ pagination.prev|url }}" class="button small disabled">Zur&uuml;ck</a></li>
     {% else %}
-      <span class="disabled">&laquo; Previous</span>
+      <li><span class="button small disabled">Zur&uuml;ck</span></li>
     {% endif %}
-    | {{ pagination.page }} |
+      <li><a href="#" class="page active">{{ pagination.page }}</a></li>
     {% if pagination.has_next %}
-      <a href="{{ pagination.next|url }}">Next &raquo;</a>
+      <li><a href="{{ pagination.next|url }}" class="button small">Weiter</a></li>
     {% else %}
-      <span class="disabled">Next &raquo;</span>
+      <li><span class="button small disabled">Weiter</span></li>
     {% endif %}
+    </ul>
   </div>
+</section>
+
 {% endmacro %}

templates/site.html

@@ -1,9 +1,21 @@
 {% extends "layout.html" %}
 {% block title %}{{ this.title }}{% endblock %}
 {% block body %}
-<div class="page">
+                <section class="wrapper alt spotlight style2">
-  <h2>{{ this.title }}</h2>
+                  <div class="inner">
-  <span class="image main"><img src="images/njom.jpg" alt="" /></span> 
+                    <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>
+                </div>
+
 {% endblock %}