summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-18 20:29:12 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-18 20:29:12 +0100
commit022f8458e18c7091e1e1dd25bf53f78867354757 (patch)
tree761aa11bd69e5ca1a7ef8edfd8d81478e6bafdfe /app
parent9c392982e2ba7eaeb237268e9299637a8f8b4c3a (diff)
parent50dfb97590e30fd7d6fa24d6c7afd65d04fa60d8 (diff)
Merge branch 'improve-phone_book_entries-show-view' into develop
Diffstat (limited to 'app')
-rw-r--r--app/models/tenant.rb2
-rw-r--r--app/views/phone_book_entries/_index_core.de.html.haml6
-rw-r--r--app/views/phone_book_entries/_index_core.html.haml6
-rw-r--r--app/views/phone_book_entries/show.html.haml26
4 files changed, 16 insertions, 24 deletions
diff --git a/app/models/tenant.rb b/app/models/tenant.rb
index 66e50d3..d9351b7 100644
--- a/app/models/tenant.rb
+++ b/app/models/tenant.rb
@@ -226,7 +226,7 @@ class Tenant < ActiveRecord::Base
:description => "Hersteller von Gemeinschaft. Kommerziellen Support und Consulting für Gemeinschaft.",
:homepage_organization => 'http://amooma.de',
:twitter_account => 'amooma_de',
- :facebook_account => 'https://www.facebook.com/AMOOMA.GmbH',
+ :facebook_account => 'AMOOMA.GmbH',
)
amooma.phone_numbers.create(
:name => 'Office',
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