From a2ad66a5c06fff83f1ab0773211a2fc13647bf30 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 11 Apr 2010 14:03:28 +0000
Subject: [PATCH] Merged r3539 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3636 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/layouts/base.rhtml | 2 ++
 lib/redmine/menu_manager.rb  | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index f01ee8e1f..2619a8cdc 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -40,9 +40,11 @@
     
     <h1><%= page_header_title %></h1>
     
+    <% if display_main_menu?(@project) %>
     <div id="main-menu">
         <%= render_main_menu(@project) %>
     </div>
+    <% end %>
 </div>
 
 <%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %>
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index 34cea79fa..4094a9c14 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -166,6 +166,11 @@ module Redmine
         render_menu((project && !project.new_record?) ? :project_menu : :application_menu, project)
       end
       
+      def display_main_menu?(project)
+        menu_name = project && !project.new_record? ? :project_menu : :application_menu
+        Redmine::MenuManager.items(menu_name).size > 1 # 1 element is the root
+      end
+
       def render_menu(menu, project=nil)
         links = []
         menu_items_for(menu, project) do |node|