6 files changed, 45 insertions, 16 deletions

diff --git a/source/_nav_mitmachen.html.erb b/source/_nav_mitmachen.html.erb
new file mode 100644
index 0000000..14fe44d
--- /dev/null
+++ b/source/_nav_mitmachen.html.erb
@@ -0,0 +1,10 @@
+<div id="sub-nav">
+  <ul class="nav nav-pills">
+    <li>
+      <%= link_to "Gruppen", "/mitmachen/gruppen.html" %>
+    </li>
+    <li>
+      <%= link_to "Regelmässige Treffen", "/mitmachen/treffen.html" %>
+    </li>
+  </ul>
+</div>
diff --git a/source/_navigation.html.erb b/source/_navigation.html.erb
index c7b0d88..e4bf1ba 100644
--- a/source/_navigation.html.erb
+++ b/source/_navigation.html.erb
@@ -1,15 +1,16 @@
 <div id="nav">
-  <ul class="nav nav-pills nav-stacked">
+  <ul class="nav nav-pills">
     <li class="active">
-      <a href="/">Home</a>
+      <%= link_to "Home", "/" %>
     </li>
     <li>
-      <a href="/ueber.html">Das sublab</a>
+      <%= link_to "Aktuelles", "/aktuelles/index.html" %>
     </li>
     <li>
-      <a href="/news.html">News</a>
+      <% link_to "Infrastruktur", "/infrastruktur/index.html" %>
     </li>
     <li>
+
       <a href="/termine.html">Termine</a>
     </li>
     <li>
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 5ba23c1..b0cba82 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -28,27 +28,22 @@
           <div class="col-md-3">
             <h1>sublab</h1>
           </div>
-          <div id="moods" class="col-md-9">
-            <%= yield_content :moods %>
-          </div>
         </div>
       </div>
 
       <div class="row">
-
-        <div class="col-md-3">
           <%= partial "navigation" %>
-          <hr />
-          <%= partial "banner" %>
-          <hr />
-          <%= partial "status" %>
-        </div>
+      </div>
 
+      <% if (section = current_page.data.section) %>
+          <%= partial "nav_#{section}" %>
+      <% end %>
+
+      <div class="row">
         <div class="col-md-9">
           <%= yield %>
         </div>
-
-      </div> <!-- end main row -->
+      </div>
 
     </div> <!-- end container -->
   </body>
diff --git a/source/mitmachen/gruppen.html.erb b/source/mitmachen/gruppen.html.erb
new file mode 100644
index 0000000..429e531
--- /dev/null
+++ b/source/mitmachen/gruppen.html.erb
@@ -0,0 +1,8 @@
+---
+section: "mitmachen"
+---
+
+<div>
+  <p><%= lorem.paragraphs(2) %></p>
+  <p><%= lorem.paragraphs(2) %></p>
+</div>
diff --git a/source/mitmachen/index.html.erb b/source/mitmachen/index.html.erb
new file mode 100644
index 0000000..84f48b2
--- /dev/null
+++ b/source/mitmachen/index.html.erb
@@ -0,0 +1,7 @@
+---
+section: "mitmachen"
+---
+
+<div>
+  <%= lorem.paragraphs(2) %>
+</div>
diff --git a/source/mitmachen/treffen.html.erb b/source/mitmachen/treffen.html.erb
new file mode 100644
index 0000000..5371dc4
--- /dev/null
+++ b/source/mitmachen/treffen.html.erb
@@ -0,0 +1,8 @@
+---
+section: "mitmachen"
+---
+
+<div>
+  <p><%= lorem.paragraphs(2) %></p>
+  <img src="<%= lorem.image("200x200") %>">
+</div>