From ba06b217cc154c10888c1412b26fc3fe2a50784e Mon Sep 17 00:00:00 2001
From: Sarah Lorenzini <sarah.lorenzini@prestashop.com>
Date: Tue, 1 Oct 2013 17:26:13 +0200
Subject: [PATCH] // update javascript login page

---
 .../themes/default/template/controllers/login/content.tpl     | 2 +-
 js/login.js                                                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl
index 8141e48f3..12c706598 100755
--- a/admin-dev/themes/default/template/controllers/login/content.tpl
+++ b/admin-dev/themes/default/template/controllers/login/content.tpl
@@ -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;">
diff --git a/js/login.js b/js/login.js
index 75fc36cef..bfbb53e01 100644
--- a/js/login.js
+++ b/js/login.js
@@ -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');
 			}
 		});