diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-11-14 15:32:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 15:32:27 +0100 |
| commit | 381967f35e11bfd04baa5c085f733793fee30858 (patch) | |
| tree | ffb82fc88dab364f285cb802d87e4e5c3db47a41 /core/templates | |
| parent | 16549ae5fbc2165ab6cf0a1004f80cd142993d48 (diff) | |
| parent | 15762c103bcff13de45e9bdff62ab7b2b390c218 (diff) | |
| download | nextcloud-server-381967f35e11bfd04baa5c085f733793fee30858.tar.gz nextcloud-server-381967f35e11bfd04baa5c085f733793fee30858.zip | |
Merge pull request #7013 from nextcloud/forgot-password
Directly show "Forgot password?" link, fix #6808
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/login.php | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/core/templates/login.php b/core/templates/login.php index 0801b3746df..82827bbef03 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -51,11 +51,7 @@ script('core', 'merged-login'); <label for="password" class="infield"><?php p($l->t('Password')); ?></label> </p> - <?php if (!empty($_['invalidpassword']) && !empty($_['canResetPassword'])) { ?> - <a id="lost-password" class="warning" href="<?php p($_['resetPasswordLink']); ?>"> - <?php p($l->t('Wrong password. Reset it?')); ?> - </a> - <?php } else if (!empty($_['invalidpassword'])) { ?> + <?php if (!empty($_['invalidpassword'])) { ?> <p class="warning"> <?php p($l->t('Wrong password.')); ?> </p> @@ -63,9 +59,16 @@ script('core', 'merged-login'); <div id="submit-wrapper"> <input type="submit" id="submit" class="login primary" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" /> - <div id="submit-icon" class="icon-confirm-white"></div> + <div class="submit-icon icon-confirm-white"></div> </div> + <?php if (!empty($_['canResetPassword'])) { ?> + <div id="reset-password-wrapper" style="display: none;"> + <input type="submit" id="reset-password-submit" class="login primary" title="" value="<?php p($l->t('Reset password')); ?>" disabled="disabled" /> + <div class="submit-icon icon-confirm-white"></div> + </div> + <?php } ?> + <div class="login-additional"> <div class="remember-login-container"> <?php if ($_['rememberLoginState'] === 0) { ?> @@ -75,6 +78,16 @@ script('core', 'merged-login'); <?php } ?> <label for="remember_login"><?php p($l->t('Stay logged in')); ?></label> </div> + <?php if (!empty($_['canResetPassword'])) { ?> + <div class="lost-password-container"> + <a id="lost-password" href="<?php p($_['resetPasswordLink']); ?>"> + <?php p($l->t('Forgot password?')); ?> + </a> + <a id="lost-password-back" href="" style="display:none;"> + <?php p($l->t('Back to log in')); ?> + </a> + </div> + <?php } ?> </div> <input type="hidden" name="timezone_offset" id="timezone_offset"/> |