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

[*] BO : reorganization of admin tabs

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13820 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-03-02 14:44:07 +00:00
parent a32fc0cc5b
commit 0f865fd2d6
74 changed files with 10384 additions and 11234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminPerformanceController.php
+29 -2
View File
@@ -192,7 +192,7 @@ class AdminPerformanceControllerCore extends AdminController
'input' => array(
array(
'type' => 'hidden',
'name' => 'ccc_up'
'name' => 'ccc_up',
),
array(
'type' => 'radio',
@@ -288,6 +288,26 @@ class AdminPerformanceControllerCore extends AdminController
'label' => $this->l('Keep W3C validation')
)
)
),
array(
'type' => 'radio',
'label' => $this->l('Apache optimization'),
'name' => 'PS_HTACCESS_CACHE_CONTROL',
'class' => 't',
'desc' => $this->l('This will add directives to your .htaccess file which should improve caching and compression.'),
'is_bool' => true,
'values' => array(
array(
'id' => 'PS_HTACCESS_CACHE_CONTROL_1',
'value' => 1,
'label' => $this->l('Yes'),
),
array(
'id' => 'PS_HTACCESS_CACHE_CONTROL_0',
'value' => 0,
'label' => $this->l('No'),
),
),
)
)
);
@@ -297,6 +317,8 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_value['PS_HTML_THEME_COMPRESSION'] = Configuration::get('PS_HTML_THEME_COMPRESSION');
$this->fields_value['PS_JS_HTML_THEME_COMPRESSION'] = Configuration::get('PS_JS_HTML_THEME_COMPRESSION');
$this->fields_value['PS_HIGH_HTML_THEME_COMPRESSION'] = Configuration::get('PS_HIGH_HTML_THEME_COMPRESSION');
$this->fields_value['PS_HTACCESS_CACHE_CONTROL'] = Configuration::get('PS_HTACCESS_CACHE_CONTROL');
$this->fields_value['ccc_up'] = 1;
}
public function initFieldsetMediaServer()
@@ -585,10 +607,15 @@ class AdminPerformanceControllerCore extends AdminController
!Configuration::updateValue('PS_JS_THEME_CACHE', (int)Tools::getValue('PS_JS_THEME_CACHE')) ||
!Configuration::updateValue('PS_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_HTML_THEME_COMPRESSION')) ||
!Configuration::updateValue('PS_JS_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_JS_HTML_THEME_COMPRESSION')) ||
!Configuration::updateValue('PS_HIGH_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_HIGH_HTML_THEME_COMPRESSION')))
!Configuration::updateValue('PS_HIGH_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_HIGH_HTML_THEME_COMPRESSION')) ||
!Configuration::updateValue('PS_HTACCESS_CACHE_CONTROL', (int)Tools::getValue('PS_HTACCESS_CACHE_CONTROL')))
$this->errors[] = Tools::displayError('Unknown error.');
else
{
$redirecAdmin = true;
if (Configuration::get('PS_HTACCESS_CACHE_CONTROL'))
Tools::generateHtaccess();
}
}
else
$this->errors[] = Tools::displayError('You do not have permission to edit here.');