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

// Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch

Browse Source
This commit is contained in:
Kevin Granger
2013-06-28 19:35:32 +02:00
parent aa8d6d5872
commit d583cf25d2
83 changed files with 15331 additions and 19707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+10 -3
View File
@@ -1712,10 +1712,14 @@ class AdminControllerCore extends Controller
$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
$admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath);
//Deprecated stylesheets
$this->addCSS(_PS_CSS_DIR_.'admin.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/ps-admin-bootstrap.css', 'all');
//$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/ps-admin-bootstrap-responsive.css', 'screen');
//Bootstrap v3.00 + Specific Admin Theme
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin-theme.css', 'all');
// Reset bootstrap style for the #nobootstrap field - Backward compatibility
$this->addCSS(_PS_CSS_DIR_.'bootstrap_admin_reset.css', 'all');
@@ -1731,9 +1735,12 @@ class AdminControllerCore extends Controller
_PS_JS_DIR_.'tools.js',
_PS_JS_DIR_.'ajax.js',
_PS_JS_DIR_.'toolbar.js',
_PS_JS_DIR_.'vendor/bootstrap-ck.js'
));
//loads specific javascripts for the admin theme, bootstrap.js should be moved into /js root directory
$this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/bootstrap.js');
$this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/admin-theme.js');
if (!Tools::getValue('submitFormAjax'))
{
$this->addJs(_PS_JS_DIR_.'notifications.js');