From 1849995291a375bd9a6a25f6be26bc2584f87f7f Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Fri, 11 Oct 2013 15:35:45 +0200
Subject: [PATCH] // Code cleaning

---
 admin-dev/header.inc.php                    |  2 +-
 classes/controller/AdminController.php      | 10 ++++++----
 controllers/admin/AdminGroupsController.php |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php
index 5ed525a84..26110efc9 100644
--- a/admin-dev/header.inc.php
+++ b/admin-dev/header.inc.php
@@ -39,7 +39,7 @@ echo '
 		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/ui/themes/base/jquery.ui.datepicker.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/cluetip/jquery.cluetip.css" />
-		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/admin.css" />
+		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/backward/admin.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/plugins/chosen/jquery.chosen.css" />
 		<title>PrestaShop&trade; - '.Translate::getAdminTranslation('Administration panel').'</title>
 		<script type="text/javascript">
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 1f8fb2076..52e31c35d 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1917,10 +1917,12 @@ 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');
-
+		// Deprecated stylesheets
+		if (!$this->bootstrap)
+		{
+			$this->addCSS(_PS_CSS_DIR_.'admin.css', 'all');
+			$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward/admin.css', 'all');
+		}
 		//Bootstrap v3.00 + Specific Admin Theme
 		$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin-theme.css', 'all');
 
diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php
index d5e927026..8a2e68531 100644
--- a/controllers/admin/AdminGroupsController.php
+++ b/controllers/admin/AdminGroupsController.php
@@ -28,7 +28,7 @@ class AdminGroupsControllerCore extends AdminController
 {
 	public function __construct()
 	{
-		$this->bootstrap = true ;
+		$this->bootstrap = true;
 		$this->table = 'group';
 		$this->className = 'Group';
 		$this->list_id = 'group';