Merge branch 'improve/tab_names' into 'master'

Add icons and better names to Project/Group nav

3 files changed, 15 insertions, 9 deletions

diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index e274a799674..f14fe923402 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -4,13 +4,15 @@
       %li.active
         = link_to '#tab-edit', 'data-toggle' => 'tab' do
           %i.icon-edit
-          Edit Group
+          Group
       %li
         = link_to '#tab-projects', 'data-toggle' => 'tab' do
           %i.icon-folder-close
           Projects
       %li
-        = link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab'
+        = link_to '#tab-remove', 'data-toggle' => 'tab' do
+          %i.icon-remove-sign
+          Remove
 
   .col-md-10
     .tab-content
diff --git a/app/views/projects/_settings_nav.html.haml b/app/views/projects/_settings_nav.html.haml
index e4cfabc3100..4c7b088ae9a 100644
--- a/app/views/projects/_settings_nav.html.haml
+++ b/app/views/projects/_settings_nav.html.haml
@@ -1,19 +1,21 @@
-%ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20
+%ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20.project-settings-nav
   = nav_link(path: 'projects#edit') do
     = link_to edit_project_path(@project), class: "stat-tab tab " do
-      Edit Project
+      %i.icon-edit
+      Project
   = nav_link(controller: [:team_members, :teams]) do
     = link_to project_team_index_path(@project), class: "team-tab tab" do
+      %i.icon-group
       Members
   = nav_link(controller: :deploy_keys) do
     = link_to project_deploy_keys_path(@project) do
-      %span
+      %i.icon-key
       Deploy Keys
   = nav_link(controller: :hooks) do
     = link_to project_hooks_path(@project) do
-      %span
+      %i.icon-link
       Web Hooks
   = nav_link(controller: :services) do
     = link_to project_services_path(@project) do
-      %span
+      %i.icon-cogs
       Services
diff --git a/features/steps/project/project_active_tab.rb b/features/steps/project/project_active_tab.rb
index e04a17168be..dcc252f4765 100644
--- a/features/steps/project/project_active_tab.rb
+++ b/features/steps/project/project_active_tab.rb
@@ -57,7 +57,9 @@ class ProjectActiveTab < Spinach::FeatureSteps
   end
 
   Given 'I click the "Edit" tab' do
-    click_link('Edit')
+    within '.project-settings-nav' do
+      click_link('Project')
+    end
   end
 
   Given 'I click the "Hooks" tab' do
@@ -73,7 +75,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
   end
 
   Then 'the active sub nav should be Edit' do
-    ensure_active_sub_nav('Edit Project')
+    ensure_active_sub_nav('Project')
   end
 
   Then 'the active sub nav should be Hooks' do