Skip to content

Redesign guest pages for better accessibility #33265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 27, 2022
Merged

Redesign guest pages for better accessibility #33265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2531182
Redesign guest pages for better accessibility
CarlSchwan Jul 18, 2022
bbfad33
Fix caldav invitation related public pages
CarlSchwan Jul 25, 2022
3fa6ee3
Fix login flow
CarlSchwan Jul 27, 2022
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
20 changes: 14 additions & 6 deletions apps/dav/templates/schedule-response-error.php
View file
Open in desktop
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 <oc.list@georgehrke.com>
// SPDX-FileCopyrightText: 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
// SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
// 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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<?php
style('dav', 'schedule-response');
// SPDX-FileCopyrightText: 2018 Georg Ehrke <oc.list@georgehrke.com>
// 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
View file
Open in desktop
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 <christoph@winzerhof-wurst.at>
// SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
// 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>
1 change: 1 addition & 0 deletions core/Controller/LoginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ public function showLoginForm(string $user = null, string $redirect_url = null):
];

$this->initialStateService->provideInitialState('core', 'countAlternativeLogins', count($parameters['alt_login']));
$this->initialStateService->provideInitialState('core', 'alternativeLogins', $parameters['alt_login']);

return new TemplateResponse(
$this->appName,
Expand Down
Loading