Merge branch 'improve/tab_names' into 'master'
Add icons and better names to Project/Group nav
This commit is contained in:
commit
f7b46fa5ff
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue