Merge branch 'navigation-updates-2'HEADmaster

1 files changed, 29 insertions, 9 deletions

diff --git a/source/_navigation.html.haml b/source/_navigation.html.haml
index 05d21e7..d46e7ec 100644
--- a/source/_navigation.html.haml
+++ b/source/_navigation.html.haml
@@ -1,5 +1,3 @@
-- @navigation = navigation_items
-
 .contain-to-grid
   %nav.top-bar{"role" => "navigation", "data-topbar" => true, "data-options" => "is_hover: false"}
     %ul.title-area
@@ -12,11 +10,33 @@
 
     %section.top-bar-section
       %ul.left
-        - @navigation.each do |key, value|
-          %li.has-dropdown
-            %a{href: "#"}
-              = key.first
-            %ul.dropdown
-              - value.each do |name, url|
-                %li= link_to(name, url)
 
+        %li.has-dropdown
+          %a{href: "#"}
+            Aktuelles
+          %ul.dropdown
+            %li= link_to("News", "/aktuelles/blog.html")
+            %li= link_to("Termine", "/aktuelles/kalender.html")
+
+        %li.has-dropdown
+          %a{href: "#"}
+            Entdecken
+          %ul.dropdown
+            %li= link_to("Die Räume", "/entdecken/raeume.html")
+            %li= link_to("Der Verein", "/entdecken/verein.html")
+            %li= link_to("Das Wiki", "/entdecken/wiki.html")
+            %li= link_to("Mailinglisten", "/entdecken/mailinglisten.html")
+            %li= link_to("Code", "/entdecken/code.html")
+
+        %li
+          = link_to("Projekte", "/mitmachen/projekte.html")
+
+        %li.active
+          = link_to("Mitglied werden", "/unterstuetzen/mitglied_werden.html")
+
+        %li.has-dropdown
+          %a{href: "#"}
+            Kontakt
+          %ul.dropdown
+            %li= link_to("Wegbeschreibung", "/kontakt/lage.html")
+            %li= link_to("Kontaktmöglichkeiten", "/kontakt/kontakt.html")