Merge branch 'feature/import_team_from_other_project' of dev.gitlabhq.com:gitlabhq

2 files changed, 24 insertions, 2 deletions

diff --git a/app/views/team_members/import.html.haml b/app/views/team_members/import.html.haml
new file mode 100644
index 00000000000..34f7fb03288
--- /dev/null
+++ b/app/views/team_members/import.html.haml
@@ -0,0 +1,17 @@
+= render "projects/project_head"
+
+%h3.page_title
+  = "Import team from another project"
+%hr
+%p.slead
+  Read more about 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.projects, :id, :name), prompt: "Select project", class: "chosen xxlarge", required: true)
+
+  .actions
+    = submit_tag 'Import', class: "btn save-btn"
+    = link_to "Cancel", project_team_index_path(@project), class: "btn cancel-btn"
+
diff --git a/app/views/team_members/index.html.haml b/app/views/team_members/index.html.haml
index b3b7b72a150..ca3edcf7ffb 100644
--- a/app/views/team_members/index.html.haml
+++ b/app/views/team_members/index.html.haml
@@ -5,9 +5,14 @@
 
 - if can? current_user, :admin_team_member, @project
   %p.slead
-    = link_to new_project_team_member_path(@project), class: "btn small right", title: "New Team Member" do
-      New Team Member
     Read more about project permissions
     %strong= link_to "here", help_permissions_path, class: "vlink"
 
+    %span.right
+      = link_to import_project_team_members_path(@project), class: "btn small grouped", title: "Import team from another project" do
+        Import team from another project
+      = link_to new_project_team_member_path(@project), class: "btn success small grouped", title: "New Team Member" do
+        New Team Member
+
+    .clearfix
 = render partial: "team_members/team", locals: {project: @project}