Merge pull request #33265 from nextcloud/fix/carl/login-boxes

Redesign guest pages for better accessibility

Author: CarlSchwan

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 <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>

apps/dav/templates/schedule-response-options.php

@@ -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>

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 <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>

core/Controller/LoginController.php

@@ -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,