Merge branch 'stable' into develop

Changelog.md

@@ -83,6 +83,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 
 * Implement NodeInfo [#6239](https://github.com/diaspora/diaspora/pull/6239)
 * Display original author on reshares of NSFW posts [#6270](https://github.com/diaspora/diaspora/pull/6270)
+* Use avatars in hovercards as links to the profile [#6297](https://github.com/diaspora/diaspora/pull/6297)
 
 # 0.5.2.0
 

app/assets/javascripts/app/views/hovercard_view.js

@@ -20,6 +20,7 @@ app.views.Hovercard = app.views.Base.extend({
 
     // cache some element references
     this.avatar = this.$('.avatar');
+    this.avatarLink = this.$("a.person_avatar");
     this.dropdown = this.$('.dropdown_list');
     this.dropdown_container = this.$('#hovercard_dropdown_container');
     this.hashtags = this.$('.hashtags');
@@ -115,6 +116,7 @@ app.views.Hovercard = app.views.Base.extend({
     var self = this;
 
     this.avatar.attr('src', person.avatar);
+    this.avatarLink.attr("href", person.url);
     this.person_link.attr('href', person.url);
     this.person_link.text(person.name);
     this.person_handle.text(person.handle);

app/assets/templates/hovercard_tpl.jst.hbs

@@ -1,5 +1,7 @@
 <div id="hovercard">
-  <img class="avatar">
+  <a class='person_avatar'>
+    <img class="avatar">
+  </a>
   <h4>
     <a class="person"></a>
   </h4>