diff --git a/admin/themes/default/template/helpers/list/list_header.tpl b/admin/themes/default/template/helpers/list/list_header.tpl index f79cf3725..bf7678e4f 100644 --- a/admin/themes/default/template/helpers/list/list_header.tpl +++ b/admin/themes/default/template/helpers/list/list_header.tpl @@ -189,7 +189,7 @@ {/if} {block name="updatelist"} - {if $use_new_list_header_design} + {if $new_list_header_design}
{if $fields_optional|count} @@ -436,7 +436,7 @@ {/if} {/foreach} - {if $fields_optional|count && !$use_new_list_header_design} + {if $fields_optional|count && !$new_list_header_design} @@ -622,7 +622,7 @@ {/block} {block name="tableFilter"} - {if !$simple_header && $show_filters && !$use_new_list_header_design} + {if !$simple_header && $show_filters && !$new_list_header_design} {if $has_bulk_actions} diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 17c738fe3..1e127f8e7 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -198,7 +198,7 @@ class AdminControllerCore extends Controller protected $_filterHaving; /** @var string */ - protected $_use_new_list_header_design = false; + protected $_new_list_header_design = false; /** @var array Temporary SQL table WHERE clause determined by filter fields */ protected $_tmpTableFilter = ''; @@ -2514,7 +2514,7 @@ class AdminControllerCore extends Controller } $this->setHelperDisplay($helper); - $helper->_use_new_list_header_design = $this->_use_new_list_header_design; + $helper->_new_list_header_design = $this->_new_list_header_design; $helper->_default_pagination = $this->_default_pagination; $helper->_pagination = $this->_pagination; $helper->tpl_vars = $this->getTemplateListVars(); diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index 3b6c2cfe6..df607f131 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -38,7 +38,7 @@ class HelperListCore extends Helper /** @var array WHERE clause determined by filter fields */ protected $_filter; - public $_use_new_list_header_design = false; + public $_new_list_header_design = false; /** @var array Number of results in list per page (used in select field) */ public $_pagination = array(20, 50, 100, 300, 1000); @@ -744,7 +744,7 @@ class HelperListCore extends Helper Context::getContext()->smarty->assign(array( 'page' => $page, 'simple_header' => $this->simple_header, - 'use_new_list_header_design' => $this->_use_new_list_header_design, + 'new_list_header_design' => $this->_new_list_header_design, 'total_pages' => $total_pages, 'selected_pagination' => $selected_pagination, 'pagination' => $this->_pagination, diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 68e77b8af..6c763f10c 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -355,7 +355,7 @@ class AdminCustomersControllerCore extends AdminController ); } - $this->_use_new_list_header_design = true; + $this->_new_list_header_design = true; return parent::renderList(); } diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php index 0547a378c..87a959951 100644 --- a/controllers/admin/AdminNormalProductsController.php +++ b/controllers/admin/AdminNormalProductsController.php @@ -2516,7 +2516,7 @@ class AdminNormalProductsControllerCore extends AdminController $this->addRowAction('duplicate'); $this->addRowAction('delete'); - $this->_use_new_list_header_design = true; + $this->_new_list_header_design = true; return parent::renderList(); } diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 77bd7dd48..4fc9508f5 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -671,7 +671,7 @@ class AdminOrdersControllerCore extends AdminController $this->tpl_list_vars['title'] = $this->l('Orders'); - $this->_use_new_list_header_design = true; + $this->_new_list_header_design = true; return parent::renderList(); } diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 5dfa2727e..811207d39 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2549,7 +2549,7 @@ class AdminProductsControllerCore extends AdminController $this->tpl_list_vars['title'] = $this->l('Room Types'); - $this->_use_new_list_header_design = true; + $this->_new_list_header_design = true; return parent::renderList(); }