From 288021224cfa13084ef36fb22d58602fd65c1e39 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Wed, 13 Feb 2013 14:38:43 +0100 Subject: [PATCH] // Moved html and js compression from global smarty config to front office smarty config --- admin-dev/themes/default/css/admin.css | 1 + config/smarty.config.inc.php | 5 ----- config/smartyfront.config.inc.php | 5 +++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index daff50b7d..ea6d4c7a7 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -546,6 +546,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;} .default_modules_list_display_type #modules_list_container_content li table tr td{border: none} .default_modules_list_display_type #modules_list_container_content li table {border: solid 1px #ccc; height: 115px} +#modules_list_container_tab ul li {margin:5px;height:140px} /*MODULE POSITION*/ .blocLiveEdit { float:right; clear:right; background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block; width:250px;} diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php index 892a22dd3..f45ce627d 100644 --- a/config/smarty.config.inc.php +++ b/config/smarty.config.inc.php @@ -55,11 +55,6 @@ if (defined('_PS_ADMIN_DIR_')) else require_once (dirname(__FILE__).'/smartyfront.config.inc.php'); -if (Configuration::get('PS_HTML_THEME_COMPRESSION')) - $smarty->registerFilter('output', 'smartyMinifyHTML'); -if (Configuration::get('PS_JS_HTML_THEME_COMPRESSION')) - $smarty->registerFilter('output', 'smartyPackJSinHTML'); - smartyRegisterFunction($smarty, 'modifier', 'truncate', 'smarty_modifier_truncate'); smartyRegisterFunction($smarty, 'modifier', 'secureReferrer', array('Tools', 'secureReferrer')); diff --git a/config/smartyfront.config.inc.php b/config/smartyfront.config.inc.php index 70de9a1bb..b95642a4b 100644 --- a/config/smartyfront.config.inc.php +++ b/config/smartyfront.config.inc.php @@ -27,6 +27,11 @@ global $smarty; $smarty->setTemplateDir(_PS_THEME_DIR_.'tpl'); +if (Configuration::get('PS_HTML_THEME_COMPRESSION')) + $smarty->registerFilter('output', 'smartyMinifyHTML'); +if (Configuration::get('PS_JS_HTML_THEME_COMPRESSION')) + $smarty->registerFilter('output', 'smartyPackJSinHTML'); + function smartyTranslate($params, &$smarty) { global $_LANG;