From f660c74e76c4c1b662c10ed7383e1b8caa2315aa Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Thu, 19 Jan 2012 13:42:41 +0000
Subject: [PATCH] // Change to dashboard layout

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12554 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../template/controllers/home/content.tpl        |  3 +--
 controllers/admin/AdminHomeController.php        | 16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/home/content.tpl b/admin-dev/themes/default/template/controllers/home/content.tpl
index b9677e6b0..e46f60923 100644
--- a/admin-dev/themes/default/template/controllers/home/content.tpl
+++ b/admin-dev/themes/default/template/controllers/home/content.tpl
@@ -115,7 +115,6 @@ $(document).ready(function() {
 	<div class="clear">&nbsp;</div>
 <script type="text/javascript">
 $(document).ready(function() {
-
 	if ({$refresh_check_version})
 	{
 		$('#blockNewVersionCheck').hide();
@@ -177,7 +176,7 @@ $(document).ready(function() {
 
 			$('#discover_prestashop').fadeOut('slow', function() {
 				if (json.discover_prestashop != 'NOK')
-					$('#discover_prestashop').html(json.discover_prestashop);
+					$('#discover_prestashop').replaceWith(json.discover_prestashop);
 				else
 					$('#discover_prestashop').html('');
 				$('#discover_prestashop').fadeIn('slow');
diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php
index 7a500e770..5f7eeb75c 100644
--- a/controllers/admin/AdminHomeController.php
+++ b/controllers/admin/AdminHomeController.php
@@ -434,20 +434,19 @@ class AdminHomeControllerCore extends AdminController
 			Configuration::updateValue('PS_PREACTIVATION_PAYPAL_WARNING', '');
 
 		// DISCOVER PRESTASHOP
-		$result['discover_prestashop'] = $this->getBlockDiscover();
+		$result['discover_prestashop'] = '<div id="block_tips">'.$this->getBlockDiscover().'</div>';
 
-
-			if (@fsockopen('api.prestashop.com', 80, $errno, $errst, AdminHomeController::TIPS_TIMEOUT))
-				$result['discover_prestashop'] .= '<iframe frameborder="no" style="margin: 0px; padding: 0px; width: 315px; height: 290px;" src="'.$protocol.'://api.prestashop.com/rss/news2.php?v='._PS_VERSION_.'&lang='.$isoUser.'"></iframe>';
-			else
-				$result['discover_prestashop'] .= '';
+		if (@fsockopen('api.prestashop.com', 80, $errno, $errst, AdminHomeController::TIPS_TIMEOUT))
+			$result['discover_prestashop'] .= '<div id="block_discover"><iframe frameborder="no" style="margin: 0px; padding: 0px; width: 315px; height: 290px;" src="'.$protocol.'://api.prestashop.com/rss/news2.php?v='._PS_VERSION_.'&lang='.$isoUser.'"></iframe></div>';
+		else
+			$result['discover_prestashop'] .= '';
 
 		// SHOW PAYPAL TIPS
 			$content = '';
 			$content = @file_get_contents($protocol.'://api.prestashop.com/partner/paypal/paypal-tips.php?protocol='.$protocol.'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context);
 			$content = explode('|', $content);
 			if ($content[0] == 'OK' && Validate::isCleanHtml($content[1]))
-				$result['discover_prestashop'] .= $content[1];
+				$result['discover_prestashop'] .= '<div id="block_partner_tips">'.$content[1].'</div>';
 
 		$this->content = Tools::jsonEncode($result);
 	}
@@ -516,11 +515,12 @@ class AdminHomeControllerCore extends AdminController
 		$isoCountry = Context::getContext()->country->iso_code;
 
 		$content = @file_get_contents($protocol.'://api.prestashop.com/partner/prestashop/prestashop-link.php?iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context);
+
 		if (!$content)
 			return ''; // NOK
 		else
 		{
-			if(strpos($content, '|') !== false);
+			if (strpos($content, '|') !== false)
 				$content = explode('|', $content);
 			if ($content[0] == 'OK' && Validate::isCleanHtml($content[1]))
 				return $content[1];