diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-11-05 18:14:52 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-11-05 18:14:52 +0100 |
| commit | 8fea22314ceaf9b1a3865c02e587aa5b0c4f1c38 (patch) | |
| tree | 504d074e83ee7b8ff8690a03569e73b00a935552 /core/templates | |
| parent | 91195b7cf2e55d82b98fdc76ef4ad4a6eecad10d (diff) | |
| download | nextcloud-server-8fea22314ceaf9b1a3865c02e587aa5b0c4f1c38.tar.gz nextcloud-server-8fea22314ceaf9b1a3865c02e587aa5b0c4f1c38.zip | |
Fix template order and animation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/login.php | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/core/templates/login.php b/core/templates/login.php index 2f6bce76e88..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> @@ -66,6 +62,13 @@ script('core', 'merged-login'); <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) { ?> @@ -80,13 +83,9 @@ script('core', 'merged-login'); <a id="lost-password" href="<?php p($_['resetPasswordLink']); ?>"> <?php p($l->t('Forgot password?')); ?> </a> - <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> - <a id="lost-password-back" href=""> - <?php p($l->t('Back to log in')); ?> - </a> - </div> + <a id="lost-password-back" href="" style="display:none;"> + <?php p($l->t('Back to log in')); ?> + </a> </div> <?php } ?> </div> |