Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

admin-dev/themes/default/css/vendor/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

classes/controller/AdminController.php

@@ -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)
+		if (!$this->bootstrap)
-		//{
+			$this->setDeprecatedMedia();
-			$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');
-			
-		//}
 		
-		//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/AdminDashboardController.php

@@ -49,7 +49,7 @@ class AdminDashboardControllerCore extends AdminController
 			_PS_JS_DIR_.'/admin-dashboard.js',
 		));
 		$this->addCSS(array(
-			__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/nv.d3.css',
+			__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/vendor/nv.d3.css',
 		));
 	}
 

controllers/admin/AdminModulesController.php

@@ -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

@@ -36,6 +36,7 @@ class Gapi extends Module
 		$this->version = 0.9;
 		$this->author = 'PrestaShop';
 		$this->need_instance = 0;
+		$this->bootstrap = true;
 
 		parent::__construct();
 

modules/graphnvd3/graphnvd3.php

@@ -66,7 +66,7 @@ class GraphNvD3 extends ModuleGraphEngine
 			_PS_JS_DIR_.'/vendor/d3.js',
 			__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/js/vendor/nv.d3.min.js',
 		));
-		$this->context->controller->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/css/nv.d3.css');
+		$this->context->controller->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/css/vendor/nv.d3.css');
 	}
 
 	public static function hookGraphEngine($params, $drawer)