diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-26 20:02:35 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-26 20:02:35 +0100 |
commit | 6d5cc233d0db71f826a27c9151d0af121d0fe616 (patch) | |
tree | 792333a0994192c693477717cd3f90482d5b94f5 | |
parent | bb3d50c173a4dc0f88f102582eb107782c50858d (diff) |
Changed the way the avatar is rendered and replaced e-mail address with
e-mail.
-rw-r--r-- | app/views/users/show.html.haml | 10 | ||||
-rw-r--r-- | config/locales/views/users/de.yml | 6 | ||||
-rw-r--r-- | config/locales/views/users/en.yml | 6 |
3 files changed, 15 insertions, 7 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 7d32cca..68fdc9d 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -3,7 +3,15 @@ .row .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) + + - if @user.image? && @user.image_url(:profile) + %span.hidden-phone + %ul.thumbnails + %li.span3 + %div.thumbnail + %a.thumbnail{:href => @user.image_url(:profile).to_s} + =image_tag(@user.image_url(:profile), :alt => "Avatar #{@user}") + %table{:class => 'table table-striped'} %tbody %tr diff --git a/config/locales/views/users/de.yml b/config/locales/views/users/de.yml index 7cdaf68..28f0591 100644 --- a/config/locales/views/users/de.yml +++ b/config/locales/views/users/de.yml @@ -10,7 +10,7 @@ de: index: page_title: 'User' user_name: 'User-Name' - email: 'E-Mail Adresse' + email: 'E-Mail' first_name: 'Vorname' middle_name: 'Zweiter Vorname' last_name: 'Nachname' @@ -29,7 +29,7 @@ de: show: page_title: 'User anzeigen' user_name: 'User-Name' - email: 'E-Mail Adresse' + email: 'E-Mail' first_name: 'Vorname' middle_name: 'Zweiter Vorname' last_name: 'Nachname' @@ -52,7 +52,7 @@ de: label: 'User-Name' hint: '' email: - label: 'E-Mail Adresse' + label: 'E-Mail' hint: '' password: label: 'Passwort' diff --git a/config/locales/views/users/en.yml b/config/locales/views/users/en.yml index 29bae82..7dfa596 100644 --- a/config/locales/views/users/en.yml +++ b/config/locales/views/users/en.yml @@ -10,7 +10,7 @@ en: index: page_title: 'Users' user_name: 'Username' - email: 'E-mail address' + email: 'E-mail' first_name: 'First name' middle_name: 'Middle name' last_name: 'Last name' @@ -29,7 +29,7 @@ en: show: page_title: 'Show User' user_name: 'Username' - email: 'E-mail address' + email: 'E-mail' first_name: 'First name' middle_name: 'Middle name' last_name: 'Last name' @@ -52,7 +52,7 @@ en: label: 'Username' hint: '' email: - label: 'E-mail address' + label: 'E-mail' hint: '' password: label: 'Password' |