diff options
Diffstat (limited to 'app/helpers/nav_helper.rb')
| -rw-r--r-- | app/helpers/nav_helper.rb | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 05da5ebdb22..f30e8c8c2c0 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -11,9 +11,9 @@ module NavHelper def page_with_sidebar_class class_name = page_gutter_class - class_name << 'page-with-contextual-sidebar' if defined?(@left_sidebar) && @left_sidebar - class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @left_sidebar - class_name -= ['right-sidebar-expanded'] if defined?(@right_sidebar) && !@right_sidebar + class_name << "page-with-contextual-sidebar" if defined?(@left_sidebar) && @left_sidebar + class_name << "page-with-icon-sidebar" if collapsed_sidebar? && @left_sidebar + class_name -= ["right-sidebar-expanded"] if defined?(@right_sidebar) && !@right_sidebar class_name end @@ -21,14 +21,14 @@ module NavHelper def page_gutter_class if page_has_markdown? - if cookies[:collapsed_gutter] == 'true' + if cookies[:collapsed_gutter] == "true" %w[page-gutter right-sidebar-collapsed] else %w[page-gutter right-sidebar-expanded] end - elsif current_path?('jobs#show') + elsif current_path?("jobs#show") %w[page-gutter build-sidebar right-sidebar-expanded] - elsif current_controller?('wikis') && current_action?('show', 'create', 'edit', 'update', 'history', 'git_access', 'destroy') + elsif current_controller?("wikis") && current_action?("show", "create", "edit", "update", "history", "git_access", "destroy") %w[page-gutter wiki-sidebar right-sidebar-expanded] else [] @@ -41,8 +41,8 @@ module NavHelper def user_dropdown_class class_names = [] - class_names << 'header-user-dropdown-toggle' - class_names << 'impersonated-user' if session[:impersonator_id] + class_names << "header-user-dropdown-toggle" + class_names << "impersonated-user" if session[:impersonator_id] class_names end @@ -52,20 +52,20 @@ module NavHelper end def page_has_markdown? - current_path?('merge_requests#show') || - current_path?('projects/merge_requests/conflicts#show') || - current_path?('issues#show') || - current_path?('milestones#show') + current_path?("merge_requests#show") || + current_path?("projects/merge_requests/conflicts#show") || + current_path?("issues#show") || + current_path?("milestones#show") end private def get_header_links links = if current_user - [:user_dropdown] - else - [:sign_in] - end + [:user_dropdown] + else + [:sign_in] + end if can?(current_user, :read_cross_project) links += [:issues, :merge_requests, :todos] if current_user.present? |