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

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

Browse source 
streamline / unify "hide" and "ignore" option
This commit is contained in:
Jonne Haß 2013-01-18 11:14:50 -08:00
commit bbaa94f3a5
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) * Re-add hovercards [#3802](https://github.com/diaspora/diaspora/pull/3802)
* Add images to notifications [#3821](https://github.com/diaspora/diaspora/pull/3821) * 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) * 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 ## 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" "click .block_user": "blockUser"
}, },
tooltipSelector : ".delete, .block_user, .post_scope", tooltipSelector : ".delete, .block_user, .post_scope, .ignore",
initialize : function(){ initialize : function(){
this.model.bind('remove', this.remove, this); 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"> <div class="controls">
{{#unless authorIsCurrentUser}} {{#unless authorIsCurrentUser}}
<a href="#" rel="nofollow" class="block_user"> <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>
<a href="#" rel="nofollow" class="hide_post"> <a href="#" rel="nofollow" class="hide_post">
<img src="{{imageUrl "deletelabel.png"}}" class="delete control_icon" title="{{t "stream.hide"}}" /> <img src="{{imageUrl "deletelabel.png"}}" class="delete control_icon" title="{{t "stream.hide"}}" />