upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Show the full status and icon all the time

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2020-10-02 14:05:41 +02:00
parent 0afccb5d9a
commit 97f9b18e9e
No known key found for this signature in database
GPG key ID: 7076EA9751AACDDA
9 changed files with 42 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/user_status/js/dashboard.js
View file

File diff suppressed because one or more lines are too long

2
apps/user_status/js/dashboard.js.map
View file

File diff suppressed because one or more lines are too long

4
apps/user_status/js/user-status-menu.js
View file

File diff suppressed because one or more lines are too long

2
apps/user_status/js/user-status-menu.js.map
View file

File diff suppressed because one or more lines are too long

4
apps/user_status/js/user-status-modal.js
View file

File diff suppressed because one or more lines are too long

2
apps/user_status/js/user-status-modal.js.map
View file

File diff suppressed because one or more lines are too long

4
apps/user_status/js/vendors-user-status-modal.js
View file

File diff suppressed because one or more lines are too long

2
apps/user_status/js/vendors-user-status-modal.js.map
View file

File diff suppressed because one or more lines are too long

35
apps/user_status/src/views/Dashboard.vue
View file

@ -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}', {