diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 00:04:03 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 00:04:03 +0100 |
| commit | ab63774d954fe1f967a97ffe5a0a66016eca2257 (patch) | |
| tree | b3974a58deabe6a989ad7352f10e75d7495cb0c5 /app/views/users/show.html.haml | |
| parent | 495bbfdf78206c8adaec057e83900dda6754092c (diff) | |
| parent | f8bc860750f06ab95f9ced8e919e846d3e589819 (diff) | |
Merge branch 'tb-css' into develop
Diffstat (limited to 'app/views/users/show.html.haml')
| -rw-r--r-- | app/views/users/show.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 9a0ae02..4c39fd1 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -1,9 +1,9 @@ -- title "User: #{@user}" +- content_for :title, "User: #{@user}" -#user-show - %aside +.row + .span3 - cache(['user_show_aside', I18n.locale, @user, @user.sip_accounts, @user.conferences]) do - = image_tag @user.image_url(:small).to_s, class: 'display' if @user.image? && @user.image_url(:small) + = image_tag @user.image_url(:small).to_s, :class => 'img-rounded' if @user.image? && @user.image_url(:small) %p %strong= t('users.show.user_name') + ":" = @user.user_name @@ -40,7 +40,7 @@ =link_to conference, edit_user_conference_path(@user, conference) - %section + .span9 = render :partial => 'phone_books', :locals => {:user => @user, :phone_books => @phone_books} - if current_user.user_groups.where(:name => 'Admins').any? |