Merge branch 'improve/tab_names' into 'master'

Add icons and better names to Project/Group nav

Merge branch 'improve/tab_names' into 'master'
Add icons and better names to Project/Group nav
Dmitriy Zaporozhets
2 parents 90ab30b7 0a3d50eb
Showing 3 changed files with 15 additions and 9 deletions Show diff stats
app/views/groups/edit.html.haml
app/views/projects/_settings_nav.html.haml
features/steps/project/project_active_tab.rb
@@ -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
-%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
@@ -57,7 +57,9 @@ class ProjectActiveTab &lt; 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 &lt; 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
...	...	@@ -4,13 +4,15 @@
4	4	%li.active
5	5	= link_to '#tab-edit', 'data-toggle' => 'tab' do
6	6	%i.icon-edit
7		- Edit Group
	7	+ Group
8	8	%li
9	9	= link_to '#tab-projects', 'data-toggle' => 'tab' do
10	10	%i.icon-folder-close
11	11	Projects
12	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	17	.col-md-10
16	18	.tab-content
...	...
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	2	= nav_link(path: 'projects#edit') do
3	3	= link_to edit_project_path(@project), class: "stat-tab tab " do
4		- Edit Project
	4	+ %i.icon-edit
	5	+ Project
5	6	= nav_link(controller: [:team_members, :teams]) do
6	7	= link_to project_team_index_path(@project), class: "team-tab tab" do
	8	+ %i.icon-group
7	9	Members
8	10	= nav_link(controller: :deploy_keys) do
9	11	= link_to project_deploy_keys_path(@project) do
10		- %span
	12	+ %i.icon-key
11	13	Deploy Keys
12	14	= nav_link(controller: :hooks) do
13	15	= link_to project_hooks_path(@project) do
14		- %span
	16	+ %i.icon-link
15	17	Web Hooks
16	18	= nav_link(controller: :services) do
17	19	= link_to project_services_path(@project) do
18		- %span
	20	+ %i.icon-cogs
19	21	Services
...	...
...	...	@@ -57,7 +57,9 @@ class ProjectActiveTab < Spinach::FeatureSteps
57	57	end
58	58
59	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	63	end
62	64
63	65	Given 'I click the "Hooks" tab' do
...	...	@@ -73,7 +75,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
73	75	end
74	76
75	77	Then 'the active sub nav should be Edit' do
76		- ensure_active_sub_nav('Edit Project')
	78	+ ensure_active_sub_nav('Project')
77	79	end
78	80
79	81	Then 'the active sub nav should be Hooks' do
...	...