Download as
Browse Code »

Commit c40c627a3ba4b282bf42e247dff5eb13aa6ca790

Authored by Dmitriy Zaporozhets
1 parent a264ef2f
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

team profile restyled

Showing 2 changed files with 58 additions and 58 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @c40c627
... ... @@ -370,12 +370,12 @@ img.lil_av {
370 370  
371 371 .profile_avatar_holder {
372 372 float:left;
373   - width:90px;
374   - height:90px;
  373 + width:60px;
  374 + height:60px;
375 375 margin-right:20px;
376 376 img {
377   - width:90px;
378   - height:90px;
  377 + width:60px;
  378 + height:60px;
379 379 background:#eee;
380 380 }
381 381 }
... ... @@ -1173,3 +1173,9 @@ li.note {
1173 1173 .wiki_content code, .readme code{
1174 1174 background-color: inherit;
1175 1175 }
  1176 +
  1177 +.team_member_show {
  1178 + td:first-child {
  1179 + color:#aaa;
  1180 + }
  1181 +}
... ...
app/views/team_members/show.html.haml
  Diff comments   View file @c40c627
1 1 - allow_admin = can? current_user, :admin_project, @project
2 2 - user = @team_member.user
3 3  
4   -.row
5   - .span8
6   - .profile_avatar_holder
7   - = image_tag gravatar_icon(user.email, 90), :class => "styled_image"
8   - %h3
9   - = user.name
10   - %br
11   - %small
12   - = user.email
  4 +.team_member_show
  5 + .profile_avatar_holder
  6 + = image_tag gravatar_icon(user.email, 60), :class => "borders"
  7 + %h3
  8 + = user.name
  9 + %small
  10 + = user.email
  11 + %hr
  12 + .back_link
13 13 %br
14   - .back_link
15   - %br
16   - = link_to team_project_path(@project), :class => "" do
17   - ← To team list
18   -
19   - .span8.right
20   - %div
21   - %div
22   - %h5.cgray
23   - Member since:
24   - %span.right
25   - = @team_member.created_at.stamp("Aug 21, 2011")
26   - %h5.cgray
27   - Project Access:
28   - %small (#{link_to "read more", help_permissions_path, :class => "vlink"})
29   - %span.right
  14 + = link_to team_project_path(@project), :class => "" do
  15 + ← To team list
  16 + %br
  17 + .row
  18 + .span8
  19 + %table.no-borders
  20 + %tr
  21 + %td Email
  22 + %td= mail_to user.email
  23 + %tr
  24 + %td Skype
  25 + %td= user.skype
  26 + - unless user.linkedin.blank?
  27 + %tr
  28 + %td LinkedIn
  29 + %td= user.linkedin
  30 + - unless user.twitter.blank?
  31 + %tr
  32 + %td Twitter
  33 + %td= user.twitter
  34 + - unless user.bio.blank?
  35 + %tr
  36 + %td Bio
  37 + %td= user.bio
  38 + .span8
  39 + %table.no-borders
  40 + %tr
  41 + %td Member since
  42 + %td= @team_member.created_at.stamp("Aug 21, 2011")
  43 + %tr
  44 + %td
  45 + Project Access:
  46 + %small (#{link_to "read more", help_permissions_path, :class => "vlink"})
  47 + %td
30 48 = form_for(@team_member, :as => :team_member, :url => project_team_member_path(@project, @team_member)) do |f|
31 49 = f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, :class => "project-access-select", :disabled => !allow_admin
32   -
33   -
34   -
35   -%div.prepend-top-20
36   - - unless user.skype.empty?
37   - %p
38   - %b Skype:
39   - = user.skype
40   -
41   - - unless user.linkedin.empty?
42   - %p
43   - %b LinkedIn:
44   - = user.linkedin
45   -
46   - - unless user.twitter.empty?
47   - %p
48   - %b Twitter:
49   - = user.twitter
50   - - unless user.bio.empty?
51   - %p
52   - %b Bio:
53   - = user.bio
54   -
55   -= render user.recent_events.limit(3)
56   -
57   -
58   -- if can? current_user, :admin_project, @project
59   - .actions
60   - = link_to 'Remove from team', project_team_member_path(:project_id => @project, :id => @team_member.id), :confirm => 'Are you sure?', :method => :delete, :class => "btn danger"
  50 + %hr
  51 + = render user.recent_events.limit(3)
  52 + - if can? current_user, :admin_project, @project
  53 + .actions
  54 + = link_to 'Remove from team', project_team_member_path(:project_id => @project, :id => @team_member.id), :confirm => 'Are you sure?', :method => :delete, :class => "btn danger"
61 55  
62 56 :javascript
63 57 $(function(){
... ...