diff options
| author | Peter Kozak <spag@golwen.net> | 2012-12-20 10:03:24 +0100 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2012-12-20 10:03:24 +0100 |
| commit | e405bce6ab07f385e32c0d885b1d51ca96bf1ff5 (patch) | |
| tree | 510ced8b7d925f46292ee872d04aaa25a9d0a17f /app/views/phone_book_entries | |
| parent | 6bf23a88899522a52740113a3cfdccc7ae533fca (diff) | |
| parent | 5c270c981a21d9aafaecb3b59b98dfa6a3d9d97f (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/phone_book_entries')
| -rw-r--r-- | app/views/phone_book_entries/_index_core.de.html.haml | 6 | ||||
| -rw-r--r-- | app/views/phone_book_entries/_index_core.html.haml | 6 | ||||
| -rw-r--r-- | app/views/phone_book_entries/show.html.haml | 26 |
3 files changed, 15 insertions, 23 deletions
diff --git a/app/views/phone_book_entries/_index_core.de.html.haml b/app/views/phone_book_entries/_index_core.de.html.haml index 01be65f..0c6e74b 100644 --- a/app/views/phone_book_entries/_index_core.de.html.haml +++ b/app/views/phone_book_entries/_index_core.de.html.haml @@ -28,7 +28,11 @@ %td.extra - if !entry.description.blank? %strong Beschreibung: - %div= entry.description + %div + = entry.description + - if !entry.homepage_organization.blank? + %br + =link_to entry.homepage_organization, entry.homepage_organization - if can? :edit, entry %td= link_to t('phone_book_entries.index.actions.edit'), edit_phone_book_phone_book_entry_path( entry.phone_book, entry ) - if can? :destroy, entry diff --git a/app/views/phone_book_entries/_index_core.html.haml b/app/views/phone_book_entries/_index_core.html.haml index d9cfe10..9054833 100644 --- a/app/views/phone_book_entries/_index_core.html.haml +++ b/app/views/phone_book_entries/_index_core.html.haml @@ -28,7 +28,11 @@ %td.extra - if !entry.description.blank? %strong Description: - %div= entry.description + %div + = entry.description + - if !entry.homepage_organization.blank? + %br + =link_to entry.homepage_organization, entry.homepage_organization - if can? :edit, entry %td= link_to t('phone_book_entries.index.actions.edit'), edit_phone_book_phone_book_entry_path( entry.phone_book, entry ) - if can? :destroy, entry diff --git a/app/views/phone_book_entries/show.html.haml b/app/views/phone_book_entries/show.html.haml index b6e8c6e..a9e1e8f 100644 --- a/app/views/phone_book_entries/show.html.haml +++ b/app/views/phone_book_entries/show.html.haml @@ -114,33 +114,17 @@ .widget.social - if !@phone_book_entry.homepage_organization.blank? .home - %a= @phone_book_entry.homepage_organization + =link_to @phone_book_entry.homepage_organization, @phone_book_entry.homepage_organization %span www - if !@phone_book_entry.homepage_personal.blank? .home - %a= @phone_book_entry.homepage_personal + =link_to @phone_book_entry.homepage_personal, @phone_book_entry.homepage_personal %span www - if !@phone_book_entry.twitter_account.blank? .twitter - %a= @phone_book_entry.twitter_account + =link_to @phone_book_entry.twitter_account, "https://twitter.com/#{@phone_book_entry.twitter_account}" %span Twitter - - if !@phone_book_entry.google_plus_account.blank? - .google_plus - %a= @phone_book_entry.google_plus_account - %span Google+ - if !@phone_book_entry.facebook_account.blank? .facebook - %a= @phone_book_entry.facebook_account - %span Facebook - - if !@phone_book_entry.xing_account.blank? - .xing - %a= @phone_book_entry.xing_account - %span Xing - - if !@phone_book_entry.linkedin_account.blank? - .linkedin - %a= @phone_book_entry.linkedin_account - %span LinkedIn - - if !@phone_book_entry.mobileme_account.blank? - .mobileme - %a= @phone_book_entry.mobileme_account - %span MobileMe + =link_to @phone_book_entry.facebook_account, "https://www.facebook.com/#{@phone_book_entry.facebook_account}" + %span Facebook
\ No newline at end of file |