From fd4884c47cbfd10564a86692c80b03fc09762b91 Mon Sep 17 00:00:00 2001
From: Stefan Schlott <stefan@ploing.de>
Date: Mon, 9 Sep 2013 19:27:08 +0200
Subject: [PATCH] Versuch: Kalenderposition

---
 content/index.html | 68 ++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/content/index.html b/content/index.html
index 1e798b2c..af3757fb 100644
--- a/content/index.html
+++ b/content/index.html
@@ -7,7 +7,7 @@ feed:
   title: 'CCCS - Neueste Artikel'
 -----
 <div class="row">
-  <div class="span12">
+  <div class="span8">
     <img src="/img/logo-klein.png" alt="CCCS-Logo" class="pull-right" />
     <h1>Herzlich willkommen beim CCC Stuttgart</h1>
     <p>
@@ -27,38 +27,6 @@ feed:
     Artikel und Notizen. Wenn Du diese automatisch beziehen möchtest, kannst
     Du sie <a href="/atom.xml">per Atom-Feed</a> abonnieren.
   </div>
-</div>
-<div class="row">
-  <div class="span8">
-    <% upcomingEvents = get_events().select { |e| e[:startdate].to_datetime > DateTime.now }
-    if (upcomingEvents.size>0)
-      upcomingEvents.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
-    %>
-    <div class="well well-large">
-      <article itemscope itemtype="http://schema.org/EducationEvent">
-        <h1><a href="<%= upcomingEvents[0].path() %>">Nächster Vortrag</a></h1>
-        <%= render 'event_header', :item => upcomingEvents[0], :heading => false, :link => false %>
-        <p>
-          <a itemprop="url" href="<%= upcomingEvents[0].path() %>">Weitere Informationen</a>
-        </p>
-      </article>
-    </div>
-    <% end %>
-    <% upcomingRegularsTable = get_regulars_tables().select { |e| e[:startdate].to_datetime > DateTime.now }
-    if (upcomingRegularsTable.size>0)
-      upcomingRegularsTable.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
-    %>
-    <div class="well well-large">
-      <article itemscope itemtype="http://schema.org/SocialEvent">
-        <h1><a href="#">Nächster <span itemprop="name">CCCS Stammtisch</span></a></h1>
-        <%= render 'event_header', :item => upcomingRegularsTable[0], :heading => false, :link => false %>
-        <p>
-          <a itemprop="url" href="/about/">Unsere Stammtische</a>
-        </p>
-      </article>
-    </div>
-    <% end %>
-  </div>
   <div class="span4">
     <h1>Kalender</h1>
     <p>
@@ -70,6 +38,40 @@ feed:
     <% end %>
   </div>
 </div>
+<div class="row">
+  <% upcomingEvents = get_events().select { |e| e[:startdate].to_datetime > DateTime.now }
+  if (upcomingEvents.size>0)
+    upcomingEvents.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
+  %>
+  <div class="span6">
+    <div class="well well-large">
+      <article itemscope itemtype="http://schema.org/EducationEvent">
+        <h1><a href="<%= upcomingEvents[0].path() %>">Nächster Vortrag</a></h1>
+        <%= render 'event_header', :item => upcomingEvents[0], :heading => false, :link => false %>
+        <p>
+          <a itemprop="url" href="<%= upcomingEvents[0].path() %>">Weitere Informationen</a>
+        </p>
+      </article>
+    </div>
+  </div>
+  <% end %>
+  <% upcomingRegularsTable = get_regulars_tables().select { |e| e[:startdate].to_datetime > DateTime.now }
+  if (upcomingRegularsTable.size>0)
+    upcomingRegularsTable.sort! { |a,b| a[:startdate].to_datetime <=> b[:startdate].to_datetime }
+  %>
+  <div class="span6">
+    <div class="well well-large">
+      <article itemscope itemtype="http://schema.org/SocialEvent">
+        <h1><a href="#">Nächster <span itemprop="name">CCCS Stammtisch</span></a></h1>
+        <%= render 'event_header', :item => upcomingRegularsTable[0], :heading => false, :link => false %>
+        <p>
+          <a itemprop="url" href="/about/">Unsere Stammtische</a>
+        </p>
+      </article>
+    </div>
+  </div>
+  <% end %>
+</div>
 <div class="row">
   <div class="span8">
     <section itemscope itemtype="http://schema.org/Blog">