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

Move the notification to be the first icon on the left

Browse source 
closes #7592
This commit is contained in:
flaburgan 2017-08-27 21:15:49 +02:00 committed by Benjamin Neff
parent 98cccda6ea
commit a358bf7b66
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -8,6 +8,7 @@
* Remove reference from reshares when original post is deleted [#7578](https://github.com/diaspora/diaspora/pull/7578)
* Merge migrations from before 0.6.0.0 to CreateSchema [#7580](https://github.com/diaspora/diaspora/pull/7580)
* Remove auto detection of languages with highlightjs [#7591](https://github.com/diaspora/diaspora/pull/7591)
* Move enable/disable notification icon [#7592](https://github.com/diaspora/diaspora/pull/7592)
## Bug fixes
* Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)

12
app/assets/templates/post-controls_tpl.jst.hbs
View file

@ -3,12 +3,6 @@
<i class="entypo-trash"></i>
</a>
{{else}}
<a href="#" rel="nofollow" data-type="Post" class="post_report" title="{{t "report.name"}}">
<i class="entypo-warning"></i>
</a>
<a href="#" rel="nofollow" class="block_user" title="{{t "ignore"}}">
<i class="entypo-block"></i>
</a>
{{#if participation}}
<a href="#" rel="nofollow" class="destroy_participation" title="{{t "stream.disable_post_notifications"}}">
<i class="entypo-bell"></i>
@ -18,6 +12,12 @@
<i class="entypo-bell"></i>
</a>
{{/if}}
<a href="#" rel="nofollow" data-type="Post" class="post_report" title="{{t "report.name"}}">
<i class="entypo-warning"></i>
</a>
<a href="#" rel="nofollow" class="block_user" title="{{t "ignore"}}">
<i class="entypo-block"></i>
</a>
<a href="#" rel="nofollow" class="delete hide_post" title="{{t "stream.hide"}}">
<i class="entypo-cross"></i>
</a>

12
app/assets/templates/single-post-viewer/single-post-moderation_tpl.jst.hbs
View file

@ -5,12 +5,6 @@
<i class="entypo-trash"></i>
</a>
{{else}}
<a href="#" data-type="Post" class="post_report" title="{{t "report.name"}}">
<i class="entypo-warning"></i>
</a>
<a href="#" data-type="post" class="block_user" title="{{t "ignore"}}">
<i class="entypo-block"></i>
</a>
{{#if participation}}
<a href="#" data-type="nofollow" class="destroy_participation" title="{{t "stream.disable_post_notifications"}}">
<i class="entypo-bell"></i>
@ -20,6 +14,12 @@
<i class="entypo-bell"></i>
</a>
{{/if}}
<a href="#" data-type="Post" class="post_report" title="{{t "report.name"}}">
<i class="entypo-warning"></i>
</a>
<a href="#" data-type="post" class="block_user" title="{{t "ignore"}}">
<i class="entypo-block"></i>
</a>
<a href="#" data-type="post" class="hide_post" title="{{t "stream.hide"}}">
<i class="entypo-cross"></i>
</a>