diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-03-14 16:07:49 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-03-15 10:18:07 -0600 |
| commit | be0b3cc1bce600e6c3681be134b4fd249046edcb (patch) | |
| tree | 661eb8713857ee6732f2a2cb19f79059ef259545 | |
| parent | 30f99608ffa5a4ce3d403276df5d68a23ec9b338 (diff) | |
| download | gitlab-ce-group-gear-setting-dropdown-to-tab.tar.gz | |
Changed "Edit Group" subtab to "General" and moved itgroup-gear-setting-dropdown-to-tab
to the first option inside said subtab.
Also code cleanup
| -rw-r--r-- | app/views/groups/_settings_head.html.haml | 13 | ||||
| -rw-r--r-- | app/views/layouts/nav/_group.html.haml | 5 |
2 files changed, 7 insertions, 11 deletions
diff --git a/app/views/groups/_settings_head.html.haml b/app/views/groups/_settings_head.html.haml index d99426bc2c1..2454e7355a7 100644 --- a/app/views/groups/_settings_head.html.haml +++ b/app/views/groups/_settings_head.html.haml @@ -1,17 +1,14 @@ -- can_admin_group = can?(current_user, :admin_group, @group) -- can_edit = can?(current_user, :admin_group, @group) = content_for :sub_nav do .scrolling-tabs-container.sub-nav-scroll = render 'shared/nav_scroll' .nav-links.sub-nav.scrolling-tabs %ul{ class: container_class } + = nav_link(path: 'groups#edit') do + = link_to edit_group_path(@group), title: 'General' do + %span + General + = nav_link(path: 'groups#projects') do = link_to projects_group_path(@group), title: 'Projects' do %span Projects - - - if can_edit && can_admin_group - = nav_link(path: 'groups#edit') do - = link_to edit_group_path(@group), title: 'Edit Group' do - %span - Edit Group diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml index b2ecf6504e0..8605380848d 100644 --- a/app/views/layouts/nav/_group.html.haml +++ b/app/views/layouts/nav/_group.html.haml @@ -1,4 +1,3 @@ -- can_admin_group = can?(current_user, :admin_group, @group) .scrolling-tabs-container{ class: nav_control_class } .fade-left = icon('angle-left') @@ -25,8 +24,8 @@ = link_to group_group_members_path(@group), title: 'Members' do %span Members - - if current_user && can_admin_group + - if current_user && can?(current_user, :admin_group, @group) = nav_link(path: %w[groups#projects groups#edit]) do - = link_to projects_group_path(@group), title: 'Settings' do + = link_to edit_group_path(@group), title: 'Settings' do %span Settings |