Few usability improvments

diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_project_head.html.haml
index cc21550..b8c8885 100644 (file)
--- a/app/views/projects/_project_head.html.haml
+++ b/app/views/projects/_project_head.html.haml
@@ -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

diff --git a/app/views/team_members/_form.html.haml b/app/views/team_members/_form.html.haml
index ee435c8..05bea2d 100644 (file)
--- a/app/views/team_members/_form.html.haml
+++ b/app/views/team_members/_form.html.haml
@@ -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"

diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index b59bb7b..3df2cae 100644 (file)
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -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

diff --git a/features/steps/project/project_team_management.rb b/features/steps/project/project_team_management.rb
index 91b3ffe..19352fe 100644 (file)
--- a/features/steps/project/project_team_management.rb
+++ b/features/steps/project/project_team_management.rb
@@ -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