From 418bbd067d8c5de25624330f889911be46710e30 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Wed, 17 Sep 2014 18:27:21 +0300 Subject: [PATCH] Tweak user listing/details --- .../stylesheets/management/_record_table.css.scss | 11 +++++++++++ .../stylesheets/management/_user_details.css.scss | 7 ++++--- app/views/management/users/_about_user.html.slim | 11 ++++++++++- app/views/management/users/_user.html.slim | 6 ++++++ app/views/management/users/index.html.slim | 1 + 5 files changed, 32 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/management/_record_table.css.scss b/app/assets/stylesheets/management/_record_table.css.scss index 9054741..51bbd42 100644 --- a/app/assets/stylesheets/management/_record_table.css.scss +++ b/app/assets/stylesheets/management/_record_table.css.scss @@ -5,6 +5,17 @@ vertical-align: middle !important; } + .picture-placeholder { + @extend .img-thumbnail; + + .glyphicon { + width: 50px; + height: 50px; + font-size: 48px; + text-align: center; + } + } + .actions { @extend .pull-right; @extend .btn-group; diff --git a/app/assets/stylesheets/management/_user_details.css.scss b/app/assets/stylesheets/management/_user_details.css.scss index 4f62aeb..9da4982 100644 --- a/app/assets/stylesheets/management/_user_details.css.scss +++ b/app/assets/stylesheets/management/_user_details.css.scss @@ -6,13 +6,14 @@ } .profile-image { - @extend .img-circle; - max-width: 140px; - max-height: 140px; + @extend .img-thumbnail; + max-width: 171px; + max-height: 180px; } .social { @extend .btn-group; + margin-top: 10px; a { @extend .btn; diff --git a/app/views/management/users/_about_user.html.slim b/app/views/management/users/_about_user.html.slim index 2c4d8eb..d7596e8 100644 --- a/app/views/management/users/_about_user.html.slim +++ b/app/views/management/users/_about_user.html.slim @@ -9,7 +9,10 @@ = image_tag @user.speaker_profile.picture.url, class: "profile-image" h3.media-heading = @user.speaker_profile.name - small< = @user.speaker_profile.organisation + - if @user.speaker_profile.organisation.present? + div + => fa_icon(:briefcase) + = @user.speaker_profile.organisation div.social = link_to "mailto://#{@user.email}" = fa_icon :envelope @@ -25,6 +28,12 @@ h5 = SpeakerProfile.human_attribute_name(:biography) = simple_format @user.speaker_profile.biography + h5 = t :contacts + - if @user.speaker_profile.twitter.present? + p #{fa_icon(:twitter)} @#{@user.speaker_profile.twitter} + - if @user.speaker_profile.public_email.present? + p #{fa_icon(:envelope)} #{@user.speaker_profile.public_email} (#{t(:public)}) + p #{fa_icon(:envelope)} #{@user.email} (#{t(:private)}) p #{glyph(:phone)} #{Phony.format(@user.speaker_profile.mobile_phone, format: :international)} .modal-footer diff --git a/app/views/management/users/_user.html.slim b/app/views/management/users/_user.html.slim index 4724eae..a2f90b0 100644 --- a/app/views/management/users/_user.html.slim +++ b/app/views/management/users/_user.html.slim @@ -1,4 +1,10 @@ tr id="user-#{user.id}" + td + - if user.speaker_profile.present? + = image_tag user.speaker_profile.picture.thumb.url, class: 'img-thumbnail' + - else + .picture-placeholder + = glyph(:user) td = user.email td = user.speaker_profile.try(:first_name) or '-' td = user.speaker_profile.try(:last_name) or '-' diff --git a/app/views/management/users/index.html.slim b/app/views/management/users/index.html.slim index 7f7fe2b..93991d1 100644 --- a/app/views/management/users/index.html.slim +++ b/app/views/management/users/index.html.slim @@ -5,6 +5,7 @@ table.record-table thead tr + th = SpeakerProfile.human_attribute_name(:picture) th = User.human_attribute_name(:email) th = SpeakerProfile.human_attribute_name(:first_name) th = SpeakerProfile.human_attribute_name(:last_name)