From cb487efa24d55d01f7a093064955a71fb1ec2085 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 21 Jan 2019 18:08:20 +0100
Subject: [PATCH 1/2] Move 2FA section above devices & sessions section

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 .../templates/settings/personal/security.php  | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/settings/templates/settings/personal/security.php b/settings/templates/settings/personal/security.php
index bba4a5f8e7..e6087175c7 100644
--- a/settings/templates/settings/personal/security.php
+++ b/settings/templates/settings/personal/security.php
@@ -63,6 +63,32 @@ if($_['passwordChangeSupported']) {
 </div>
 <?php } ?>
 
+<div id="two-factor-auth" class="section">
+	<h2><?php p($l->t('Two-Factor Authentication'));?></h2>
+	<ul>
+	<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
+		<li>
+			<?php
+			/** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
+			$provider = $data['provider'];
+			if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
+				$icon = $provider->getDarkIcon();
+			} else {
+				$icon = image_path('core', 'actions/password.svg');
+			}
+			/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
+			$settings = $data['settings'];
+			?>
+			<h3>
+				<img class="two-factor-provider-settings-icon" src="<?php p($icon) ?>" alt="">
+				<?php p($provider->getDisplayName()) ?>
+			</h3>
+			<?php print_unescaped($settings->getBody()->fetchPage()) ?>
+		</li>
+	<?php } ?>
+	</ul>
+</div>
+
 <div id="security" class="section">
 	<h2><?php p($l->t('Devices & sessions'));?></h2>
 	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></p>
@@ -99,29 +125,3 @@ if($_['passwordChangeSupported']) {
 		</div>
 	</div>
 </div>
-
-<div id="two-factor-auth" class="section">
-	<h2><?php p($l->t('Two-Factor Authentication'));?></h2>
-	<ul>
-	<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
-		<li>
-			<?php
-			/** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
-			$provider = $data['provider'];
-			if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-				$icon = $provider->getDarkIcon();
-			} else {
-				$icon = image_path('core', 'actions/password.svg');
-			}
-			/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
-			$settings = $data['settings'];
-			?>
-			<h3>
-				<img class="two-factor-provider-settings-icon" src="<?php p($icon) ?>" alt="">
-				<?php p($provider->getDisplayName()) ?>
-			</h3>
-			<?php print_unescaped($settings->getBody()->fetchPage()) ?>
-		</li>
-	<?php } ?>
-	</ul>
-</div>

From 1f47c6976a203c97f0b60a438da7db98bef0096c Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 21 Jan 2019 18:41:06 +0100
Subject: [PATCH 2/2] Add documentation link and settings-hint to 2FA settings

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 settings/css/settings.scss                        | 6 +++++-
 settings/templates/settings/personal/security.php | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index d384ef2657..d3ab389b7c 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -1239,9 +1239,13 @@ table.grid td.date {
 .icon-info {
 	padding: 11px 20px;
 	vertical-align: super;
+	opacity: .5;
 }
 
-#shareAPI h2, #encryptionAPI h2, #mail_general_settings h2 {
+#two-factor-auth h2,
+#shareAPI h2,
+#encryptionAPI h2,
+#mail_general_settings h2 {
 	display: inline-block;
 }
 
diff --git a/settings/templates/settings/personal/security.php b/settings/templates/settings/personal/security.php
index e6087175c7..ab69f36a00 100644
--- a/settings/templates/settings/personal/security.php
+++ b/settings/templates/settings/personal/security.php
@@ -65,6 +65,10 @@ if($_['passwordChangeSupported']) {
 
 <div id="two-factor-auth" class="section">
 	<h2><?php p($l->t('Two-Factor Authentication'));?></h2>
+	<a target="_blank" rel="noreferrer noopener" class="icon-info"
+	   title="<?php p($l->t('Open documentation'));?>"
+	   href="<?php p(link_to_docs('user-2fa')); ?>"></a>
+	<p class="settings-hint"><?php p($l->t('Use a second factor besides your password to increase security for your account.'));?></p>
 	<ul>
 	<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
 		<li>