nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #3828: Unify hide and ignore options

Browse source
This commit is contained in:
Asphyxia 2013-01-12 07:57:49 -03:00
parent 9ff9364cae
commit 1af0f4bf2d
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -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

2
app/assets/javascripts/app/views/stream_post_views.js
View file

@ -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);

2
app/assets/templates/stream-element_tpl.jst.hbs
View file

@ -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"}}" />