diff options
author | Phil Hughes <me@iamphill.com> | 2017-07-19 07:51:56 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-07-19 07:51:56 +0000 |
commit | f45b96a01928c325a935c095468b321bec7cc15f (patch) | |
tree | 54363f52c988d5fcf0b1d1b7d53dc21a6e61e009 | |
parent | c06048a15da225d710dbdc7af0c7a408cfd19c3e (diff) | |
parent | c322a2eee98703896894b36a36f207f59922e3ad (diff) | |
download | gitlab-ce-f45b96a01928c325a935c095468b321bec7cc15f.tar.gz |
Merge branch '34764-make-project-more-clear' into 'master'
Rename Project nav items
Closes #34764
See merge request !12921
-rw-r--r-- | app/views/layouts/nav/_new_group_sidebar.html.haml | 8 | ||||
-rw-r--r-- | app/views/layouts/nav/_new_project_sidebar.html.haml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml index c80308ed0de..6e0c45739f1 100644 --- a/app/views/layouts/nav/_new_group_sidebar.html.haml +++ b/app/views/layouts/nav/_new_group_sidebar.html.haml @@ -6,15 +6,15 @@ = @group.name %ul.sidebar-top-level-items = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: 'home' }) do - = link_to group_path(@group), title: 'Home' do + = link_to group_path(@group), title: 'About group' do %span - Group + About %ul.sidebar-sub-level-items = nav_link(path: ['groups#show', 'groups#subgroups'], html_options: { class: 'home' }) do - = link_to group_path(@group), title: 'Group Home' do + = link_to group_path(@group), title: 'Group details' do %span - Home + Details = nav_link(path: 'groups#activity') do = link_to activity_group_path(@group), title: 'Activity' do diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml index 7c9822c5a6a..882123c0b0a 100644 --- a/app/views/layouts/nav/_new_project_sidebar.html.haml +++ b/app/views/layouts/nav/_new_project_sidebar.html.haml @@ -7,14 +7,14 @@ = @project.name %ul.sidebar-top-level-items = nav_link(path: ['projects#show', 'projects#activity', 'cycle_analytics#show'], html_options: { class: 'home' }) do - = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do + = link_to project_path(@project), title: 'About project', class: 'shortcuts-project' do %span - Project + About %ul.sidebar-sub-level-items = nav_link(path: 'projects#show') do - = link_to project_path(@project), title: _('Project home'), class: 'shortcuts-project' do - %span= _('Home') + = link_to project_path(@project), title: _('Project details'), class: 'shortcuts-project' do + %span= _('Details') = nav_link(path: 'projects#activity') do = link_to activity_project_path(@project), title: _('Activity'), class: 'shortcuts-project-activity' do |