summaryrefslogtreecommitdiff
path: root/app/views/users/show.html.haml
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-21 20:18:16 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 00:02:50 +0100
commit18ed88c7e3c789366f6e5443dc4ee0bc981a4b88 (patch)
tree847f179022a2c69c1b641fcb2aa474f168877649 /app/views/users/show.html.haml
parent495bbfdf78206c8adaec057e83900dda6754092c (diff)
Started the migration to Twitter Bootstrap.
Diffstat (limited to 'app/views/users/show.html.haml')
-rw-r--r--app/views/users/show.html.haml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 9a0ae02..75eaf54 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,7 +1,7 @@
-- 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)
%p
@@ -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?