Remove team mentions

Dmitriy Zaporozhets
1 parent bbc916ba
Showing 4 changed files with 9 additions and 9 deletions Show diff stats
app/views/groups/edit.html.haml
app/views/projects/_clone_panel.html.haml
app/views/projects/team_members/_form.html.haml
app/views/projects/team_members/index.html.haml
@@ -59,7 +59,7 @@
                   = private_icon
                 = link_to project.name_with_namespace, project
                 .pull-right
-                  = link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
+                  = link_to 'Members', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
                   = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
                   = link_to 'Remove', project, confirm: remove_project_message(project), method: :delete, class: "btn btn-small btn-remove"
             - if @group.projects.blank?
@@ -40,5 +40,5 @@
             - if can?(current_user, :admin_team_member, @project)
               %li.divider
               %li
-                = link_to new_project_team_member_path(@project), title: "New Team member" do
-                  Team member
+                = link_to new_project_team_member_path(@project), title: "New project member" do
+                  Project member
 %h3.page-title
-  = "New Team member(s)"
+  = "New project member(s)"
 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
   -if @user_project_relation.errors.any?
@@ -8,13 +8,13 @@
         - @user_project_relation.errors.full_messages.each do |msg|
           %li= msg
-  %h6 1. Choose people you want in the team
+  %p 1. Choose people you want in the project
   .control-group
     = f.label :user_ids, "People"
     .controls
       = users_select_tag(:user_ids, multiple: true)
-  %h6 2. Set access level for them
+  %p 2. Set access level for them
   .control-group
     = f.label :project_access, "Project Access"
     .controls= select_tag :project_access, options_for_select(Gitlab::Access.options, @user_project_relation.project_access), class: "project-access-select chosen"
@@ -3,9 +3,9 @@
   - if can? current_user, :admin_team_member, @project
     %span.pull-right
-      = 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
+      = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New project member" do
+        New project member
+      = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import members from another project" do
         Import members
 %p.light
	@@ -59,7 +59,7 @@		@@ -59,7 +59,7 @@
59	= private_icon	59	= private_icon
60	= link_to project.name_with_namespace, project	60	= link_to project.name_with_namespace, project
61	.pull-right	61	.pull-right
62	- = link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"	62	+ = link_to 'Members', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
63	= link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"	63	= link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
64	= link_to 'Remove', project, confirm: remove_project_message(project), method: :delete, class: "btn btn-small btn-remove"	64	= link_to 'Remove', project, confirm: remove_project_message(project), method: :delete, class: "btn btn-small btn-remove"
65	- if @group.projects.blank?	65	- if @group.projects.blank?
	@@ -40,5 +40,5 @@		@@ -40,5 +40,5 @@
40	- if can?(current_user, :admin_team_member, @project)	40	- if can?(current_user, :admin_team_member, @project)
41	%li.divider	41	%li.divider
42	%li	42	%li
43	- = link_to new_project_team_member_path(@project), title: "New Team member" do
44	- Team member	43	+ = link_to new_project_team_member_path(@project), title: "New project member" do
		44	+ Project member
1	%h3.page-title	1	%h3.page-title
2	- = "New Team member(s)"	2	+ = "New project member(s)"
3		3
4	= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do \|f\|	4	= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do \|f\|
5	-if @user_project_relation.errors.any?	5	-if @user_project_relation.errors.any?
	@@ -8,13 +8,13 @@		@@ -8,13 +8,13 @@
8	- @user_project_relation.errors.full_messages.each do \|msg\|	8	- @user_project_relation.errors.full_messages.each do \|msg\|
9	%li= msg	9	%li= msg
10		10
11	- %h6 1. Choose people you want in the team	11	+ %p 1. Choose people you want in the project
12	.control-group	12	.control-group
13	= f.label :user_ids, "People"	13	= f.label :user_ids, "People"
14	.controls	14	.controls
15	= users_select_tag(:user_ids, multiple: true)	15	= users_select_tag(:user_ids, multiple: true)
16		16
17	- %h6 2. Set access level for them	17	+ %p 2. Set access level for them
18	.control-group	18	.control-group
19	= f.label :project_access, "Project Access"	19	= f.label :project_access, "Project Access"
20	.controls= select_tag :project_access, options_for_select(Gitlab::Access.options, @user_project_relation.project_access), class: "project-access-select chosen"	20	.controls= select_tag :project_access, options_for_select(Gitlab::Access.options, @user_project_relation.project_access), class: "project-access-select chosen"