diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-21 04:30:57 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-21 04:30:57 +0000 |
commit | 6cf189f0a92772b9174f913e7c74a4889d54e9a6 (patch) | |
tree | 2fa10fd745c2e1e012c22db6f02593db85ae36a0 /app/views | |
parent | 222e53a026fc4470737d03c358db97cf11c5e029 (diff) | |
parent | beece83af1788e587dc6e14c6feb1dea5c8f9b97 (diff) | |
download | gitlab-ce-6cf189f0a92772b9174f913e7c74a4889d54e9a6.tar.gz |
Merge branch 'improve-avatar-header' into 'master'
Improve header with avatar for group and user pages
Nice looking and aligned headers for user and group pages
See merge request !412
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/groups/show.html.haml | 15 | ||||
-rw-r--r-- | app/views/users/_profile.html.haml | 4 | ||||
-rw-r--r-- | app/views/users/show.html.haml | 32 |
3 files changed, 26 insertions, 25 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 25efe973d4f..8df9366ecbe 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -1,12 +1,13 @@ .dashboard - %div + .header-with-avatar.clearfix = image_tag group_icon(@group), class: "avatar group-avatar s90" - .clearfix - %h2 - = @group.name - - if @group.description.present? - %p - = escaped_autolink(@group.description) + %h3 + = @group.name + .username + @#{@group.path} + - if @group.description.present? + .description + = escaped_autolink(@group.description) %hr .row %section.activities.col-md-8 diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml index a073e5048e7..bca71444956 100644 --- a/app/views/users/_profile.html.haml +++ b/app/views/users/_profile.html.haml @@ -25,7 +25,3 @@ %li %span.light Location: %strong= user.location - - unless user.bio.blank? - %li - %span.light Bio: - %span= user.bio diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 6d6beb58711..fd96020d129 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -2,24 +2,28 @@ = link_to '#aside', class: 'show-aside' do %i.fa.fa-angle-left %section.col-md-8 - %h3.page-title + .header-with-avatar = image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: '' - = @user.name - - if @user == current_user - .pull-right - = link_to profile_path, class: 'btn' do - %i.fa.fa-pencil-square-o - Edit Profile settings - %br - %span.user-show-username #{@user.username} - %br - %small member since #{@user.created_at.stamp("Nov 12, 2031")} + %h3 + = @user.name + - if @user == current_user + .pull-right + = link_to profile_path, class: 'btn btn-sm' do + %i.fa.fa-pencil-square-o + Edit Profile settings + .username + @#{@user.username} + .description + - if @user.bio.present? + = @user.bio + .clearfix - if @groups.any? - %h4 Groups - = render 'groups', groups: @groups - %hr + .prepend-top-20 + %h4 Groups + = render 'groups', groups: @groups + %hr .hidden-xs .user-calendar |