From 0b747a0f4ab3917ea1593b0f25169e600cd1059f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 6 Aug 2013 17:58:45 +0300
Subject: [PATCH] Minor UI improvements

---
 app/views/projects/deploy_keys/index.html.haml   | 14 +++++++-------
 app/views/projects/team_members/import.html.haml |  9 ++++-----
 app/views/projects/team_members/index.html.haml  |  4 ++--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml
index 757b8c00eea..3e797691241 100644
--- a/app/views/projects/deploy_keys/index.html.haml
+++ b/app/views/projects/deploy_keys/index.html.haml
@@ -1,4 +1,4 @@
-%p.slead
+%h3.page-title
   Deploy keys allow read-only access to repository
 
   = link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do
@@ -13,9 +13,9 @@
 
 .row
   .span5.enabled-keys
-    %h5.cgreen
-      Enabled deploy keys
-      %small for this project
+    %h5
+      %strong.cgreen Enabled deploy keys
+      for this project
     %ul.bordered-list
       = render @enabled_keys
       - if @enabled_keys.blank?
@@ -23,10 +23,10 @@
           %p.nothing_here_message Create #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add existing one
   .span5.available-keys
     %h5
-      Available deploy keys
-      %small from projects you are able to manage
+      %strong Deploy keys
+      from projects available for you
     %ul.bordered-list
       = render @available_keys
       - if @available_keys.blank?
         .light-well
-          %p.nothing_here_message All deploy keys created in projects you own will be displayed here
+          %p.nothing_here_message All deploy keys created in projects you participate will be displayed here
diff --git a/app/views/projects/team_members/import.html.haml b/app/views/projects/team_members/import.html.haml
index c293cb4beef..6a17e0c2cb0 100644
--- a/app/views/projects/team_members/import.html.haml
+++ b/app/views/projects/team_members/import.html.haml
@@ -1,15 +1,14 @@
 %h3.page-title
-  = "Import team from another project"
+  = "Import members from another project"
+%p.light
+  Only project members will be improted. Group members will be skipped.
 %hr
-%p.slead
-  Read more about project team import #{link_to "here", '#', class: 'vlink'}.
 = form_tag apply_import_project_team_members_path(@project), method: 'post' do
-  %p.slead Choose project you want to use as team source:
   .padded
     = label_tag :source_project_id, "Project"
     .input= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen xxlarge", required: true)
 
   .actions
-    = submit_tag 'Import', class: "btn btn-save"
+    = submit_tag 'Import project members', class: "btn btn-create"
     = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
 
diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml
index af80ceaed52..88325587f44 100644
--- a/app/views/projects/team_members/index.html.haml
+++ b/app/views/projects/team_members/index.html.haml
@@ -3,10 +3,10 @@
 
   - if can? current_user, :admin_team_member, @project
     %span.pull-right
-      = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import team from another project" do
-        Import team from another project
       = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New Team Member" do
         New Team Member
+      = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import team from another project" do
+        Import members
 
 %p.light
   Read more about project permissions