Unverified Commit a358bf7b authored by flaburgan's avatar flaburgan Committed by Benjamin Neff

Move the notification to be the first icon on the left

closes #7592
parent 98cccda6
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
* Remove reference from reshares when original post is deleted [#7578](https://github.com/diaspora/diaspora/pull/7578) * 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) * 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) * 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 ## Bug fixes
* Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579) * Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
......
...@@ -3,12 +3,6 @@ ...@@ -3,12 +3,6 @@
<i class="entypo-trash"></i> <i class="entypo-trash"></i>
</a> </a>
{{else}} {{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}} {{#if participation}}
<a href="#" rel="nofollow" class="destroy_participation" title="{{t "stream.disable_post_notifications"}}"> <a href="#" rel="nofollow" class="destroy_participation" title="{{t "stream.disable_post_notifications"}}">
<i class="entypo-bell"></i> <i class="entypo-bell"></i>
...@@ -18,6 +12,12 @@ ...@@ -18,6 +12,12 @@
<i class="entypo-bell"></i> <i class="entypo-bell"></i>
</a> </a>
{{/if}} {{/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"}}"> <a href="#" rel="nofollow" class="delete hide_post" title="{{t "stream.hide"}}">
<i class="entypo-cross"></i> <i class="entypo-cross"></i>
</a> </a>
......
...@@ -5,12 +5,6 @@ ...@@ -5,12 +5,6 @@
<i class="entypo-trash"></i> <i class="entypo-trash"></i>
</a> </a>
{{else}} {{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}} {{#if participation}}
<a href="#" data-type="nofollow" class="destroy_participation" title="{{t "stream.disable_post_notifications"}}"> <a href="#" data-type="nofollow" class="destroy_participation" title="{{t "stream.disable_post_notifications"}}">
<i class="entypo-bell"></i> <i class="entypo-bell"></i>
...@@ -20,6 +14,12 @@ ...@@ -20,6 +14,12 @@
<i class="entypo-bell"></i> <i class="entypo-bell"></i>
</a> </a>
{{/if}} {{/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"}}"> <a href="#" data-type="post" class="hide_post" title="{{t "stream.hide"}}">
<i class="entypo-cross"></i> <i class="entypo-cross"></i>
</a> </a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment