diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-24 23:04:36 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-24 23:04:36 +0000 |
| commit | 673f0fca3f7898641cdc488e6e6cc9033ca51777 (patch) | |
| tree | a92128b2779b3971d15699b4410c37687446d480 /src/components/notifications/notifications.vue | |
| parent | 55650ff7ea9867cdb8adf7077b36bbb8c7bfcb75 (diff) | |
| parent | fe906cc3f0c8388bcb2a33be9c72ca5365bde0a5 (diff) | |
Merge branch 'notifications' into 'develop'
Support qvitter api notifications
Closes #129
See merge request pleroma/pleroma-fe!306
Diffstat (limited to 'src/components/notifications/notifications.vue')
| -rw-r--r-- | src/components/notifications/notifications.vue | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index 4fa6e925..a0b0e5f5 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -3,7 +3,10 @@ <div class="panel panel-default"> <div class="panel-heading"> <span class="unseen-count" v-if="unseenCount">{{unseenCount}}</span> - {{$t('notifications.notifications')}} + <div class="title"> {{$t('notifications.notifications')}}</div> + <div @click.prevent class="loadmore-error alert error" v-if="error"> + {{$t('timeline.error_fetching')}} + </div> <button v-if="unseenCount" @click.prevent="markAsSeen" class="read-button">{{$t('notifications.read')}}</button> </div> <div class="panel-body"> @@ -11,6 +14,12 @@ <notification :notification="notification"></notification> </div> </div> + <div class="panel-footer"> + <a href="#" v-on:click.prevent='fetchOlderNotifications()' v-if="!notifications.loading"> + <div class="new-status-notification text-center panel-footer">{{$t('notifications.load_older')}}</div> + </a> + <div class="new-status-notification text-center panel-footer" v-else>...</div> + </div> </div> </div> </template> |