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

// move js_files and css_files assign in initFooter

Browse Source
This commit is contained in:
aFolletete
2011-10-06 15:34:05 +00:00
parent 9d319d6c83
commit f93ee965c1
1 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+37 -10
View File
@@ -1,4 +1,30 @@
<?php <?php
/*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision$
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
class AdminControllerCore extends Controller class AdminControllerCore extends Controller
{ {
public $path; public $path;
@@ -858,9 +884,6 @@ class AdminControllerCore extends Controller
'HOOK_HEADER' => Module::hookExec('backOfficeHeader'), 'HOOK_HEADER' => Module::hookExec('backOfficeHeader'),
'HOOK_TOP' => Module::hookExec('backOfficeTop'), 'HOOK_TOP' => Module::hookExec('backOfficeTop'),
)); ));
$this->context->smarty->assign('css_files', $this->css_files);
$this->context->smarty->assign('js_files', array_unique($this->js_files));
} }
/** /**
@@ -884,7 +907,6 @@ class AdminControllerCore extends Controller
else if ($this->display == 'list') else if ($this->display == 'list')
{ {
$this->getList($this->context->language->id); $this->getList($this->context->language->id);
$helper = new HelperList(); $helper = new HelperList();
$helper->view = $this->view; $helper->view = $this->view;
$helper->edit = $this->edit; $helper->edit = $this->edit;
@@ -909,6 +931,10 @@ class AdminControllerCore extends Controller
*/ */
public function initFooter() public function initFooter()
{ {
// We assign js and css files on the last step before display template, because controller can add many js and css files
$this->context->smarty->assign('css_files', $this->css_files);
$this->context->smarty->assign('js_files', array_unique($this->js_files));
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'ps_version' => _PS_VERSION_, 'ps_version' => _PS_VERSION_,
'end_time' => number_format(microtime(true) - $this->timerStart, 3, '.', ''), 'end_time' => number_format(microtime(true) - $this->timerStart, 3, '.', ''),
@@ -931,12 +957,12 @@ class AdminControllerCore extends Controller
$this->addjQueryPlugin(array('cluetip', 'hoverIntent')); $this->addjQueryPlugin(array('cluetip', 'hoverIntent'));
$this->addJS(array( $this->addJS(array(
_PS_JS_DIR_.'admin.js', _PS_JS_DIR_.'admin.js',
_PS_JS_DIR_.'toggle.js', _PS_JS_DIR_.'toggle.js',
_PS_JS_DIR_.'tools.js', _PS_JS_DIR_.'tools.js',
_PS_JS_DIR_.'ajax.js', _PS_JS_DIR_.'ajax.js',
_PS_JS_DIR_.'notifications.js') _PS_JS_DIR_.'notifications.js'
); ));
} }
public static function translate($string, $class, $addslashes = false, $htmlentities = true) public static function translate($string, $class, $addslashes = false, $htmlentities = true)
@@ -964,6 +990,7 @@ class AdminControllerCore extends Controller
$str = $htmlentities ? htmlentities($str, ENT_QUOTES, 'utf-8') : $str; $str = $htmlentities ? htmlentities($str, ENT_QUOTES, 'utf-8') : $str;
return str_replace('"', '&quot;', ($addslashes ? addslashes($str) : stripslashes($str))); return str_replace('"', '&quot;', ($addslashes ? addslashes($str) : stripslashes($str)));
} }
/** /**
* use translations files to replace english expression. * use translations files to replace english expression.
* *