From 511df0ec99ddc8beb855d8741b3a0dec569bed5e Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Mon, 12 Dec 2016 10:20:35 +0100
Subject: [PATCH] Move log out and back codes link into 2fa box for better
 readability

Fixes https://github.com/nextcloud/server/issues/2538

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 core/templates/twofactorselectchallenge.php | 21 +++++++++-------
 core/templates/twofactorshowchallenge.php   | 27 ++++++++++++---------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php
index 5cfba8bcb47..813d1572884 100644
--- a/core/templates/twofactorselectchallenge.php
+++ b/core/templates/twofactorselectchallenge.php
@@ -18,13 +18,16 @@
 			<?php endforeach; ?>
 		</ul>
 	</p>
+	<p class="two-factor-link">
+		<a <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a>
+		<?php if (!is_null($_['backupProvider'])): ?>
+		<br>
+		<a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
+												[
+													'challengeProviderId' => $_['backupProvider']->getId(),
+													'redirect_url' => $_['redirect_url'],
+												]
+											)) ?>"><?php p($l->t('Use backup code')) ?></a>
+		<?php endif; ?>
+	</p>
 </div>
-<a class="two-factor-link" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a>
-<?php if (!is_null($_['backupProvider'])): ?>
-<a class="two-factor-link" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
-										[
-											'challengeProviderId' => $_['backupProvider']->getId(),
-											'redirect_url' => $_['redirect_url'],
-										]
-									)) ?>"><?php p($l->t('Use backup code')) ?></a>
-<?php endif;
diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index 4f3741b5dfe..815406fd899 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -12,22 +12,25 @@ $template = $_['template'];
 ?>
 
 <div class="warning">
-		<h2 class="two-factor-header"><?php p($provider->getDisplayName()); ?></h2>
-		<?php if ($error): ?>
+	<h2 class="two-factor-header"><?php p($provider->getDisplayName()); ?></h2>
+	<?php if ($error): ?>
 			<?php if($error_message): ?>
 				<p><strong><?php p($error_message); ?></strong></p>
 			<?php else: ?>
 				<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
 			<?php endif; ?>
+	<?php endif; ?>
+	<?php print_unescaped($template); ?>
+	<p class="two-factor-link">
+		<a <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a>
+		<?php if (!is_null($_['backupProvider'])): ?>
+		<br>
+		<a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
+												[
+													'challengeProviderId' => $_['backupProvider']->getId(),
+													'redirect_url' => $_['redirect_url'],
+												]
+											)) ?>"><?php p($l->t('Use backup code')) ?></a>
 		<?php endif; ?>
-		<?php print_unescaped($template); ?>
+	</p>
 </div>
-<a class="two-factor-link" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a>
-<?php if (!is_null($_['backupProvider'])): ?>
-<a class="two-factor-link" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
-										[
-											'challengeProviderId' => $_['backupProvider']->getId(),
-											'redirect_url' => $_['redirect_url'],
-										]
-									)) ?>"><?php p($l->t('Use backup code')) ?></a>
-<?php endif;