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

unify ignore and hide #bugmash #monday

Browse source
This commit is contained in:
Steffen van Bergerem 2013-06-11 00:40:35 +02:00
parent d07073cf8e
commit a02fdc6e45
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -19,6 +19,7 @@
* Fix posting to Twitter [#2758](https://github.com/diaspora/diaspora/issues/2758)
* Don't show hovercards for current user in comments [#3999](https://github.com/diaspora/diaspora/issues/3999)
* Replace mentions of out-of-aspect people with markdown links [#4161](https://github.com/diaspora/diaspora/pull/4161)
* Unify hide and ignore [#3828](https://github.com/diaspora/diaspora/issues/3828)
## Features

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

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

3
app/assets/stylesheets/application.css.sass
View file

@ -410,7 +410,8 @@ ul.as-selections
&:hover
.controls:first-child
@include opacity(0.5)
.control_icon
@include opacity(0.5)
.info
:font-size smaller

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

@ -10,15 +10,15 @@
{{#if loggedIn}}
<div class="controls">
{{#unless authorIsCurrentUser}}
<a href="#" rel="nofollow" class="block_user">
<div class="icons-ignoreuser control_icon" title="{{t "ignore"}}"></div>
<a href="#" rel="nofollow" class="block_user" title="{{t "ignore"}}">
<div class="icons-ignoreuser control_icon"></div>
</a>
<a href="#" rel="nofollow" class="delete hide_post">
<div class="icons-deletelabel delete control_icon" title="{{t "stream.hide"}}"/>
<a href="#" rel="nofollow" class="delete hide_post" title="{{t "stream.hide"}}">
<div class="icons-deletelabel delete control_icon"/>
</a>
{{else}}
<a href="#" rel="nofollow" class="delete remove_post">
<div class="icons-deletelabel delete control_icon" title="{{t "delete"}}" />
<a href="#" rel="nofollow" class="delete remove_post" title="{{t "delete"}}">
<div class="icons-deletelabel delete control_icon"/>
</a>
{{/unless}}
</div>