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

// fix adminHome for Chart, js loading order in setMedia

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8759 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti committed 2011-09-26 08:25:38 +00:00
1 parent ff51f77bba
commit 30e94d126c
1 file changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminHomeController.php
+3 -2
View File
@@ -147,10 +147,10 @@ class AdminHomeControllerCore extends AdminController
} }
public function setMedia() public function setMedia()
{ {
$this->addJS(_PS_JS_DIR_.'jquery/jquery.flot.min.js'); parent::setMedia();
if (strpos($_SERVER['HTTP_USER_AGENT'],'MSIE') !== false) if (strpos($_SERVER['HTTP_USER_AGENT'],'MSIE') !== false)
$this->addJS(_PS_JS_DIR_.'jquery/excanvas.min.js'); $this->addJS(_PS_JS_DIR_.'jquery/excanvas.min.js');
parent::setMedia(); $this->addJS(_PS_JS_DIR_.'jquery/jquery.flot.min.js');
} }
protected function warnDomainName() protected function warnDomainName()
@@ -357,6 +357,7 @@ class AdminHomeControllerCore extends AdminController
$chart->setSize(580, 170); $chart->setSize(580, 170);
$chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd'); $chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd');
$chart->getCurve(1)->setLabel($this->l('Sales +Tx').' ('.strtoupper($currency->iso_code).')'); $chart->getCurve(1)->setLabel($this->l('Sales +Tx').' ('.strtoupper($currency->iso_code).')');
$this->content .= $chart->fetch(); $this->content .= $chart->fetch();
$this->content .= ' </div> $this->content .= ' </div>
</div> </div>