Merge branch 'develop' of https://github.com/amooma/GS5 into develop

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 }