dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// update javascript login page

Browse Source
This commit is contained in:
Sarah Lorenzini
2013-10-02 14:36:14 +02:00
parent f5a4aeeab5
commit ba06b217cc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/login/content.tpl
+1 -1
View File
@@ -29,7 +29,7 @@
var label_error = '{l s='error'}';
</script>
<div id="container">
<div id="error" {if !isset($errors)}class="hide"{/if}>
<div id="error">
{if isset($errors)}
<h3>{if $nbErrors > 1}{l s='There are %d errors.' sprintf=$nbErrors}{else}{l s='There is %d error.' sprintf=$nbErrors}{/if}</h3>
<ol style="margin: 0 0 0 20px;">
js/login.js
+2 -2
View File
@@ -32,7 +32,7 @@ $(document).ready(function() {
function displayForgotPassword() {
$('#error').hide();
$('#login_form').fadeOut('fast', function () {
$("#forgot_password_form").fadeIn('fast');
$("#forgot_password_form").removeClass('hide').fadeIn('fast');
// Focus on email address forgot field
$('#email_forgot').select();
});
@@ -81,7 +81,7 @@ function doAjaxLogin(redirect) {
window.location.assign(jsonData.redirect);
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
$('#error').html('<h3>TECHNICAL ERROR:</h3><p>Details: Error thrown: ' + XMLHttpRequest + '</p><p>Text status: ' + textStatus + '</p>').show();
$('#error').html('<h3>TECHNICAL ERROR:</h3><p>Details: Error thrown: ' + XMLHttpRequest + '</p><p>Text status: ' + textStatus + '</p>').removeClass('hide');
$('#login_form .ajax-loader').fadeOut('slow');
}
});