From 18ed88c7e3c789366f6e5443dc4ee0bc981a4b88 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 20:18:16 +0100 Subject: Started the migration to Twitter Bootstrap. --- app/views/users/show.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/views/users/show.html.haml') 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? -- cgit v1.2.3 From f8bc860750f06ab95f9ced8e919e846d3e589819 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 00:02:03 +0100 Subject: Icons --- app/views/users/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/users/show.html.haml') diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 75eaf54..4c39fd1 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -3,7 +3,7 @@ .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 -- cgit v1.2.3