Download as
Browse Code »

Commit f7b46fa5fff2b26d8213aeb8619f2212e39f9541

Authored by Dmitriy Zaporozhets
2 parents 90ab30b7 0a3d50eb
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'improve/tab_names' into 'master' 

Add icons and better names to Project/Group nav
Showing 3 changed files with 15 additions and 9 deletions   Show diff stats
app/views/groups/edit.html.haml
  Diff comments   View file @f7b46fa
@@ -4,13 +4,15 @@ @@ -4,13 +4,15 @@
4 %li.active 4 %li.active
5 = link_to '#tab-edit', 'data-toggle' => 'tab' do 5 = link_to '#tab-edit', 'data-toggle' => 'tab' do
6 %i.icon-edit 6 %i.icon-edit
7 - Edit Group 7 + Group
8 %li 8 %li
9 = link_to '#tab-projects', 'data-toggle' => 'tab' do 9 = link_to '#tab-projects', 'data-toggle' => 'tab' do
10 %i.icon-folder-close 10 %i.icon-folder-close
11 Projects 11 Projects
12 %li 12 %li
13 - = link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab' 13 + = link_to '#tab-remove', 'data-toggle' => 'tab' do
  14 + %i.icon-remove-sign
  15 + Remove
14 16
15 .col-md-10 17 .col-md-10
16 .tab-content 18 .tab-content
app/views/projects/_settings_nav.html.haml
  Diff comments   View file @f7b46fa
1 -%ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20 1 +%ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20.project-settings-nav
2 = nav_link(path: 'projects#edit') do 2 = nav_link(path: 'projects#edit') do
3 = link_to edit_project_path(@project), class: "stat-tab tab " do 3 = link_to edit_project_path(@project), class: "stat-tab tab " do
4 - Edit Project 4 + %i.icon-edit
  5 + Project
5 = nav_link(controller: [:team_members, :teams]) do 6 = nav_link(controller: [:team_members, :teams]) do
6 = link_to project_team_index_path(@project), class: "team-tab tab" do 7 = link_to project_team_index_path(@project), class: "team-tab tab" do
  8 + %i.icon-group
7 Members 9 Members
8 = nav_link(controller: :deploy_keys) do 10 = nav_link(controller: :deploy_keys) do
9 = link_to project_deploy_keys_path(@project) do 11 = link_to project_deploy_keys_path(@project) do
10 - %span 12 + %i.icon-key
11 Deploy Keys 13 Deploy Keys
12 = nav_link(controller: :hooks) do 14 = nav_link(controller: :hooks) do
13 = link_to project_hooks_path(@project) do 15 = link_to project_hooks_path(@project) do
14 - %span 16 + %i.icon-link
15 Web Hooks 17 Web Hooks
16 = nav_link(controller: :services) do 18 = nav_link(controller: :services) do
17 = link_to project_services_path(@project) do 19 = link_to project_services_path(@project) do
18 - %span 20 + %i.icon-cogs
19 Services 21 Services
features/steps/project/project_active_tab.rb
  Diff comments   View file @f7b46fa
@@ -57,7 +57,9 @@ class ProjectActiveTab < Spinach::FeatureSteps @@ -57,7 +57,9 @@ class ProjectActiveTab < Spinach::FeatureSteps
57 end 57 end
58 58
59 Given 'I click the "Edit" tab' do 59 Given 'I click the "Edit" tab' do
60 - click_link('Edit') 60 + within '.project-settings-nav' do
  61 + click_link('Project')
  62 + end
61 end 63 end
62 64
63 Given 'I click the "Hooks" tab' do 65 Given 'I click the "Hooks" tab' do
@@ -73,7 +75,7 @@ class ProjectActiveTab < Spinach::FeatureSteps @@ -73,7 +75,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
73 end 75 end
74 76
75 Then 'the active sub nav should be Edit' do 77 Then 'the active sub nav should be Edit' do
76 - ensure_active_sub_nav('Edit Project') 78 + ensure_active_sub_nav('Project')
77 end 79 end
78 80
79 Then 'the active sub nav should be Hooks' do 81 Then 'the active sub nav should be Hooks' do