sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(user_status): add link to Availability page if user set predefined 'Vacationing' 

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
pull/47448/head
Maksim Sukharev 2024-08-23 13:59:29 +07:00 committed by Antreesy
parent e2b1de8bc1
commit f23875dcb1
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/src/views/Availability.vue
Unescape Escape View File

@ -4,11 +4,13 @@
-->
<template>
<div>
<NcSettingsSection :name="$t('dav', 'Availability')"
<NcSettingsSection id="availability"
:name="$t('dav', 'Availability')"
:description="$t('dav', 'If you configure your working hours, other people will see when you are out of office when they book a meeting.')">
<AvailabilityForm />
</NcSettingsSection>
<NcSettingsSection v-if="!hideAbsenceSettings"
id="absence"
:name="$t('dav', 'Absence')"
:description="$t('dav', 'Configure your next absence period.')">
<AbsenceForm />

36
apps/user_status/src/components/SetStatusModal.vue
Unescape Escape View File

@ -6,13 +6,14 @@
<template>
<NcModal size="normal"
:name="$t('user_status', 'Set status')"
aria-labelledby="user_status-set-dialog"
:set-return-focus="setReturnFocus"
@close="closeModal">
<div class="set-status-modal">
<!-- Status selector -->
<div class="set-status-modal__header">
<h2>{{ $t('user_status', 'Online status') }}</h2>
</div>
<h2 id="user_status-set-dialog" class="set-status-modal__header">
{{ $t('user_status', 'Online status') }}
</h2>
<div class="set-status-modal__online-status"
role="radiogroup"
:aria-label="$t('user_status', 'Online status')">
@ -25,15 +26,22 @@
<!-- Status message form -->
<form @submit.prevent="saveStatus" @reset="clearStatus">
<div class="set-status-modal__header">
<h2>{{ $t('user_status', 'Status message') }}</h2>
</div>
<h3 class="set-status-modal__header">
{{ $t('user_status', 'Status message') }}
</h3>
<div class="set-status-modal__custom-input">
<CustomMessageInput ref="customMessageInput"
:icon="icon"
:message="editedMessage"
@change="setMessage"
@select-icon="setIcon" />
<NcButton v-if="messageId === 'vacationing'"
:href="absencePageUrl"
target="_blank"
type="secondary"
:aria-label="$t('user_status', 'Set absence period')">
{{ $t('user_status', 'Set absence period and replacement') + ' ↗' }}
</NcButton>
</div>
<div v-if="hasBackupStatus"
class="set-status-modal__automation-hint">
@ -69,6 +77,7 @@
<script>
import { showError } from '@nextcloud/dialogs'
import { generateUrl } from '@nextcloud/router'
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import { getAllStatusOptions } from '../services/statusOptionsService.js'
@ -135,6 +144,10 @@ export default {
return this.$store.state.userBackupStatus.message || ''
},
absencePageUrl() {
return generateUrl('settings/user/availability#absence')
},
resetButtonText() {
if (this.backupIcon && this.backupMessage) {
return this.$t('user_status', 'Reset status to "{icon} {message}"', {
@ -324,9 +337,13 @@ export default {
padding: 8px 20px 20px 20px;
&__header {
font-size: 21px;
text-align: center;
font-weight: bold;
margin: 15px 0;
height: fit-content;
min-height: var(--default-clickable-area);
line-height: var(--default-clickable-area);
overflow-wrap: break-word;
margin-block: 0 12px;
}
&__online-status {
@ -336,6 +353,9 @@ export default {
&__custom-input {
display: flex;
flex-direction: column;
align-items: center;
gap: var(--default-grid-baseline);
width: 100%;
margin-bottom: 10px;
}