From a66bcd12d4b5c6d48fe0dc907e0910ecfd7b99dc Mon Sep 17 00:00:00 2001 From: Jonathan Weth <git@jonathanweth.de> Date: Wed, 17 Jul 2024 11:29:47 +0200 Subject: [PATCH] Add close button to dialogs --- .../coursebook/absences/AbsenceCreationDialog.vue | 2 +- .../coursebook/absences/ManageStudentsDialog.vue | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/absences/AbsenceCreationDialog.vue b/aleksis/apps/alsijil/frontend/components/coursebook/absences/AbsenceCreationDialog.vue index dbb504c39..7ba7586d0 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/absences/AbsenceCreationDialog.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/absences/AbsenceCreationDialog.vue @@ -1,5 +1,5 @@ <template> - <mobile-fullscreen-dialog v-model="popup" persistent> + <mobile-fullscreen-dialog v-model="popup" persistent :close-button="false"> <template #activator="activator"> <fab-button color="secondary" diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsDialog.vue b/aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsDialog.vue index fe67d6bc5..2b8150944 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsDialog.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsDialog.vue @@ -3,6 +3,7 @@ import AbsenceReasonButtons from "aleksis.apps.kolego/components/AbsenceReasonBu import AbsenceReasonChip from "aleksis.apps.kolego/components/AbsenceReasonChip.vue"; import AbsenceReasonGroupSelect from "aleksis.apps.kolego/components/AbsenceReasonGroupSelect.vue"; import CancelButton from "aleksis.core/components/generic/buttons/CancelButton.vue"; +import DialogCloseButton from "aleksis.core/components/generic/buttons/DialogCloseButton.vue"; import MobileFullscreenDialog from "aleksis.core/components/generic/dialogs/MobileFullscreenDialog.vue"; import mutateMixin from "aleksis.core/mixins/mutateMixin.js"; import deepSearchMixin from "aleksis.core/mixins/deepSearchMixin.js"; @@ -30,6 +31,7 @@ export default { MobileFullscreenDialog, SlideIterator, TardinessField, + DialogCloseButton, }, mixins: [documentationPartMixin, mutateMixin, deepSearchMixin], data() { @@ -121,13 +123,17 @@ export default { v-bind="$attrs" v-on="$listeners" v-model="dialog" + :close-button="false" > <template #activator="activator"> <slot name="activator" v-bind="activator" /> </template> <template #title> - <lesson-information v-bind="documentationPartProps" :compact="false" /> + <div class="d-flex full-width"> + <lesson-information v-bind="documentationPartProps" :compact="false" /> + <dialog-close-button @click="dialog = false" class="ml-4" /> + </div> <v-scroll-x-transition leave-absolute> <v-text-field v-show="!isExpanded" -- GitLab