From bbfad33a40d581fb1b1a38cc442bb9707853c5bf Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 25 Jul 2022 13:24:09 +0200 Subject: [PATCH] Fix caldav invitation related public pages Signed-off-by: Carl Schwan --- .../dav/templates/schedule-response-error.php | 20 +++++++++++++------ .../templates/schedule-response-options.php | 6 ++++-- .../templates/schedule-response-success.php | 9 +++++++-- core/src/components/setup/RecommendedApps.vue | 2 +- dist/core-recommendedapps.js | 4 ++-- dist/core-recommendedapps.js.map | 2 +- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/apps/dav/templates/schedule-response-error.php b/apps/dav/templates/schedule-response-error.php index 010ea2ed6cb..ff6ae19fb1f 100644 --- a/apps/dav/templates/schedule-response-error.php +++ b/apps/dav/templates/schedule-response-error.php @@ -1,7 +1,15 @@ -
-

t('There was an error updating your attendance status.'));?>

-

t('Please contact the organizer directly.'));?>

- -

- + +// SPDX-FileCopyrightText: 2020 Christoph Wurst +// SPDX-FileCopyrightText: 2022 Carl Schwan +// SPDX-License-Identifier: AGPL-3.0-or-later +?> +
+
+

t('There was an error updating your attendance status.'));?>

+

t('Please contact the organizer directly.'));?>

+ +

+ +
diff --git a/apps/dav/templates/schedule-response-options.php b/apps/dav/templates/schedule-response-options.php index f5ebb46cb26..fe12ea96c79 100644 --- a/apps/dav/templates/schedule-response-options.php +++ b/apps/dav/templates/schedule-response-options.php @@ -1,8 +1,10 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later +\OCP\Util::addStyle('dav', 'schedule-response'); ?> -
+

t('Are you accepting the invitation?')); ?>

diff --git a/apps/dav/templates/schedule-response-success.php b/apps/dav/templates/schedule-response-success.php index f60cb1e0fa9..fa217164035 100644 --- a/apps/dav/templates/schedule-response-success.php +++ b/apps/dav/templates/schedule-response-success.php @@ -1,4 +1,9 @@ -
- + +// SPDX-FileCopyrightText: 2022 Carl Schwan +// SPDX-License-Identifier: AGPL-3.0-or-later +?> +
+

t('Your attendance was updated successfully.'));?>

diff --git a/core/src/components/setup/RecommendedApps.vue b/core/src/components/setup/RecommendedApps.vue index 5bd5bb0bbae..19761069644 100644 --- a/core/src/components/setup/RecommendedApps.vue +++ b/core/src/components/setup/RecommendedApps.vue @@ -59,7 +59,7 @@ role="link" href="defaultPageUrl" @click="goTo(defaultPageUrl)"> - {{ t('core', 'Cancel') }} + {{ t('core', 'Skip') }}