15 files changed, 34 insertions, 57 deletions
diff --git a/source/_navigation.html.haml b/source/_navigation.html.haml
index 2a48201..972f9dc 100644
--- a/source/_navigation.html.haml
+++ b/source/_navigation.html.haml
@@ -1,28 +1,5 @@
-- @navigation = {
-- ["Aktuelles", "/aktuelles/index.html"] => [
-- ["Blog", "/aktuelles/blog.html"],
-- ["Kalender", "/aktuelles/kalender.html"]
-- ],
-- ["Entdecken", "/entdecken/index.html"] => [
-- ["Die Räume", "/entdecken/raeume.html"],
-- ["Der Verein", "/entdecken/verein.html"],
-- ["Das Wiki", "/entdecken/wiki.html"],
-- ["Mailinglisten", "/entdecken/mailinglisten.html"]
-- ],
-- ["Mitmachen!", "/mitmachen/index.html"] => [
-- ["Projekte", "/mitmachen/projekte.html"],
-- ["Regelmässige Treffen", "/mitmachen/regelmaessige_termine.html"]
-- ],
-- ["Unterstützen", "/unterstuetzen/index.html"] => [
-- ["Mitglied werden", "/unterstuetzen/mitglied_werden.html"],
-- ["Förderer", "/unterstuetzen/foerderer.html"],
-- ["Sponsoren", "/unterstuetzen/sponsoren.html"]
-- ],
-- ["Kontakt", "/kontakt/index.html"] => [
-- ["Wegbeschreibung", "/kontakt/lage.html"],
-- ["Kontaktmöglichkeiten", "/kontakt/kontakt.html"]
-- ]
-- }
+- @navigation = navigation_items
+
 .navbar-header
   %button.navbar-toggle{"data-target" => "#nav-big", "data-toggle" => "collapse", :type => "button"}
     %span.sr-only Toggle navigation
@@ -33,10 +10,10 @@
   %ul
     - @navigation.each do |key, value|
       %li.dropdown
-        <a data-toggle="dropdown" class="dropdown-toggle" href=#{key.last}>
-        \#{key.first}
-        - if value
-          %b.caret
+        %a{"data-toggle" => "dropdown", :class => "dropdown-toggle", :href => key.last}
+          = key.first
+          - if value
+            %b.caret
         - if value
           %ul.dropdown-menu
             - value.each do |name, url|
diff --git a/source/aktuelles/blog.html.haml b/source/aktuelles/blog.html.haml
index 8be9786..fbbffcd 100644
--- a/source/aktuelles/blog.html.haml
+++ b/source/aktuelles/blog.html.haml
@@ -1,8 +1,8 @@
-\---
+---
 pageable: true
 per_page: 10
 section: "aktuelles"
-\---
+---
 - if paginate && num_pages > 1
   %ul.pager
     %li{:class => "previous #{prev_page ? "" : "disabled"}"}= link_to 'Vorherige Seite', prev_page
diff --git a/source/aktuelles/index.html.haml b/source/aktuelles/index.html.haml
index 48de292..59eccd8 100644
--- a/source/aktuelles/index.html.haml
+++ b/source/aktuelles/index.html.haml
@@ -1,6 +1,6 @@
-\---
+---
 section: "aktuelles"
-\---
+---
 %div
   %h3 Demnächst im sublab
   %p BattleMeshV7 - 12. bis 18. Mai 2014
diff --git a/source/aktuelles/kalender.html.haml b/source/aktuelles/kalender.html.haml
index 6552af1..4c809f4 100644
--- a/source/aktuelles/kalender.html.haml
+++ b/source/aktuelles/kalender.html.haml
@@ -1,5 +1,5 @@
-\---
+---
 section: "aktuelles"
-\---
+---
 %div
   = lorem.paragraph
diff --git a/source/entdecken/mailinglisten.html.haml b/source/entdecken/mailinglisten.html.haml
index 4e59d7d..da60746 100644
--- a/source/entdecken/mailinglisten.html.haml
+++ b/source/entdecken/mailinglisten.html.haml
@@ -1,5 +1,5 @@
-\---
+---
 section: "entdecken"
-\---
+---
 %div
   = lorem.paragraphs(2)
diff --git a/source/entdecken/raeume.html.haml b/source/entdecken/raeume.html.haml
index 765b631..68b8cda 100644
--- a/source/entdecken/raeume.html.haml
+++ b/source/entdecken/raeume.html.haml
@@ -1,6 +1,6 @@
-\---
+---
 section: "entdecken"
-\---
+---
 %h2
   Die Räume
 %p
diff --git a/source/entdecken/verein.html.haml b/source/entdecken/verein.html.haml
index 4a4ea20..3ccdb22 100644
--- a/source/entdecken/verein.html.haml
+++ b/source/entdecken/verein.html.haml
@@ -1,6 +1,6 @@
-\---
+---
 section: "entdecken"
-\---
+---
 %div
   %h2
     Der Verein
diff --git a/source/entdecken/wiki.html.haml b/source/entdecken/wiki.html.haml
index 4e59d7d..da60746 100644
--- a/source/entdecken/wiki.html.haml
+++ b/source/entdecken/wiki.html.haml
@@ -1,5 +1,5 @@
-\---
+---
 section: "entdecken"
-\---
+---
 %div
   = lorem.paragraphs(2)
diff --git a/source/index.html.haml b/source/index.html.haml
index c3dfd02..70167c6 100644
--- a/source/index.html.haml
+++ b/source/index.html.haml
@@ -1,6 +1,6 @@
-\---
+---
 title: sublab - Ein Hackerspace in Leipzig
-\---
+---
 %div
   %h2 Ein Hackerspace in Leipzig
   %p.lead
diff --git a/source/kontakt/kontakt.html.haml b/source/kontakt/kontakt.html.haml
index 08a411d..7940174 100644
--- a/source/kontakt/kontakt.html.haml
+++ b/source/kontakt/kontakt.html.haml
@@ -1,6 +1,6 @@
-\---
+---
 section: "kontakt"
-\---
+---
 %div
   %h2
     Kontakt
diff --git a/source/mitmachen/gruppen.html.haml b/source/mitmachen/gruppen.html.haml
index 8f75efe..aef1adb 100644
--- a/source/mitmachen/gruppen.html.haml
+++ b/source/mitmachen/gruppen.html.haml
@@ -1,6 +1,6 @@
-\---
+---
 section: "mitmachen"
-\---
+---
 %div
   %p= lorem.paragraphs(2)
   %p= lorem.paragraphs(2)
diff --git a/source/mitmachen/projekte.html.haml b/source/mitmachen/projekte.html.haml
index 6387a5e..23650d9 100644
--- a/source/mitmachen/projekte.html.haml
+++ b/source/mitmachen/projekte.html.haml
@@ -1,6 +1,6 @@
-\---
+---
 section: "mitmachen"
-\---
+---
 %div
   %h2 Projekte
   %p
diff --git a/source/mitmachen/regelmaessige_termine.html.haml b/source/mitmachen/regelmaessige_termine.html.haml
index 152b795..8473cad 100644
--- a/source/mitmachen/regelmaessige_termine.html.haml
+++ b/source/mitmachen/regelmaessige_termine.html.haml
@@ -1,6 +1,6 @@
-\---
+---
 section: "mitmachen"
-\---
+---
 %div
   %h2
     Regelmäßige Veranstaltungen
diff --git a/source/mitmachen/termine.html.haml b/source/mitmachen/termine.html.haml
index a448d56..f42c675 100644
--- a/source/mitmachen/termine.html.haml
+++ b/source/mitmachen/termine.html.haml
@@ -1,6 +1,6 @@
-\---
+---
 section: "mitmachen"
-\---
+---
 %div
   %h3
     Regelmäßige Veranstaltungen
diff --git a/source/mitmachen/treffen.html.haml b/source/mitmachen/treffen.html.haml
index e80d68b..12c2557 100644
--- a/source/mitmachen/treffen.html.haml
+++ b/source/mitmachen/treffen.html.haml
@@ -1,6 +1,6 @@
-\---
+---
 section: "mitmachen"
-\---
+---
 %div
   %p= lorem.paragraphs(2)
   %img{:src => lorem.image("200x200")}/