BigW Consortium Gitlab

Commit bfd00caf by Dmitriy Zaporozhets

Few usability improvments

parent 560985b0
......@@ -13,19 +13,19 @@
= link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
- 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
%span
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
%span
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
%span
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
%i.icon-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"
.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"
......@@ -19,7 +19,7 @@
- if current_user == user
%span.btn.disabled This is you!
- if @project.namespace_owner == user
%span.btn.disabled.btn-success Owner
%span.btn.disabled Owner
- elsif user.blocked
%span.btn.disabled.blocked Blocked
- elsif allow_admin
......
......@@ -24,7 +24,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
select user.name, :from => "user_ids"
select "Reporter", :from => "project_access"
end
click_button "Save"
click_button "Add users"
end
Then 'I should see "Mike" in team list as "Reporter"' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment