summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-26 20:02:35 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-26 20:02:35 +0100
commit6d5cc233d0db71f826a27c9151d0af121d0fe616 (patch)
tree792333a0994192c693477717cd3f90482d5b94f5 /app
parentbb3d50c173a4dc0f88f102582eb107782c50858d (diff)
Changed the way the avatar is rendered and replaced e-mail address with
e-mail.
Diffstat (limited to 'app')
-rw-r--r--app/views/users/show.html.haml10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 7d32cca..68fdc9d 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -3,7 +3,15 @@
.row
.span3
- cache(['user_show_aside', I18n.locale, @user, @user.sip_accounts, @user.conferences]) do
- = image_tag @user.image_url(:small).to_s, :class => 'img-rounded' if @user.image? && @user.image_url(:small)
+
+ - if @user.image? && @user.image_url(:profile)
+ %span.hidden-phone
+ %ul.thumbnails
+ %li.span3
+ %div.thumbnail
+ %a.thumbnail{:href => @user.image_url(:profile).to_s}
+ =image_tag(@user.image_url(:profile), :alt => "Avatar #{@user}")
+
%table{:class => 'table table-striped'}
%tbody
%tr