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] 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 bba4a5f8e7d..e6087175c79 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>
--
GitLab