Few usability improvments
This commit is contained in:
parent
560985b0f6
commit
bfd00caff3
|
@ -13,19 +13,19 @@
|
||||||
= link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
|
= link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
|
||||||
|
|
||||||
- if can? current_user, :admin_project, @project
|
- if can? current_user, :admin_project, @project
|
||||||
= nav_link(controller: :deploy_keys, html_options: {class: 'right'}) do
|
= nav_link(controller: :deploy_keys, html_options: {class: 'pull-right'}) do
|
||||||
= link_to project_deploy_keys_path(@project) do
|
= link_to project_deploy_keys_path(@project) do
|
||||||
%span
|
%span
|
||||||
Deploy Keys
|
Deploy Keys
|
||||||
= nav_link(controller: :hooks, html_options: {class: 'right'}) do
|
= nav_link(controller: :hooks, html_options: {class: 'pull-right'}) do
|
||||||
= link_to project_hooks_path(@project) do
|
= link_to project_hooks_path(@project) do
|
||||||
%span
|
%span
|
||||||
Hooks
|
Hooks
|
||||||
= nav_link(controller: :services, html_options: {class: 'right'}) do
|
= nav_link(controller: :services, html_options: {class: 'pull-right'}) do
|
||||||
= link_to project_services_path(@project) do
|
= link_to project_services_path(@project) do
|
||||||
%span
|
%span
|
||||||
Services
|
Services
|
||||||
= nav_link(path: 'projects#edit', html_options: {class: 'right'}) do
|
= nav_link(path: 'projects#edit', html_options: {class: 'pull-right'}) do
|
||||||
= link_to edit_project_path(@project), class: "stat-tab tab " do
|
= link_to edit_project_path(@project), class: "stat-tab tab " do
|
||||||
%i.icon-edit
|
%i.icon-edit
|
||||||
Edit
|
Edit
|
||||||
|
|
|
@ -19,5 +19,5 @@
|
||||||
.input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
|
.input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
|
||||||
|
|
||||||
.actions
|
.actions
|
||||||
= f.submit 'Save', class: "btn btn-save"
|
= f.submit 'Add users', class: "btn btn-create"
|
||||||
= link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
|
= link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
- if current_user == user
|
- if current_user == user
|
||||||
%span.btn.disabled This is you!
|
%span.btn.disabled This is you!
|
||||||
- if @project.namespace_owner == user
|
- if @project.namespace_owner == user
|
||||||
%span.btn.disabled.btn-success Owner
|
%span.btn.disabled Owner
|
||||||
- elsif user.blocked
|
- elsif user.blocked
|
||||||
%span.btn.disabled.blocked Blocked
|
%span.btn.disabled.blocked Blocked
|
||||||
- elsif allow_admin
|
- elsif allow_admin
|
||||||
|
|
|
@ -24,7 +24,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
|
||||||
select user.name, :from => "user_ids"
|
select user.name, :from => "user_ids"
|
||||||
select "Reporter", :from => "project_access"
|
select "Reporter", :from => "project_access"
|
||||||
end
|
end
|
||||||
click_button "Save"
|
click_button "Add users"
|
||||||
end
|
end
|
||||||
|
|
||||||
Then 'I should see "Mike" in team list as "Reporter"' do
|
Then 'I should see "Mike" in team list as "Reporter"' do
|
||||||
|
|
Loading…
Reference in a new issue