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

// Change to dashboard layout

Browse Source
This commit is contained in:
tDidierjean
2012-01-19 13:42:41 +00:00
parent eee9b353c1
commit 01eab08af5
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/home/content.tpl
+1 -2
View File
@@ -115,7 +115,6 @@ $(document).ready(function() {
<div class="clear">&nbsp;</div> <div class="clear">&nbsp;</div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
if ({$refresh_check_version}) if ({$refresh_check_version})
{ {
$('#blockNewVersionCheck').hide(); $('#blockNewVersionCheck').hide();
@@ -177,7 +176,7 @@ $(document).ready(function() {
$('#discover_prestashop').fadeOut('slow', function() { $('#discover_prestashop').fadeOut('slow', function() {
if (json.discover_prestashop != 'NOK') if (json.discover_prestashop != 'NOK')
$('#discover_prestashop').html(json.discover_prestashop); $('#discover_prestashop').replaceWith(json.discover_prestashop);
else else
$('#discover_prestashop').html(''); $('#discover_prestashop').html('');
$('#discover_prestashop').fadeIn('slow'); $('#discover_prestashop').fadeIn('slow');
controllers/admin/AdminHomeController.php
+8 -8
View File
@@ -434,20 +434,19 @@ class AdminHomeControllerCore extends AdminController
Configuration::updateValue('PS_PREACTIVATION_PAYPAL_WARNING', ''); Configuration::updateValue('PS_PREACTIVATION_PAYPAL_WARNING', '');
// DISCOVER PRESTASHOP // 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))
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>';
$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
else $result['discover_prestashop'] .= '';
$result['discover_prestashop'] .= '';
// SHOW PAYPAL TIPS // SHOW PAYPAL TIPS
$content = ''; $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 = @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); $content = explode('|', $content);
if ($content[0] == 'OK' && Validate::isCleanHtml($content[1])) 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); $this->content = Tools::jsonEncode($result);
} }
@@ -516,11 +515,12 @@ class AdminHomeControllerCore extends AdminController
$isoCountry = Context::getContext()->country->iso_code; $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); $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) if (!$content)
return ''; // NOK return ''; // NOK
else else
{ {
if(strpos($content, '|') !== false); if (strpos($content, '|') !== false)
$content = explode('|', $content); $content = explode('|', $content);
if ($content[0] == 'OK' && Validate::isCleanHtml($content[1])) if ($content[0] == 'OK' && Validate::isCleanHtml($content[1]))
return $content[1]; return $content[1];