github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 05:52:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Always show button to mark notifications as read.

Browse Source
This commit is contained in:
Guo Xiang Tan 2016-04-27 13:57:10 +08:00
parent 9fdea6cd46
commit 8df69dba83
No known key found for this signature in database
GPG Key ID: 19C321C8952B0F72
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/user-notifications.js.es6
View File

@ -5,8 +5,6 @@ export default Ember.ArrayController.extend({
this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
}.observes("model.canLoadMore"),
showDismissButton: Ember.computed.gt('user.total_unread_notifications', 0),
currentPath: Em.computed.alias('controllers.application.currentPath'),
actions: {

16
app/assets/javascripts/discourse/templates/user/notifications-index.hbs
View File

@ -8,20 +8,16 @@
</div>
{{/if}}
{{#if showDismissButton}}
<div class='notification-buttons'>
<button title="{{i18n 'user.dismiss_notifications_tooltip'}}" id='dismiss-notifications-top' class='btn notifications-read' {{action "resetNew"}}>{{i18n 'user.dismiss_notifications'}}</button>
</div>
{{/if}}
<div class='notification-buttons'>
<button title="{{i18n 'user.dismiss_notifications_tooltip'}}" id='dismiss-notifications-top' class='btn notifications-read' {{action "resetNew"}}>{{i18n 'user.dismiss_notifications'}}</button>
</div>
{{user-notifications-large notifications=model}}
{{#conditional-loading-spinner condition=loading}}
{{#unless model.canLoadMore}}
{{#if showDismissButton}}
<div class='notification-buttons'>
<button title="{{i18n 'user.dismiss_notifications_tooltip'}}" id='dismiss-notifications' class='btn notifications-read' {{action "resetNew"}}>{{i18n 'user.dismiss_notifications'}}</button>
</div>
{{/if}}
<div class='notification-buttons'>
<button title="{{i18n 'user.dismiss_notifications_tooltip'}}" id='dismiss-notifications' class='btn notifications-read' {{action "resetNew"}}>{{i18n 'user.dismiss_notifications'}}</button>
</div>
{{/unless}}
{{/conditional-loading-spinner}}