Commit fd9a8c36010e6fe9377f75eff044d7551761c2b6
1 parent
a184fcf3
Exists in
spb-stable
and in
3 other branches
Add group avatar to group page. Changed default avatar for group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
3 changed files
with
8 additions
and
4 deletions
Show diff stats
app/assets/images/no_group_avatar.png
app/views/dashboard/_groups.html.haml
| @@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
| 10 | - groups.each do |group| | 10 | - groups.each do |group| |
| 11 | %li.group-row | 11 | %li.group-row |
| 12 | = link_to group_path(id: group.path), class: dom_class(group) do | 12 | = link_to group_path(id: group.path), class: dom_class(group) do |
| 13 | - = image_tag group_icon(group.path), class: "avatar s32" | 13 | + = image_tag group_icon(group.path), class: "avatar s24" |
| 14 | %span.group-name.filter-title | 14 | %span.group-name.filter-title |
| 15 | = truncate(group.name, length: 35) | 15 | = truncate(group.name, length: 35) |
| 16 | %span.arrow | 16 | %span.arrow |
app/views/groups/show.html.haml
| @@ -13,9 +13,13 @@ | @@ -13,9 +13,13 @@ | ||
| 13 | %p.nothing_here_message Project activity will be displayed here | 13 | %p.nothing_here_message Project activity will be displayed here |
| 14 | .loading.hide | 14 | .loading.hide |
| 15 | .side.col-md-4 | 15 | .side.col-md-4 |
| 16 | - - if @group.description.present? | ||
| 17 | - .description-block | ||
| 18 | - = @group.description | 16 | + .light-well.append-bottom-20 |
| 17 | + = image_tag group_icon(@group.path), class: "avatar s90" | ||
| 18 | + .clearfix.light | ||
| 19 | + %h3.page-title | ||
| 20 | + = @group.name | ||
| 21 | + - if @group.description.present? | ||
| 22 | + %p= @group.description | ||
| 19 | = render "projects", projects: @projects | 23 | = render "projects", projects: @projects |
| 20 | .prepend-top-20 | 24 | .prepend-top-20 |
| 21 | = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do | 25 | = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do |