diff options
author | Joas Schilling <coding@schilljs.com> | 2020-10-02 15:05:41 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2020-10-02 15:14:00 +0300 |
commit | 97f9b18e9e03d62790804570127c1e136dd9b29b (patch) | |
tree | cd399bf273edce810a42a2464e81507d5ef8aae3 /apps/user_status/src | |
parent | 0afccb5d9ad0fdf88c7b991f04be4bd1d3b135c9 (diff) |
Show the full status and icon all the time
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/user_status/src')
-rw-r--r-- | apps/user_status/src/views/Dashboard.vue | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/apps/user_status/src/views/Dashboard.vue b/apps/user_status/src/views/Dashboard.vue index 80f9385db78..f92c6716a39 100644 --- a/apps/user_status/src/views/Dashboard.vue +++ b/apps/user_status/src/views/Dashboard.vue @@ -24,6 +24,20 @@ id="user-status_panel" :items="items" :loading="loading"> + <template v-slot:default="{ item }"> + <DashboardWidgetItem + :main-text="item.mainText" + :sub-text="item.subText"> + <template v-slot:avatar> + <Avatar + class="item-avatar" + :size="44" + :user="item.avatarUsername" + :display-name="item.mainText" + :show-user-status-compact="false" /> + </template> + </DashboardWidgetItem> + </template> <template v-slot:empty-content> <EmptyContent id="user_status-widget-empty-content" @@ -35,7 +49,8 @@ </template> <script> -import { DashboardWidget } from '@nextcloud/vue-dashboard' +import { DashboardWidget, DashboardWidgetItem } from '@nextcloud/vue-dashboard' +import Avatar from '@nextcloud/vue/dist/Components/Avatar' import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent' import { loadState } from '@nextcloud/initial-state' import moment from '@nextcloud/moment' @@ -43,7 +58,9 @@ import moment from '@nextcloud/moment' export default { name: 'Dashboard', components: { + Avatar, DashboardWidget, + DashboardWidgetItem, EmptyContent, }, data() { @@ -56,13 +73,21 @@ export default { items() { return this.statuses.map((item) => { const icon = item.icon || '' - const message = item.message || '' - const status = item.status === 'dnd' ? `${icon} ${message}` : message + let message = item.message || '' + if (message === '') { + if (item.status === 'away') { + message = t('user_status', 'Away') + } + if (item.status === 'dnd') { + message = t('user_status', 'Do not disturb') + } + } + const status = item.icon !== '' ? `${icon} ${message}` : message let subText - if (item.icon === null && item.message === null && item.timestamp === null) { + if (item.icon === null && message === '' && item.timestamp === null) { subText = '' - } else if (item.icon === null && item.message === null && item.timestamp !== null) { + } else if (item.icon === null && message === '' && item.timestamp !== null) { subText = moment(item.timestamp, 'X').fromNow() } else if (item.timestamp !== null) { subText = this.t('user_status', '{status}, {timestamp}', { |