diff --git a/Changelog.md b/Changelog.md
index f3f92c0a9..f850254e3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -34,6 +34,7 @@
* New menu for the mobile version [#4673](https://github.com/diaspora/diaspora/pull/4673)
* Added comment count to statistic to enable calculations of posts/comments ratios [#4799](https://github.com/diaspora/diaspora/pull/4799)
* Add filters to notifications controller [#4814](https://github.com/diaspora/diaspora/pull/4814)
+* Activate hovercards in SPV and conversations [#4870](https://github.com/diaspora/diaspora/pull/4870)
# 0.3.0.3
diff --git a/app/assets/javascripts/app/pages/single-post-viewer.js b/app/assets/javascripts/app/pages/single-post-viewer.js
index a9d29030f..16403f891 100644
--- a/app/assets/javascripts/app/pages/single-post-viewer.js
+++ b/app/assets/javascripts/app/pages/single-post-viewer.js
@@ -34,7 +34,6 @@ app.pages.SinglePostViewer = app.views.Base.extend({
var html_title = app.helpers.textFormatter(this.model.get("title"), this.model);
//... and converts html to plain text
document.title = $('
').html(html_title).text();
- app.hovercard.deactivate() // No hovercards for now.
}
},
diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index baaeeedac..fd426f9f6 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -26,6 +26,7 @@ module PeopleHelper
def person_link(person, opts={})
opts[:class] ||= ""
opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
+ opts[:class] << " hovercardable" if defined?(user_signed_in?) && user_signed_in? && current_user.person != person
remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe
"
#{h(person.name)}".html_safe
end
@@ -39,6 +40,9 @@ module PeopleHelper
if opts[:to] == :photos
link_to person_image_tag(person, opts[:size]), person_photos_path(person)
else
+ opts[:class] ||= ""
+ opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
+ opts[:class] << " hovercardable" if defined?(user_signed_in?) && user_signed_in? && current_user.person != person
remote_or_hovercard_link = Rails.application.routes.url_helpers.person_path(person).html_safe
"
#{person_image_tag(person, opts[:size])}