mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix template order and animation 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2017-11-05 18:14:52 +01:00
parent 91195b7cf2
commit 8fea22314c
No known key found for this signature in database
GPG Key ID: FB5ACEED51955BF8
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/js/lostpassword.js
View File

@ -35,6 +35,7 @@ OC.Lostpassword = {
$('#reset-password-wrapper').slideUp().fadeOut();
$('#lost-password').slideDown().fadeIn();
$('#lost-password-back').hide();
$('.remember-login-container').slideDown().fadeIn();
$('#submit-wrapper').slideDown().fadeIn();
$('.groupbottom').slideDown().fadeIn();
@ -47,7 +48,8 @@ OC.Lostpassword = {
resetLink : function(event){
event.preventDefault();
$('#lost-password').slideUp().fadeOut();
$('#lost-password').hide();
$('#lost-password-back').slideDown().fadeIn();
$('.remember-login-container').slideUp().fadeOut();
$('#submit-wrapper').slideUp().fadeOut();
$('.groupbottom').slideUp().fadeOut(function(){
@ -118,6 +120,7 @@ OC.Lostpassword = {
// update is the better success message styling
node.addClass('update').css({width:'auto'});
node.html(OC.Lostpassword.sendSuccessMsg);
OC.Lostpassword.resetButtons();
},
sendLinkError : function(msg){

23
core/templates/login.php
View File

@ -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>