deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

team profile restyled

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-04-02 21:13:44 +03:00
parent a264ef2f03
commit c40c627a3b
2 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/stylesheets/common.scss
View file

@ -370,12 +370,12 @@ img.lil_av {
.profile_avatar_holder { .profile_avatar_holder {
float:left; float:left;
width:90px; width:60px;
height:90px; height:60px;
margin-right:20px; margin-right:20px;
img { img {
width:90px; width:60px;
height:90px; height:60px;
background:#eee; background:#eee;
} }
} }
@ -1173,3 +1173,9 @@ li.note {
.wiki_content code, .readme code{ .wiki_content code, .readme code{
background-color: inherit; background-color: inherit;
} }
.team_member_show {
td:first-child {
color:#aaa;
}
}

102
app/views/team_members/show.html.haml
View file

@ -1,63 +1,57 @@
- allow_admin = can? current_user, :admin_project, @project - allow_admin = can? current_user, :admin_project, @project
- user = @team_member.user - user = @team_member.user
.row .team_member_show
.span8 .profile_avatar_holder
.profile_avatar_holder = image_tag gravatar_icon(user.email, 60), :class => "borders"
= image_tag gravatar_icon(user.email, 90), :class => "styled_image" %h3
%h3 = user.name
= user.name %small
%br = user.email
%small %hr
= user.email .back_link
%br %br
.back_link = link_to team_project_path(@project), :class => "" do
%br ← To team list
= link_to team_project_path(@project), :class => "" do %br
← To team list .row
.span8
.span8.right %table.no-borders
%div %tr
%div %td Email
%h5.cgray %td= mail_to user.email
Member since: %tr
%span.right %td Skype
= @team_member.created_at.stamp("Aug 21, 2011") %td= user.skype
%h5.cgray - unless user.linkedin.blank?
Project Access: %tr
%small (#{link_to "read more", help_permissions_path, :class => "vlink"}) %td LinkedIn
%span.right %td= user.linkedin
- unless user.twitter.blank?
%tr
%td Twitter
%td= user.twitter
- unless user.bio.blank?
%tr
%td Bio
%td= user.bio
.span8
%table.no-borders
%tr
%td Member since
%td= @team_member.created_at.stamp("Aug 21, 2011")
%tr
%td
Project Access:
%small (#{link_to "read more", help_permissions_path, :class => "vlink"})
%td
= form_for(@team_member, :as => :team_member, :url => project_team_member_path(@project, @team_member)) do |f| = form_for(@team_member, :as => :team_member, :url => project_team_member_path(@project, @team_member)) do |f|
= f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, :class => "project-access-select", :disabled => !allow_admin = f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, :class => "project-access-select", :disabled => !allow_admin
%hr
= render user.recent_events.limit(3)
- if can? current_user, :admin_project, @project
%div.prepend-top-20 .actions
- unless user.skype.empty? = 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"
%p
%b Skype:
= user.skype
- unless user.linkedin.empty?
%p
%b LinkedIn:
= user.linkedin
- unless user.twitter.empty?
%p
%b Twitter:
= user.twitter
- unless user.bio.empty?
%p
%b Bio:
= user.bio
= render user.recent_events.limit(3)
- if can? current_user, :admin_project, @project
.actions
= 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"
:javascript :javascript
$(function(){ $(function(){