Commit ba66547e authored by Gregory Roussac's avatar Gregory Roussac

Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6

parents a7a05287 c2c2b3ff
......@@ -46,6 +46,8 @@ class TabCore extends ObjectModel
/** @var integer hide_host_mode */
public $hide_host_mode = false;
const TAB_MODULE_LIST_URL = _PS_TAB_MODULE_LIST_URL_;
/**
* @see ObjectModel::$definition
*/
......@@ -164,6 +166,7 @@ class TabCore extends ObjectModel
*/
public static function getCurrentTabId()
{
$id_tab = Tab::getIdFromClassName(Tools::getValue('controller'));
// retro-compatibility 1.4/1.5
if (empty ($id_tab))
......
......@@ -22,7 +22,7 @@
/* LOADER */
.bx-wrapper .bx-loading {
min-height: 50px;
background: url(/images/bx_loader.gif) center center no-repeat;
background: url(images/bx_loader.gif) center center no-repeat;
height: 100%;
width: 100%;
position: absolute;
......
......@@ -67,27 +67,27 @@ $plugins = array(
array('new_file' => 'admin/themes.js', 'name' => 'themes'),
'admin-dashboard.js' =>
array('new_file' => 'admin/dashboard.js', 'name' => 'dashboard'),
'admin-products.js'
'admin-products.js' =>
array('new_file' => 'admin/products.js', 'name' => 'products'),
'adminImport.js'
'adminImport.js' =>
array('new_file' => 'admin/import.js', 'name' => 'import'),
'admin_carrier_wizard.js'
'admin_carrier_wizard.js' =>
array('new_file' => 'admin/carrier_wizard.js', 'name' => 'carrier_wizard'),
'admin_order.js'
'admin_order.js' =>
array('new_file' => 'admin/orders.js', 'name' => 'orders'),
'attributesBack.js'
'attributesBack.js' =>
array('new_file' => 'admin/attributes.js', 'name' => 'attributes'),
'admin-scene-cropping.js'
'admin-scene-cropping.js' =>
array('new_file' => 'admin/scenes.js', 'name' => 'scenes'),
'admin-dnd.js'
'admin-dnd.js' =>
array('new_file' => 'admin/dnd.js', 'name' => 'dnd'),
'login.js'
'login.js' =>
array('new_file' => 'admin/login.js', 'name' => 'login'),
'notifications.js'
'notifications.js' =>
array('new_file' => 'admin/notifications.js', 'name' => 'login'),
'price.js'
'price.js' =>
array('new_file' => 'admin/price.js', 'name' => 'login'),
'tinymce.inc.js'
'tinymce.inc.js' =>
array('new_file' => 'admin/tinymce.inc.js', 'name' => 'tinymce'),
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment