From 6140f406f4f2c10cbf2526f2c3d6f1b98f21149f Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 13 Sep 2015 17:10:27 +0100
Subject: [PATCH] Refactor main menu links

---
 app/config/sculpin_site.yml       | 20 +++++++++++++++-----
 source/_layouts/default.html.twig |  6 ++++--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
index e22a9e581..78454d1e1 100644
--- a/app/config/sculpin_site.yml
+++ b/app/config/sculpin_site.yml
@@ -36,11 +36,21 @@ apple_touch_icon_sizes: [ 57, 114, 72, 144, 60, 120, 76, 152 ]
 favicon_sizes: [ 160, 96, 32, 16 ]
 
 main_menu:
-    - { title: Experience, href: /experience/, nav: experience }
-    - { title: Testimonials, href: /testimonials/, nav: testimonials }
-    - { title: Talks, href: /talks/, nav: talks }
-    - { title: Blog, href: /blog/, nav: blog }
-    - { title: Contact, href: /contact/, nav: contact }
+    experience:
+        title: Experience
+        href: /experience/
+    testimonials:
+        title: Testimonials
+        href: /testimonials/
+    talks:
+        title: Talks
+        href: /talks/
+    blog:
+        title: Blog
+        href: /blog/
+    contact:
+        title: Contact
+        href: /contact/
 
 meetups:
     swdug:
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index e4d01c03f..1d050f855 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -46,8 +46,10 @@
 
                 <div id="navbar" class="collapse navbar-collapse" role="navigation">
                     <ul class="nav navbar-nav">
-                        {% for link in site.main_menu %}
-                            <li class="nav__{{ link.title|lower }}{% if page.nav == link.nav %} active{% endif %}"><a href="{{ link.href }}">{{ link.title }}</a></li>
+                        {% for name, item in site.main_menu %}
+                            <li{% if page.nav == name %} class="active"{% endif %}>
+                                <a href="{{ item.href }}">{{ item.title }}</a>
+                            </li>
                         {% endfor %}
                     </ul>
                 </div>{# .nav-collapse #}