summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 00:02:03 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-22 00:02:50 +0100
commitf8bc860750f06ab95f9ced8e919e846d3e589819 (patch)
treeb3974a58deabe6a989ad7352f10e75d7495cb0c5 /app/views
parent25f7eec8c93630650c2b5f980712261a14b00def (diff)
Icons
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/_navbar.html.haml9
-rw-r--r--app/views/users/show.html.haml2
2 files changed, 10 insertions, 1 deletions
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index d6a8422..d6f08cb 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -19,6 +19,15 @@
- if current_user
%ul.nav.pull-right
+ %li
+ - if current_user.image?
+ =image_tag(current_user.image_url(:mini).to_s, :class => 'img-rounded')
+ - else
+ - if current_user.male?
+ = image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
+ - else
+ = image_tag 'icons/user-female-16x.png', :class => 'img-rounded'
+
- if current_page?(tenant_user_path(current_user.current_tenant, current_user))
%li.active
%a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)}
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