diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index 4019d228a..d3bccca7c 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -200,7 +200,8 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0 #productBox { position:relative; width:100%; float:left;} /*tab-pane*/ -form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:404px; padding: 5px 10px 10px; margin-left:140px;} +form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:404px; padding: 5px 10px 10px; margin-left:140px;} +#content form.adminstockmanagement {margin-left:0px;} form#product_form h4 { font-size:18px; font-weight:normal;} .tab-row {} .tab-row .tab {background:#EFEFEF;width:100px;} diff --git a/admin-dev/themes/template/helper/form/form.tpl b/admin-dev/themes/template/helper/form/form.tpl index e3070156e..e32799a8b 100644 --- a/admin-dev/themes/template/helper/form/form.tpl +++ b/admin-dev/themes/template/helper/form/form.tpl @@ -42,7 +42,7 @@ {if isset($fields.title)}

{$fields.title}

{/if} {block name="defaultForm"} -
+ {if $form_id} {/if} diff --git a/classes/AdminController.php b/classes/AdminController.php index bc8476cd6..8b65952b9 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -1535,6 +1535,7 @@ class AdminControllerCore extends Controller $helper->currentIndex = self::$currentIndex; $helper->className = $this->className; $helper->table = $this->table; + $helper->name_controller = Tools::getValue('controller'); $helper->orderBy = $this->_orderBy; $helper->orderWay = $this->_orderWay; $helper->listTotal = $this->_listTotal; diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php index dacf93b50..051da956c 100644 --- a/classes/helper/HelperForm.php +++ b/classes/helper/HelperForm.php @@ -37,6 +37,7 @@ class HelperFormCore extends Helper public $fields_value = array(); public $table; + public $name_controller = ''; /** @var string if not null, a title will be added on that list */ public $title = null; @@ -151,6 +152,7 @@ class HelperFormCore extends Helper 'current' => $this->currentIndex, 'token' => $this->token, 'table' => $this->table, + 'name_controller' => $this->name_controller, 'languages' => $this->languages, 'defaultFormLanguage' => $this->default_form_language, 'allowEmployeeFormLang' => $this->allow_employee_form_lang,