From e264ba909126d6b690bf8e0b1cf13eb6ff104201 Mon Sep 17 00:00:00 2001 From: Partha Aji Date: Tue, 15 May 2012 18:46:38 -0400 Subject: [PATCH] Patch to render sub menu main --- src/app/helpers/menu.rb | 27 +++++++++++++++++++++++++-- src/app/views/layouts/katello.haml | 4 ++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/app/helpers/menu.rb b/src/app/helpers/menu.rb index 0a31d937969..f3a43a17968 100644 --- a/src/app/helpers/menu.rb +++ b/src/app/helpers/menu.rb @@ -19,14 +19,37 @@ def self.included(base) base.send :include, Navigation base.class_eval do helper_method :render_menu + helper_method :render_sublevel_menu + helper_method :render_main_menu + helper_method :render_main_sub_menu end end - def render_menu(level, items = nil) + def render_menu(level, items = nil, prune = true) items ||= menu_main - prune_menu(items) + prune_menu(items) if prune render_navigation(:items=>items, :expand_all=>true, :level => level) end + def render_main_menu() + prune = @main_nav.nil? + @main_nav ||= menu_main + render_menu(1, @main_nav, prune) + end + + def render_main_sub_menu() + prune = @main_nav.nil? + @main_nav ||= menu_main + render_sublevel_menu(@main_nav, prune) + end + + def render_sublevel_menu(items = nil, prune = true) + items ||= menu_main + prune_menu(items) if prune + items.collect do |top_level| + render_navigation(:items => top_level[:items], :expand_all=>true) if top_level[:items] + end.compact.join("").html_safe + end + private def prune_menu menu_items diff --git a/src/app/views/layouts/katello.haml b/src/app/views/layouts/katello.haml index 9446774e405..f818aabe899 100644 --- a/src/app/views/layouts/katello.haml +++ b/src/app/views/layouts/katello.haml @@ -24,13 +24,13 @@ = content_for(:content) do .hidden#remove - = render_menu(1..3) + = render_main_menu - if not current_user #formwindow = yield - else %nav.subnav#subnav - = render_menu(2..3) + = render_main_sub_menu .inner.container_16 = yield