Commit bfd00caff3010100f367ed60d73f065cc8b21f06
1 parent
560985b0
Exists in
master
and in
4 other branches
Few usability improvments
Showing
4 changed files
with
7 additions
and
7 deletions
Show diff stats
app/views/projects/_project_head.html.haml
| @@ -13,19 +13,19 @@ | @@ -13,19 +13,19 @@ | ||
| 13 | = link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab" | 13 | = link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab" |
| 14 | 14 | ||
| 15 | - if can? current_user, :admin_project, @project | 15 | - if can? current_user, :admin_project, @project |
| 16 | - = nav_link(controller: :deploy_keys, html_options: {class: 'right'}) do | 16 | + = nav_link(controller: :deploy_keys, html_options: {class: 'pull-right'}) do |
| 17 | = link_to project_deploy_keys_path(@project) do | 17 | = link_to project_deploy_keys_path(@project) do |
| 18 | %span | 18 | %span |
| 19 | Deploy Keys | 19 | Deploy Keys |
| 20 | - = nav_link(controller: :hooks, html_options: {class: 'right'}) do | 20 | + = nav_link(controller: :hooks, html_options: {class: 'pull-right'}) do |
| 21 | = link_to project_hooks_path(@project) do | 21 | = link_to project_hooks_path(@project) do |
| 22 | %span | 22 | %span |
| 23 | Hooks | 23 | Hooks |
| 24 | - = nav_link(controller: :services, html_options: {class: 'right'}) do | 24 | + = nav_link(controller: :services, html_options: {class: 'pull-right'}) do |
| 25 | = link_to project_services_path(@project) do | 25 | = link_to project_services_path(@project) do |
| 26 | %span | 26 | %span |
| 27 | Services | 27 | Services |
| 28 | - = nav_link(path: 'projects#edit', html_options: {class: 'right'}) do | 28 | + = nav_link(path: 'projects#edit', html_options: {class: 'pull-right'}) do |
| 29 | = link_to edit_project_path(@project), class: "stat-tab tab " do | 29 | = link_to edit_project_path(@project), class: "stat-tab tab " do |
| 30 | %i.icon-edit | 30 | %i.icon-edit |
| 31 | Edit | 31 | Edit |
app/views/team_members/_form.html.haml
| @@ -19,5 +19,5 @@ | @@ -19,5 +19,5 @@ | ||
| 19 | .input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen" | 19 | .input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen" |
| 20 | 20 | ||
| 21 | .actions | 21 | .actions |
| 22 | - = f.submit 'Save', class: "btn btn-save" | 22 | + = f.submit 'Add users', class: "btn btn-create" |
| 23 | = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel" | 23 | = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel" |
app/views/team_members/_show.html.haml
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | - if current_user == user | 19 | - if current_user == user |
| 20 | %span.btn.disabled This is you! | 20 | %span.btn.disabled This is you! |
| 21 | - if @project.namespace_owner == user | 21 | - if @project.namespace_owner == user |
| 22 | - %span.btn.disabled.btn-success Owner | 22 | + %span.btn.disabled Owner |
| 23 | - elsif user.blocked | 23 | - elsif user.blocked |
| 24 | %span.btn.disabled.blocked Blocked | 24 | %span.btn.disabled.blocked Blocked |
| 25 | - elsif allow_admin | 25 | - elsif allow_admin |
features/steps/project/project_team_management.rb
| @@ -24,7 +24,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps | @@ -24,7 +24,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps | ||
| 24 | select user.name, :from => "user_ids" | 24 | select user.name, :from => "user_ids" |
| 25 | select "Reporter", :from => "project_access" | 25 | select "Reporter", :from => "project_access" |
| 26 | end | 26 | end |
| 27 | - click_button "Save" | 27 | + click_button "Add users" |
| 28 | end | 28 | end |
| 29 | 29 | ||
| 30 | Then 'I should see "Mike" in team list as "Reporter"' do | 30 | Then 'I should see "Mike" in team list as "Reporter"' do |