Project team page improved

Dmitriy Zaporozhets
1 parent 38c2cfb9
Showing 3 changed files with 20 additions and 9 deletions Show diff stats
app/assets/stylesheets/common.scss
app/helpers/projects_helper.rb
app/views/team_members/_show.html.haml
@@ -181,11 +181,12 @@ span.update-author {
   }
  
   &.joined {
-    background-color: #1cb9ff;
+    background-color: #1ca9dd;
   }
  
   &.left {
-    background-color: #ff5057;
+    background-color: #888;
+    float:none;
   }
 }
  
@@ -2,5 +2,9 @@ module ProjectsHelper
   def grouper_project_members(project)
     @project.users_projects.sort_by(&:project_access).reverse.group_by(&:project_access)
   end
+
+  def remove_from_team_message(project, member)
+    "You are going to remove #{member.user_name} from #{project.name}. Are you sure?"
+  end
 end
  
 - user = member.user
 - allow_admin = can? current_user, :admin_project, @project
 %tr{id: dom_id(member), class: "team_member_row user_#{user.id}"}
-  %td
+  %td.span6
     = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
       = image_tag gravatar_icon(user.email, 40), class: "avatar s32"
     = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
       %strong= truncate(user.name, lenght: 40)
-    %br
-    %div.cgray= user.email
+      %br
+      %small.cgray= user.email
  
-  %td
+  %td.span5
     .right
+      - if current_user == user
+        %span.btn.disabled This is you!
       - if @project.owner == user
-        %span.btn.disabled.success Project Owner
-      - if user.blocked
+        %span.btn.disabled.success Owner
+      - elsif user.blocked
         %span.btn.disabled.blocked Blocked
+      - elsif allow_admin
+        = link_to project_team_member_path(project_id: @project, id: member.id), confirm: remove_from_team_message(@project, member), method: :delete, class: "very_small btn danger" do
+          %i.icon-minus.icon-white
+
     - if allow_admin
       = form_for(member, as: :team_member, url: project_team_member_path(@project, member)) do |f|
-        = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select"
+        = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2"
...	...	@@ -181,11 +181,12 @@ span.update-author {
181	181	}
182	182
183	183	&.joined {
184		- background-color: #1cb9ff;
	184	+ background-color: #1ca9dd;
185	185	}
186	186
187	187	&.left {
188		- background-color: #ff5057;
	188	+ background-color: #888;
	189	+ float:none;
189	190	}
190	191	}
191	192
...	...
...	...	@@ -2,5 +2,9 @@ module ProjectsHelper
2	2	def grouper_project_members(project)
3	3	@project.users_projects.sort_by(&:project_access).reverse.group_by(&:project_access)
4	4	end
	5	+
	6	+ def remove_from_team_message(project, member)
	7	+ "You are going to remove #{member.user_name} from #{project.name}. Are you sure?"
	8	+ end
5	9	end
6	10
...	...
1	1	- user = member.user
2	2	- allow_admin = can? current_user, :admin_project, @project
3	3	%tr{id: dom_id(member), class: "team_member_row user_#{user.id}"}
4		- %td
	4	+ %td.span6
5	5	= link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
6	6	= image_tag gravatar_icon(user.email, 40), class: "avatar s32"
7	7	= link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
8	8	%strong= truncate(user.name, lenght: 40)
9		- %br
10		- %div.cgray= user.email
	9	+ %br
	10	+ %small.cgray= user.email
11	11
12		- %td
	12	+ %td.span5
13	13	.right
	14	+ - if current_user == user
	15	+ %span.btn.disabled This is you!
14	16	- if @project.owner == user
15		- %span.btn.disabled.success Project Owner
16		- - if user.blocked
	17	+ %span.btn.disabled.success Owner
	18	+ - elsif user.blocked
17	19	%span.btn.disabled.blocked Blocked
	20	+ - elsif allow_admin
	21	+ = link_to project_team_member_path(project_id: @project, id: member.id), confirm: remove_from_team_message(@project, member), method: :delete, class: "very_small btn danger" do
	22	+ %i.icon-minus.icon-white
	23	+
18	24	- if allow_admin
19	25	= form_for(member, as: :team_member, url: project_team_member_path(@project, member)) do \|f\|
20		- = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select"
	26	+ = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2"
...	...