From 5e0429b27669d645f77f41b01d3948256129eafe Mon Sep 17 00:00:00 2001
From: Stefan Schlott <stefan@ploing.de>
Date: Fri, 23 Aug 2013 08:50:26 +0200
Subject: [PATCH] Sidebar for inclusion; main page layout

---
 Rules                  |  5 ++++-
 content/index.html     | 20 ++++++++++++--------
 content/sidebar.html   |  7 +++++++
 layouts/page_body.html |  6 +++++-
 4 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 content/sidebar.html

diff --git a/Rules b/Rules
index e906872e..35cdb318 100644
--- a/Rules
+++ b/Rules
@@ -32,7 +32,10 @@ compile '*' do
     if item_name.start_with?("_")
       nil
     else
-      layout 'default'
+      if item[:style]!='none'
+        #layout 'default'
+        layout item[:style] || 'default'
+      end
     end
   end
 end
diff --git a/content/index.html b/content/index.html
index 25a00568..251e1d8f 100644
--- a/content/index.html
+++ b/content/index.html
@@ -3,9 +3,9 @@ title: Titel
 kind: empty
 -----
 <div class="row">
-  <div class="span8">
+  <div class="span6">
     <article itemscope itemtype="http://schema.org/EducationEvent">
-      <h1>Nächster Vortrag</h1>
+      <h1><a href="#">Nächster Vortrag</a></h1>
       <p>
         <em>Termin:</em>
         <span itemprop="startDate" content="2013-02-14T19:30">Donnerstag, 14. Februar 2013, 19:30 Uhr</span>
@@ -32,8 +32,10 @@ kind: empty
         <a href="#">Aushang (PDF)</a>
       </p>
     </article>
+  </div>
+  <div class="span6">
     <article itemscope itemtype="http://schema.org/SocialEvent">
-      <h1>Nächster <span itemprop="name">CCCS Stammtisch</span></h1>
+      <h1><a href="#">Nächster <span itemprop="name">CCCS Stammtisch</span></a></h1>
       <p>
         <em>Termin:</em>
         <span itemprop="startDate" content="2013-02-05T18:00">Dienstag, 5. Februar 2013, ab 18:00 Uhr</span>
@@ -44,11 +46,11 @@ kind: empty
           <span itemprop="name">Zadu-Bar</span>
         </span>
       </p>
+      <p>
+        <a itemprop="url" href="#">Unsere Stammtische</a>
+      </p>
     </article>
   </div>
-  <div class="span4">
-    <h1>Kalender</h1>
-  </div>
 </div>
 <div class="row">
   <div class="span8">
@@ -73,6 +75,8 @@ kind: empty
             aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo
             dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus
             est Lorem ipsum dolor sit amet.
+            <p>
+            <a href="#">Zum Artikel</a>
           </article>
         </div>
       </div>
@@ -81,7 +85,6 @@ kind: empty
           <article>
             <h1><a itemprop="blogPost" href="#">Ein Projektartikel</a></h1>
             <h2>Ein Untertitel...</h2>
-            <p>
             Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse
             molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero
             eros et accumsan et iusto odio dignissim qui blandit praesent luptatum
@@ -89,13 +92,14 @@ kind: empty
             dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh
             euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
             <h3>Unter-Unter-Überschrift</h3>
-            <p>
             Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper
             suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem
             vel eum iriure dolor in hendrerit in vulputate velit esse molestie
             consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et
             accumsan et iusto odio dignissim qui blandit praesent luptatum zzril
             delenit augue duis dolore te feugait nulla facilisi.
+            <p>
+            <a href="#">Zum Artikel</a>
           </article>
         </div>
       </div>
diff --git a/content/sidebar.html b/content/sidebar.html
new file mode 100644
index 00000000..27ae238c
--- /dev/null
+++ b/content/sidebar.html
@@ -0,0 +1,7 @@
+-----
+style: none
+-----
+<h1>Kalender</h1>
+
+<h1>Letzte Tweets</h1>
+
diff --git a/layouts/page_body.html b/layouts/page_body.html
index b5f1cad9..532b92dd 100644
--- a/layouts/page_body.html
+++ b/layouts/page_body.html
@@ -1,5 +1,9 @@
       <div class="row">
-        <div class="span12">
+        <div class="span8">
           <%= yield %>
         </div>
+        <div class="span4">
+          <div id="sidebar"></div>
+          <script type="text/javascript">$("#sidebar").load("/sidebar/index.html");</script>
+        </div>
       </div>