summaryrefslogtreecommitdiff
path: root/app/views/users/show.html.haml
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-23 18:03:06 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-23 18:03:06 +0100
commit398d5706752a583ff8bc3ec9101fc75b507bbb89 (patch)
treea31b27b4cd1a2e05e64199814ca0ab92eb177a62 /app/views/users/show.html.haml
parente5db9179c75b6b6176e4f5b67ff94a10122ecfbd (diff)
parent4cad2a069fcead88579373a285a0516a3d500c43 (diff)
Merge branch 'develop' of https://github.com/amooma/GS5 into develop
Diffstat (limited to 'app/views/users/show.html.haml')
-rw-r--r--app/views/users/show.html.haml18
1 files changed, 12 insertions, 6 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 4c39fd1..f38a4a1 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -4,12 +4,18 @@
.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)
- %p
- %strong= t('users.show.user_name') + ":"
- = @user.user_name
- %p
- %strong= t('users.show.email') + ":"
- = @user.email
+ %table{:class => 'table table-striped'}
+ %tbody
+ %tr
+ %td
+ %strong= t('users.show.user_name') + ":"
+ %td
+ = @user.user_name
+ %tr
+ %td
+ %strong= t('users.show.email') + ":"
+ %td
+ = @user.email
%p.controls
= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @tenant, :child => @user }