//small fix on BO login

admin-dev/themes/default/template/controllers/login/content.tpl

@@ -49,6 +49,7 @@
 	{/if}
 	<div id="login">
 	{if !isset($wrong_folder_name)}
+		<div id="login_form">
 			<h1>{$shop_name}</h1>
 			<form action="" method="post" id="login_form" onsubmit="doAjaxLogin('{$redirect}');return false;">
 				<label for="email">{l s='E-mail address:'}</label><br />
@@ -59,9 +60,7 @@
 				</div>
 				<div>
 					<div id="submit">
-					{if isset($redirect)}
 						<input type="hidden" name="redirect" value="{$redirect}"/>
-					{/if}
 						<input type="submit" name="submitLogin" value="{l s='Log in'}" class="button" style="float:left"/>
 						<span style="float:left;width:30px">
 							<img id="ajax-loader" src="../img/loader.gif" style="float:left;margin:2px 0 0 5px;display:none">
@@ -75,6 +74,7 @@
 				//TODO FOCUS ON EMAIL
 				</script>
 			</form>
+		</div>
 	{else}
 		<h1>{$shop_name}</h1>
 		<div style="margin:30px;">
@@ -86,7 +86,6 @@
 			<br />{l s='Please then access this page by the new url (eg.) http://www.domain.tld/admin'}{$randomNb}</span></p>
 		</div>
 	{/if}
-	</div>
 		<div id="forgot_password" style="display:none">
 			<h1>{$shop_name}</h1>
 			<form action="" method="post" onsubmit="doAjaxForgot();return false;">
@@ -102,5 +101,6 @@
 				<div id="lost"><a href="#" onclick="displayLogin();return false;">{l s='Back to login'}</a></div>
 			</form>
 		</div>
+	</div>
 	<h2><a href="http://www.prestashop.com">&copy; 2005 - {$smarty.now|date_format:"%Y"} Copyright by PrestaShop. all rights reserved.</a></h2>
 </div>

controllers/admin/AdminLoginController.php

@@ -40,7 +40,6 @@ class AdminLoginControllerCore extends AdminController
 	public function setMedia()
 	{
 		$this->addJquery();
-		$this->addJqueryPlugin('flip');
 		$this->addCSS(_PS_CSS_DIR_.'login.css');
 		$this->addJS(_PS_JS_DIR_.'login.js');
 		$this->addJqueryUI('ui.widget');
@@ -79,6 +78,12 @@ class AdminLoginControllerCore extends AdminController
 		// Redirect to admin panel
 		if (isset($_GET['redirect']) && Validate::isControllerName($_GET['redirect']))
 			$this->context->smarty->assign(array('redirect' => Tools::getValue('redirect')));
+		else
+		{
+			$tab = new Tab((int)$this->context->employee->default_tab);
+			$url = $this->context->link->getAdminLink($tab->class_name);
+			$this->context->smarty->assign(array('redirect' => $url));
+		}
 		
 		if ($nbErrors = count($this->errors))
 			$this->context->smarty->assign(

js/login.js

@@ -4,15 +4,19 @@ $(document).ready(function() {
 
 function displayForgotPassword() {
 	$('#error').hide();
-	$("#login").flip({
+	$('#login_form').fadeOut('fast', function () {
-		direction: 'tb',
+		$("#forgot_password").fadeIn('fast');
-		color: '#FFF',
+	});
-		content: $('#forgot_password')
+
-	})
 }
+
 function displayLogin() {
 	$('#error').hide();
-	$('#login').revertFlip();
+
+	$('#forgot_password').fadeOut('fast', function () {
+		$("#login_form").fadeIn('fast');
+	});
+
 	return false;
 }