diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-05-31 08:16:43 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-05-31 08:16:43 -0400 |
| commit | 9723d7285df1ef74f572c07016b11dd1c692ad33 (patch) | |
| tree | 29ed4f4627f0e8cf5b5bad6d2b721410adbc797b /src/components/notifications/notifications.vue | |
| parent | bf7190bfca5221d0f81b34f5b7238ca4e9d1380c (diff) | |
| parent | 960577ca28853dfc7a2082e38498290a84749a05 (diff) | |
Merge branch 'feature/notification-improvements' into 'develop'
Feature/notification improvements
See merge request !79
Diffstat (limited to 'src/components/notifications/notifications.vue')
| -rw-r--r-- | src/components/notifications/notifications.vue | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index a326e9cd..256d6f7a 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -11,19 +11,30 @@ <a :href="notification.action.user.statusnet_profile_url"> <img class='avatar' :src="notification.action.user.profile_image_url_original"> </a> - <div class='text'> - <timeago :since="notification.action.created_at" :auto-update="240"></timeago> + <div class='text' style="width: 100%;"> <div v-if="notification.type === 'favorite'"> - <h1>{{ notification.action.user.name }}<br><i class="fa icon-star"></i> favorited your <router-link :to="{ name: 'conversation', params: { id: notification.status.id } }">status</router-link></h1> - <p>{{ notification.status.text }}</p> + <h1> + {{ notification.action.user.name }} + <i class="fa icon-star"></i> + <small><router-link :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small> + </h1> + <div v-html="notification.status.statusnet_html"></div> </div> <div v-if="notification.type === 'repeat'"> - <h1>{{ notification.action.user.name }}<br><i class="fa icon-retweet"></i> repeated your <router-link :to="{ name: 'conversation', params: { id: notification.status.id } }">status</router-link></h1> - <p>{{ notification.status.text }}</p> + <h1> + {{ notification.action.user.name }} + <i class="fa icon-retweet lit"></i> + <small><router-link :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small> + </h1> + <div v-html="notification.status.statusnet_html"></div> </div> <div v-if="notification.type === 'mention'"> - <h1>{{ notification.action.user.name }}<br><i class="fa icon-reply"></i> <router-link :to="{ name: 'conversation', params: { id: notification.status.id } }">mentioned</router-link> you</h1> - <p>{{ notification.status.text }}</p> + <h1> + {{ notification.action.user.name }} + <i class="fa icon-reply lit"></i> + <small><router-link :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small> + </h1> + <status :compact="true" :statusoid="notification.status"></status> </div> </div> </div> |