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

// Fixed bootstrap mode for modules

Browse Source
This commit is contained in:
Damien Metzger
2013-11-05 17:29:51 +01:00
parent b68d8c5d4a
commit a31dbeb68e
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+11 -7
View File
@@ -1917,6 +1917,14 @@ class AdminControllerCore extends Controller
$this->helper = $helper;
}
public function setDeprecatedMedia()
{
$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
$admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath);
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all');
}
public function setMedia()
{
@@ -1927,14 +1935,10 @@ class AdminControllerCore extends Controller
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin-theme.css', 'all');
// Deprecated stylesheets + reset bootstrap style for the #nobootstrap field - Backward compatibility
//if (!$this->bootstrap)
//{
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all');
//}
if (!$this->bootstrap)
$this->setDeprecatedMedia();
//todo csss for rtl support
//todo css for rtl support
if ($this->context->language->is_rtl)
$this->addCSS(_THEME_CSS_DIR_.'rtl.css');
controllers/admin/AdminModulesController.php
+2
View File
@@ -694,6 +694,8 @@ class AdminModulesControllerCore extends AdminController
if ($key == 'configure' && Module::isInstalled($module->name))
{
$this->bootstrap = (isset($module->bootstrap) && $module->bootstrap);
if (!$this->bootstrap)
$this->setDeprecatedMedia();
if (isset($module->multishop_context))
$this->multishop_context = $module->multishop_context;
modules/gapi/gapi.php
+1
View File
@@ -36,6 +36,7 @@ class Gapi extends Module
$this->version = 0.9;
$this->author = 'PrestaShop';
$this->need_instance = 0;
$this->bootstrap = true;
parent::__construct();