From dc57b89f37bd616e9f57f8ec03558763aec4e9ec Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Fri, 26 Aug 2016 23:20:00 +0200
Subject: reorder 2fa challenge HTML

---
 core/templates/twofactorshowchallenge.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'core')

diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index c5ee9aca4b4..7a921a41506 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -9,12 +9,12 @@ $provider = $_['provider'];
 $template = $_['template'];
 ?>
 
-<fieldset class="warning">
-		<legend><strong><?php p($provider->getDisplayName()); ?></strong></legend>
+<div class="warning">
+		<h2><?php p($provider->getDisplayName()); ?></h2>
 		<p><?php p($l->t('Please authenticate using the selected factor.')) ?></p>
-</fieldset>
-<?php if ($error): ?>
-<span class="warning"><?php p($l->t('An error occured while verifying the token')); ?></span>
-<?php endif; ?>
-<?php print_unescaped($template); ?>
+		<?php if ($error): ?>
+		<p><?php p($l->t('An error occured while verifying the token')); ?></p>
+		<?php endif; ?>
+		<?php print_unescaped($template); ?>
+</div>
 <a class="two-factor-cancel" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel login')) ?></a>
-- 
cgit v1.2.3


From c93c5d142ee0185af01536b967839c4b2eff1b48 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Sat, 27 Aug 2016 11:10:36 +0200
Subject: fix 2fa challenge page wording

---
 core/templates/twofactorselectchallenge.php | 2 +-
 core/templates/twofactorshowchallenge.php   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'core')

diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php
index 4209beac4e6..6a6438ca56a 100644
--- a/core/templates/twofactorselectchallenge.php
+++ b/core/templates/twofactorselectchallenge.php
@@ -19,4 +19,4 @@
 <?php endforeach; ?>
 </ul>
 </fieldset>
-<a class="two-factor-cancel" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel login')) ?></a>
+<a class="two-factor-cancel" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a>
diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index 7a921a41506..7da8f743cbb 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -11,10 +11,9 @@ $template = $_['template'];
 
 <div class="warning">
 		<h2><?php p($provider->getDisplayName()); ?></h2>
-		<p><?php p($l->t('Please authenticate using the selected factor.')) ?></p>
 		<?php if ($error): ?>
 		<p><?php p($l->t('An error occured while verifying the token')); ?></p>
 		<?php endif; ?>
 		<?php print_unescaped($template); ?>
 </div>
-<a class="two-factor-cancel" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel login')) ?></a>
+<a class="two-factor-cancel" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a>
-- 
cgit v1.2.3


From 4a9167315435a37f12b8c47ec3a9d9c81183e321 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Sat, 27 Aug 2016 11:33:15 +0200
Subject: use centered h2 for 2FA page headers

---
 core/css/styles.css                         |  4 +++
 core/templates/twofactorselectchallenge.php | 42 ++++++++++++++---------------
 core/templates/twofactorshowchallenge.php   |  2 +-
 3 files changed, 26 insertions(+), 22 deletions(-)

(limited to 'core')

diff --git a/core/css/styles.css b/core/css/styles.css
index 428688060b7..38de922ac9d 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -32,6 +32,10 @@ body {
 	background-size: cover;
 }
 
+.two-factor-header {
+	text-align: center;
+}
+
 .two-factor-provider {
 	text-align: center;
 	width: 100%;
diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php
index 6a6438ca56a..1c8fcd362e5 100644
--- a/core/templates/twofactorselectchallenge.php
+++ b/core/templates/twofactorselectchallenge.php
@@ -1,22 +1,22 @@
-<fieldset class="warning">
-		<legend><strong><?php p($l->t('Two-step verification')) ?></strong></legend>
-		<p><?php p($l->t('Enhanced security has been enabled for your account. Please authenticate using a second factor.')) ?></p>
-</fieldset>
-<fieldset class="warning">
-<ul>
-<?php foreach ($_['providers'] as $provider): ?>
-	<li>
-		<a class="two-factor-provider"
-		   href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
-							[
-								'challengeProviderId' => $provider->getId(),
-								'redirect_url' => $_['redirect_url'],
-							]
-						)) ?>">
-			<?php p($provider->getDescription()) ?>
-		</a>
-	</li>
-<?php endforeach; ?>
-</ul>
-</fieldset>
+<div class="warning">
+	<h2 class="two-factor-header"><?php p($l->t('Two-step verification')) ?></h2>
+	<p><?php p($l->t('Enhanced security has been enabled for your account. Please authenticate using a second factor.')) ?></p>
+	<p>
+		<ul>
+			<?php foreach ($_['providers'] as $provider): ?>
+				<li>
+					<a class="two-factor-provider"
+					   href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
+										[
+											'challengeProviderId' => $provider->getId(),
+											'redirect_url' => $_['redirect_url'],
+										]
+									)) ?>">
+						<?php p($provider->getDescription()) ?>
+					</a>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</p>
+</div>
 <a class="two-factor-cancel" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a>
diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index 7da8f743cbb..713032d923d 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -10,7 +10,7 @@ $template = $_['template'];
 ?>
 
 <div class="warning">
-		<h2><?php p($provider->getDisplayName()); ?></h2>
+		<h2 class="two-factor-header"><?php p($provider->getDisplayName()); ?></h2>
 		<?php if ($error): ?>
 		<p><?php p($l->t('An error occured while verifying the token')); ?></p>
 		<?php endif; ?>
-- 
cgit v1.2.3


From 78bb02d27ab3c9110b8e63117dc8a25ea0610ca2 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Sat, 27 Aug 2016 12:27:05 +0200
Subject: list 2FA providers as buttons

---
 core/css/styles.css                         | 5 ++++-
 core/templates/twofactorselectchallenge.php | 6 +++---
 core/templates/twofactorshowchallenge.php   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'core')

diff --git a/core/css/styles.css b/core/css/styles.css
index 38de922ac9d..8a8bc852f3e 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -38,8 +38,11 @@ body {
 
 .two-factor-provider {
 	text-align: center;
-	width: 100%;
+	width: 258px !important;
 	display: inline-block;
+	margin-bottom: 0 !important;
+	background-color: rgba(0,0,0,0.3) !important;
+	border: none !important;
 }
 
 a.two-factor-cancel {
diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php
index 1c8fcd362e5..1948499e604 100644
--- a/core/templates/twofactorselectchallenge.php
+++ b/core/templates/twofactorselectchallenge.php
@@ -1,11 +1,11 @@
 <div class="warning">
-	<h2 class="two-factor-header"><?php p($l->t('Two-step verification')) ?></h2>
-	<p><?php p($l->t('Enhanced security has been enabled for your account. Please authenticate using a second factor.')) ?></p>
+	<h2 class="two-factor-header"><?php p($l->t('Two-factor authentication')) ?></h2>
+	<p><?php p($l->t('Enhanced security is enabled for your account. Please authenticate using a second factor.')) ?></p>
 	<p>
 		<ul>
 			<?php foreach ($_['providers'] as $provider): ?>
 				<li>
-					<a class="two-factor-provider"
+					<a class="button two-factor-provider"
 					   href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
 										[
 											'challengeProviderId' => $provider->getId(),
diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index 713032d923d..fb161921675 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -12,7 +12,7 @@ $template = $_['template'];
 <div class="warning">
 		<h2 class="two-factor-header"><?php p($provider->getDisplayName()); ?></h2>
 		<?php if ($error): ?>
-		<p><?php p($l->t('An error occured while verifying the token')); ?></p>
+		<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
 		<?php endif; ?>
 		<?php print_unescaped($template); ?>
 </div>
-- 
cgit v1.2.3