Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix caldav invitation related public pages
Signed-off-by: Carl Schwan <[email protected]>
  • Loading branch information
CarlSchwan committed Jul 27, 2022
commit bbfad33a40d581fb1b1a38cc442bb9707853c5bf
20 changes: 14 additions & 6 deletions apps/dav/templates/schedule-response-error.php
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 4 additions & 2 deletions apps/dav/templates/schedule-response-options.php
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
9 changes: 7 additions & 2 deletions apps/dav/templates/schedule-response-success.php
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion core/src/components/setup/RecommendedApps.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
role="link"
href="defaultPageUrl"
@click="goTo(defaultPageUrl)">
{{ t('core', 'Cancel') }}
{{ t('core', 'Skip') }}
</Button>

<Button v-if="showInstallButton"
Expand Down
4 changes: 2 additions & 2 deletions dist/core-recommendedapps.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-recommendedapps.js.map

Large diffs are not rendered by default.