From eb272227c30ab9ed428910ce13b153290dc38c85 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 6 Feb 2014 10:16:26 +0200 Subject: [PATCH 1/2] Add icons and better names to Project/Group nav Signed-off-by: Dmitriy Zaporozhets --- app/views/groups/edit.html.haml | 6 ++++-- app/views/projects/_settings_nav.html.haml | 10 ++++++---- 2 files changed, 10 insertions(+), 6 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..a0caf8282f4 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 = 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 From 0a3d50eb32faef18a3bb8bc7626303cdcc50ac3b Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 6 Feb 2014 16:17:33 +0200 Subject: [PATCH 2/2] Fixed tests Signed-off-by: Dmitriy Zaporozhets --- app/views/projects/_settings_nav.html.haml | 2 +- features/steps/project/project_active_tab.rb | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/projects/_settings_nav.html.haml b/app/views/projects/_settings_nav.html.haml index a0caf8282f4..4c7b088ae9a 100644 --- a/app/views/projects/_settings_nav.html.haml +++ b/app/views/projects/_settings_nav.html.haml @@ -1,4 +1,4 @@ -%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 %i.icon-edit 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