Fix caldav invitation related public pages

Signed-off-by: Carl Schwan <[email protected]>
nextcloud · Jul 26, 2022 · a94b222 · a94b222
1 parent 5d7d651
commit a94b222
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 14 deletions.
diff --git a/apps/dav/templates/schedule-response-error.php b/apps/dav/templates/schedule-response-error.php
@@ -1,7 +1,15 @@
-<div class="update">
-	<p class="message"><?php p($l->t('There was an error updating your attendance status.'));?></p>
-	<p class="message"><?php p($l->t('Please contact the organizer directly.'));?></p>
-	<?php if (isset($_['organizer'])): ?>
-		<p class="message"><a href="<?php p($_['organizer']) ?>"><?php p(substr($_['organizer'], 7)) ?></a></p>
-	<?php endif; ?>
+<?php
+// SPDX-FileCopyrightText: 2018 Georg Ehrke <[email protected]>
+// SPDX-FileCopyrightText: 2020 Christoph Wurst <[email protected]>
+// SPDX-FileCopyrightText: 2022 Carl Schwan <[email protected]>
+// SPDX-License-Identifier: AGPL-3.0-or-later
+?>
+<div class="guest-box">
+	<div class="notecard error">
+		<p><?php p($l->t('There was an error updating your attendance status.'));?></p>
+		<p><?php p($l->t('Please contact the organizer directly.'));?></p>
+		<?php if (isset($_['organizer'])): ?>
+			<p><a href="<?php p($_['organizer']) ?>"><?php p(substr($_['organizer'], 7)) ?></a></p>
+		<?php endif; ?>
+	</div>
 </div>
diff --git a/apps/dav/templates/schedule-response-options.php b/apps/dav/templates/schedule-response-options.php
@@ -1,8 +1,10 @@
 <?php
-style('dav', 'schedule-response');
+// SPDX-FileCopyrightText: 2018 Georg Ehrke <[email protected]>
+// SPDX-License-Identifier: AGPL-3.0-or-later
+\OCP\Util::addStyle('dav', 'schedule-response');
 ?>
 
-<div class="update">
+<div class="guest-box">
 	<form action="" method="post">
 		<fieldset id="partStat">
 			<h2><?php p($l->t('Are you accepting the invitation?')); ?></h2>

diff --git a/apps/dav/templates/schedule-response-success.php b/apps/dav/templates/schedule-response-success.php
@@ -1,4 +1,9 @@
-<div class="update" style="justify-content: space-around; display: flex;">
-	<span class="icon icon-checkmark-white"></span>
+<?php
+// SPDX-FileCopyrightText: 2020 Christoph Wurst <[email protected]>
+// SPDX-FileCopyrightText: 2022 Carl Schwan <[email protected]>
+// SPDX-License-Identifier: AGPL-3.0-or-later
+?>
+<div class="guest-box">
+	<div class="icon icon-checkmark"></div>
 	<p class="message"><?php p($l->t('Your attendance was updated successfully.'));?></p>
 </div>
diff --git 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') }}
 			</Button>
 
 			<Button v-if="showInstallButton"

diff --git a/dist/core-recommendedapps.js b/dist/core-recommendedapps.js
diff --git a/dist/core-recommendedapps.js.map b/dist/core-recommendedapps.js.map