wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the password changed msg inline to fix #10242

Browse source
This commit is contained in:
kondou 2014-08-22 16:48:21 +02:00 committed by Christopher Schäpers
parent 9baf7a0a3f
commit 95cfe292f4
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
settings/css/settings.css
View file

@ -25,8 +25,6 @@ input#openid, input#webdav { width:20em; }
font-weight: bold;
}
#passworderror { display:none; }
#passwordchanged { display:none; }
#displaynameerror { display:none; }
#displaynamechanged { display:none; }
input#identity { width:20em; }

13
settings/js/personal.js
View file

@ -182,20 +182,25 @@ $(document).ready(function () {
if (data.status === "success") {
$('#pass1').val('');
$('#pass2').val('');
$('#passwordchanged').show();
// Hide a possible errormsg and show successmsg
$('#password-changed').removeClass('hidden').addClass('inlineblock');
$('#password-error').removeClass('inlineblock').addClass('hidden');
} else {
if (typeof(data.data) !== "undefined") {
$('#passworderror').html(data.data.message);
} else {
$('#passworderror').html(t('Unable to change password'));
}
$('#passworderror').show();
// Hide a possible successmsg and show errormsg
$('#password-changed').removeClass('inlineblock').addClass('hidden');
$('#password-error').removeClass('hidden').addClass('inlineblock');
}
});
return false;
} else {
$('#passwordchanged').hide();
$('#passworderror').show();
// Hide a possible successmsg and show errormsg
$('#password-changed').removeClass('inlineblock').addClass('hidden');
$('#password-error').removeClass('hidden').addClass('inlineblock');
return false;
}

7
settings/templates/personal.php
View file

@ -69,9 +69,10 @@ if($_['passwordChangeSupported']) {
script('jquery-showpassword');
?>
<form id="passwordform" class="section">
<h2><?php p($l->t('Password'));?></h2>
<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
<div class="hidden icon-checkmark" id="password-changed"></div>
<div class="hidden" id="password-error"><?php p($l->t('Unable to change your password'));?></div>
<br>
<input type="password" id="pass1" name="oldpassword"
placeholder="<?php echo $l->t('Current password');?>"
autocomplete="off" autocapitalize="off" autocorrect="off" />