summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-04-23 05:16:25 +0000
committerGo MAEDA <maeda@farend.jp>2018-04-23 05:16:25 +0000
commitfe7e8f1d3b87f2da79db4739082718447773dc34 (patch)
treeaaa55f377f9edd8bc1520c17b0cf18e6b37e195e
parent543e20947f24fa3d434a82de2c4fd04ad0c360c8 (diff)
downloadredmine-fe7e8f1d3b87f2da79db4739082718447773dc34.tar.gz
redmine-fe7e8f1d3b87f2da79db4739082718447773dc34.zip
Add CSS to distinguish when a main menu is present or not (#28531).
Patch by Felix Schäfer. git-svn-id: http://svn.redmine.org/redmine/trunk@17303 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/application_helper.rb1
-rw-r--r--test/integration/lib/redmine/menu_manager_test.rb7
2 files changed, 8 insertions, 0 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index be0813480..55b6230c6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -592,6 +592,7 @@ module ApplicationHelper
end
css << 'project-' + @project.identifier if @project && @project.identifier.present?
+ css << 'has-main-menu' if display_main_menu?(@project)
css << 'controller-' + controller_name
css << 'action-' + action_name
css << 'avatars-' + (Setting.gravatar_enabled? ? 'on' : 'off')
diff --git a/test/integration/lib/redmine/menu_manager_test.rb b/test/integration/lib/redmine/menu_manager_test.rb
index d52fef2d5..0b01f5d7f 100644
--- a/test/integration/lib/redmine/menu_manager_test.rb
+++ b/test/integration/lib/redmine/menu_manager_test.rb
@@ -77,4 +77,11 @@ class MenuManagerTest < Redmine::IntegrationTest
get '/login'
assert_select '#main-menu', 0
end
+
+ def test_body_should_have_main_menu_css_class_if_main_menu_is_present
+ get '/projects'
+ assert_select 'body.has-main-menu'
+ get '/'
+ assert_select 'body.has-main-menu', 0
+ end
end