cleaner

layouts/partials/_navbar.erb

@@ -14,9 +14,9 @@
             <img id="inline-logo" src="<%= zeus_logo_url color: @zeus_logo_color %>" alt="" />
           </a>
           <div class="nav-menu nav-left">
-            <% nav_items do |item, active| %>
+            <% navigables.each do |i| %>
-            <a class="nav-item is-tab <%= 'is-active' if active %>" href="<%= item.path %>">
+            <a class="nav-item is-tab <%= 'is-active' if child_of(i) %>" href="<%= i.path %>">
-              <%= item[:title] %>
+              <%= i[:title] %>
             </a>
             <% end %>
           </div>

lib/helpers/nav.rb

@@ -2,15 +2,8 @@
 
 # Helpers for navbar partial
 module NavigationHelper
-  def nav_items
+  def child_of(item)
-    navigables.each do |item|
+    item == @item || children_of(item).include?(@item)
-      # Kind of hacky way to check if page is child of another page
-      root = %r{/.+?/}.match(item.path)[0]
-
-      is_active = @item_rep && @item_rep.path.start_with?(root)
-
-      yield item, is_active
-    end
   end
 
   # Returns every navigable item

lib/helpers_.rb

@@ -3,6 +3,7 @@ include Nanoc::Helpers::Capturing
 include Nanoc::Helpers::LinkTo
 include Nanoc::Helpers::Rendering
 include Nanoc::Helpers::Text
+include Nanoc::Helpers::ChildParent
 
 include EnvironmentHelper
 include ArchiveHelper