mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22424 from nextcloud/feature/noid/dnd_will_mute_notifications 

User Status: Display hint that DND mutes all notifications
This commit is contained in:
Georg Ehrke 2020-08-31 17:45:24 +02:00 committed by GitHub
parent 6b9b88f8b7 dbef68b397
commit 6b835e3c1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

8
apps/user_status/src/App.vue
View File

@ -38,15 +38,15 @@
:key="status.type" :key="status.type"
:icon="status.icon" :icon="status.icon"
:close-after-click="true" :close-after-click="true"
:title="status.label"
@click.prevent.stop="changeStatus(status.type)"> @click.prevent.stop="changeStatus(status.type)">
{{ status.label }} {{ status.subline }}
</ActionButton> </ActionButton>
<ActionButton <ActionButton
icon="icon-rename" icon="icon-rename"
:close-after-click="true" :close-after-click="true"
@click.prevent.stop="openModal"> :title="$t('user_status', 'Set custom status')"
{{ $t('user_status', 'Set custom status') }} @click.prevent.stop="openModal" />
</ActionButton>
</Actions> </Actions>
<SetStatusModal <SetStatusModal
v-if="isModalOpen" v-if="isModalOpen"

1
apps/user_status/src/services/statusOptionsService.js
View File

@ -38,6 +38,7 @@ const getAllStatusOptions = () => {
}, { }, {
type: 'dnd', type: 'dnd',
label: t('user_status', 'Do not disturb'), label: t('user_status', 'Do not disturb'),
subline: t('user_status', 'Mute all notifications'),
icon: 'icon-user-status-dnd', icon: 'icon-user-status-dnd',
}, { }, {