From 1370ae42d443f585d03065c6de88db4daeec9789 Mon Sep 17 00:00:00 2001 From: Maximilian Martin Date: Wed, 9 Feb 2022 02:48:24 -0500 Subject: [PATCH 0001/1004] fix category selection Signed-off-by: Maximilian Martin --- .../Properties/PropertySelectMultiple.vue | 60 ++++++++++++++++--- .../PropertySelectMultipleColoredTag.vue | 15 ++++- 2 files changed, 64 insertions(+), 11 deletions(-) diff --git a/src/components/Editor/Properties/PropertySelectMultiple.vue b/src/components/Editor/Properties/PropertySelectMultiple.vue index 651360b48..f74590955 100644 --- a/src/components/Editor/Properties/PropertySelectMultiple.vue +++ b/src/components/Editor/Properties/PropertySelectMultiple.vue @@ -32,19 +32,19 @@
@@ -60,6 +60,7 @@ import { } from '@nextcloud/dialogs' import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue' +import IconCircle from '../../Icons/IconCircles.vue' import Delete from 'vue-material-design-icons/Delete.vue' export default { @@ -69,6 +70,7 @@ export default { ActionCheckbox, AppNavigationItem, Avatar, + IconCircle, AccountMultiple, Delete, }, diff --git a/src/components/AppNavigation/CalendarList/CalendarListNew.vue b/src/components/AppNavigation/CalendarList/CalendarListNew.vue index 6069e9e2e..1994fcb0e 100644 --- a/src/components/AppNavigation/CalendarList/CalendarListNew.vue +++ b/src/components/AppNavigation/CalendarList/CalendarListNew.vue @@ -24,7 +24,6 @@ :class="{'app-navigation-entry-new-calendar--open': isOpen}" :title="$t('calendar', '+ New calendar')" :menu-open.sync="isOpen" - menu-icon="icon-add" @click.prevent.stop="toggleDialog"> diff --git a/src/fullcalendar/localization/momentPlugin.js b/src/fullcalendar/localization/momentPlugin.js index c0db20526..5bde59998 100644 --- a/src/fullcalendar/localization/momentPlugin.js +++ b/src/fullcalendar/localization/momentPlugin.js @@ -38,6 +38,7 @@ const momentFactory = ($store, { array }) => { /** * Construct a cmdFormatter that can be used to construct a FullCalendar plugin * + * @param $store * @return {function(string, string):string} cmdFormatter function */ const cmdFormatterFactory = ($store) => (cmdStr, arg) => { diff --git a/src/fullcalendar/rendering/noEventsDidMount.js b/src/fullcalendar/rendering/noEventsDidMount.js index 6dc17d0b4..7314b20bb 100644 --- a/src/fullcalendar/rendering/noEventsDidMount.js +++ b/src/fullcalendar/rendering/noEventsDidMount.js @@ -21,6 +21,7 @@ */ import Vue from 'vue' import EmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent' +import CalendarIcon from 'vue-material-design-icons/CalendarBlank' import { translate as t } from '@nextcloud/l10n' /** @@ -33,11 +34,11 @@ export default function({ el }) { const EmptyContentClass = Vue.extend(EmptyContent) const instance = new EmptyContentClass({ propsData: { - icon: 'icon-calendar-dark', + title: t('calendar', 'No events'), + description: t('calendar', 'Create a new event or change the visible time-range'), }, }) - instance.$slots.default = [t('calendar', 'No events')] - instance.$slots.desc = [t('calendar', 'Create a new event or change the visible time-range')] + instance.$slots.icon = [instance.$createElement(CalendarIcon)] instance.$mount() el.appendChild(instance.$el) } diff --git a/src/views/Appointments/Overview.vue b/src/views/Appointments/Overview.vue index 5c808e6f1..da4b8b257 100644 --- a/src/views/Appointments/Overview.vue +++ b/src/views/Appointments/Overview.vue @@ -48,13 +48,10 @@
- + -
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index c1c3a631c..a5e85833c 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -27,13 +27,11 @@ @@ -74,6 +72,7 @@ import EmptyCalendar from 'vue-material-design-icons/CalendarBlankOutline' import IconCheck from 'vue-material-design-icons/Check' import { loadState } from '@nextcloud/initial-state' import moment from '@nextcloud/moment' +import NcButton from '@nextcloud/vue/dist/Components/NcButton' import { imagePath, generateUrl } from '@nextcloud/router' import { initializeClientForUserView } from '../services/caldavService' import { dateFactory } from '../utils/date' @@ -88,6 +87,7 @@ export default { components: { DashboardWidget, DashboardWidgetItem, + NcButton, EmptyContent, EmptyCalendar, IconCheck, @@ -320,10 +320,12 @@ export default { margin-bottom: 2vh; } - .empty-label { - margin-top: 5vh; - margin-right: 5px; - } + } + + .empty-label { + display: flex; + justify-content: center; + margin-top: 5vh; } } diff --git a/src/views/EditSidebar.vue b/src/views/EditSidebar.vue index 2232cf990..52d0e553b 100644 --- a/src/views/EditSidebar.vue +++ b/src/views/EditSidebar.vue @@ -39,14 +39,10 @@ diff --git a/src/views/EditSimple.vue b/src/views/EditSimple.vue index 1fac95c23..fe55b3933 100644 --- a/src/views/EditSimple.vue +++ b/src/views/EditSimple.vue @@ -1,5 +1,6 @@