Commit b8e81e558f4387b4ab4fed6594594ac29a7adec2
1 parent
f7b46fa5
Exists in
spb-stable
and in
3 other branches
Show avatars of groups on profile screen that user belongs to
Showing
4 changed files
with
16 additions
and
0 deletions
Show diff stats
app/assets/javascripts/profile.js.coffee
@@ -26,3 +26,5 @@ $ -> | @@ -26,3 +26,5 @@ $ -> | ||
26 | form = $(this).closest("form") | 26 | form = $(this).closest("form") |
27 | filename = $(this).val().replace(/^.*[\\\/]/, '') | 27 | filename = $(this).val().replace(/^.*[\\\/]/, '') |
28 | form.find(".js-avatar-filename").text(filename) | 28 | form.find(".js-avatar-filename").text(filename) |
29 | + | ||
30 | + $('.profile-groups-avatars').tooltip("placement": "top") | ||
29 | \ No newline at end of file | 31 | \ No newline at end of file |
app/assets/stylesheets/sections/profile.scss
app/views/users/show.html.haml
@@ -13,6 +13,8 @@ | @@ -13,6 +13,8 @@ | ||
13 | %br | 13 | %br |
14 | %small member since #{@user.created_at.stamp("Nov 12, 2031")} | 14 | %small member since #{@user.created_at.stamp("Nov 12, 2031")} |
15 | .clearfix | 15 | .clearfix |
16 | + %h4 Groups: | ||
17 | + = render 'groups', groups: @user.groups | ||
16 | %hr | 18 | %hr |
17 | %h4 User Activity: | 19 | %h4 User Activity: |
18 | = render @events | 20 | = render @events |