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 1/2] 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 5cfba8bcb4..813d157288 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 4f3741b5df..815406fd89 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;

From b15c11b93be53d5fd5cfcee9b387b8744d08cff4 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Mon, 6 Mar 2017 11:00:58 +0100
Subject: [PATCH 2/2] Use button instead of simple links

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

diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php
index 813d157288..431f4c78c2 100644
--- a/core/templates/twofactorselectchallenge.php
+++ b/core/templates/twofactorselectchallenge.php
@@ -19,10 +19,9 @@
 		</ul>
 	</p>
 	<p class="two-factor-link">
-		<a <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a>
+		<a class="button" <?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',
+		<a class="button" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
 												[
 													'challengeProviderId' => $_['backupProvider']->getId(),
 													'redirect_url' => $_['redirect_url'],
diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index 815406fd89..ec760ead7c 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -22,10 +22,9 @@ $template = $_['template'];
 	<?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>
+		<a class="button" <?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',
+		<a class="button" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
 												[
 													'challengeProviderId' => $_['backupProvider']->getId(),
 													'redirect_url' => $_['redirect_url'],