diff options
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/twofactorselectchallenge.php | 51 | ||||
| -rw-r--r-- | core/templates/twofactorshowchallenge.php | 30 |
2 files changed, 57 insertions, 24 deletions
diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php index c3c35c7fec4..a2fc97495ac 100644 --- a/core/templates/twofactorselectchallenge.php +++ b/core/templates/twofactorselectchallenge.php @@ -1,6 +1,6 @@ <div class="warning"> <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><?php p($l->t('Enhanced security is enabled for your account. Choose a second factor for authentication:')) ?></p> <?php if ($_['providerMissing']): ?> <p> <strong><?php p($l->t('Could not load at least one of your enabled two-factor auth methods. Please contact your admin.')) ?></strong> @@ -19,29 +19,50 @@ <ul> <?php foreach ($_['providers'] as $provider): ?> <li> - <a class="button two-factor-provider" + <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()) ?> + <?php + if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) { + $icon = $provider->getLightIcon(); + } else { + $icon = image_path('core', 'actions/password-white.svg'); + } + ?> + <img src="<?php p($icon) ?>" alt="" /> + <div> + <h3><?php p($provider->getDisplayName()) ?></h3> + <p><?php p($provider->getDescription()) ?></p> + </div> </a> </li> <?php endforeach; ?> - </ul> - </p> <?php endif ?> - <p class="two-factor-link"> - <a class="button" href="<?php print_unescaped($_['logout_url']); ?>"><?php p($l->t('Cancel log in')) ?></a> - <?php if (!is_null($_['backupProvider'])): ?> - <a class="button" 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 if (!is_null($_['backupProvider'])): ?> + <li> + <a class="two-factor-provider two-factor-secondary" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge', + [ + 'challengeProviderId' => $_['backupProvider']->getId(), + 'redirect_url' => $_['redirect_url'], + ] + )) ?>"> + <div> + <p><?php p($l->t('Use backup code')) ?></p> + </div> + </a> + </li> + <?php endif; ?> + <li> + <a class="two-factor-provider two-factor-secondary" href="<?php print_unescaped($_['logout_url']); ?>"> + <div> + <p><?php p($l->t('Cancel log in')) ?></p> + </div> + </a> + </li> + </ul> </p> </div> diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php index fbfeeb4255a..88ac5505751 100644 --- a/core/templates/twofactorshowchallenge.php +++ b/core/templates/twofactorshowchallenge.php @@ -21,15 +21,27 @@ $template = $_['template']; <?php endif; ?> <?php endif; ?> <?php print_unescaped($template); ?> - <p class="two-factor-link"> - <a class="button" href="<?php print_unescaped($_['logout_url']); ?>"><?php p($l->t('Cancel log in')) ?></a> + <ul> <?php if (!is_null($_['backupProvider'])): ?> - <a class="button" 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> + <li> + <a class="two-factor-provider two-factor-secondary" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge', + [ + 'challengeProviderId' => $_['backupProvider']->getId(), + 'redirect_url' => $_['redirect_url'], + ] + )) ?>"> + <div> + <p><?php p($l->t('Use backup code')) ?></p> + </div> + </a> + </li> <?php endif; ?> - </p> + <li> + <a class="two-factor-provider two-factor-secondary" href="<?php print_unescaped($_['logout_url']); ?>"> + <div> + <p><?php p($l->t('Cancel log in')) ?></p> + </div> + </a> + </li> + </ul> </div> |