Merge pull request #3835 from asphxia/3828-unify-tooltip-format-streams

streamline / unify "hide" and "ignore" option

Changelog.md

@@ -27,7 +27,7 @@
 * Re-add hovercards [#3802](https://github.com/diaspora/diaspora/pull/3802)
 * Add images to notifications [#3821](https://github.com/diaspora/diaspora/pull/3821)
 * Show pod version in footer and updated the link to the changelog [#3822](https://github.com/diaspora/diaspora/pull/3822)
-* User interface enhancements [#3832](https://github.com/diaspora/diaspora/pull/3832), [#3839](https://github.com/diaspora/diaspora/pull/3839), [#3834](https://github.com/diaspora/diaspora/pull/3834), [#3840](https://github.com/diaspora/diaspora/issues/3840), [#3846](https://github.com/diaspora/diaspora/issues/3846), [#3851](https://github.com/diaspora/diaspora/issues/3851).
+* User interface enhancements [#3832](https://github.com/diaspora/diaspora/pull/3832), [#3839](https://github.com/diaspora/diaspora/pull/3839), [#3834](https://github.com/diaspora/diaspora/pull/3834), [#3840](https://github.com/diaspora/diaspora/issues/3840), [#3846](https://github.com/diaspora/diaspora/issues/3846), [#3851](https://github.com/diaspora/diaspora/issues/3851), [#3828](https://github.com/diaspora/diaspora/issues/3828).
 
 ## Bug Fixes
 

app/assets/javascripts/app/views/stream_post_views.js

@@ -20,7 +20,7 @@ app.views.StreamPost = app.views.Post.extend({
     "click .block_user": "blockUser"
   },
 
-  tooltipSelector : ".delete, .block_user, .post_scope",
+  tooltipSelector : ".delete, .block_user, .post_scope, .ignore",
 
   initialize : function(){
     this.model.bind('remove', this.remove, this);

app/assets/templates/stream-element_tpl.jst.hbs

@@ -4,7 +4,7 @@
     <div class="controls">
       {{#unless authorIsCurrentUser}}
         <a href="#" rel="nofollow" class="block_user">
-          <img src="{{imageUrl "icons/ignoreuser.png"}}" alt="Ignoreuser" class="control_icon" title="{{t "ignore"}}" />
+          <img src="{{imageUrl "icons/ignoreuser.png"}}" alt="Ignoreuser" class="ignore control_icon" title="{{t "ignore"}}" />
         </a>
         <a href="#" rel="nofollow" class="hide_post">
           <img src="{{imageUrl "deletelabel.png"}}" class="delete control_icon" title="{{t "stream.hide"}}" />