diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl index bbf8f2429..c41214c2f 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl @@ -1,6 +1,6 @@ {if $show_toolbar}
-
+
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}

diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index 6fd450d21..a70e04801 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl @@ -26,7 +26,7 @@ {if $show_toolbar}
-
+
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}

diff --git a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl index dc10217b8..ded49c4a0 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl +++ b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl @@ -32,7 +32,7 @@ {if $show_toolbar}
-
+
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}

{block name=pageTitle} diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl index e057cf1c6..43e86a0dd 100755 --- a/admin-dev/themes/default/template/controllers/orders/form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/form.tpl @@ -813,7 +813,7 @@ {if $show_toolbar}
-
+
{include file="toolbar.tpl"}

diff --git a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl index 261142165..92449bdb8 100644 --- a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl @@ -32,7 +32,7 @@ $(function() { {if $show_toolbar}
-
+
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}

diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index e31e431f5..1b0506bbc 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -26,7 +26,7 @@ {if $show_toolbar}
-
+
{include file="toolbar.tpl"}

diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl index 9e7486df9..90202a8ee 100644 --- a/admin-dev/themes/default/template/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl @@ -60,7 +60,7 @@ {if $show_toolbar}
-
+
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}

{block name=pageTitle} diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl index 63fae5c98..e5a2de47f 100644 --- a/admin-dev/themes/default/template/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/helpers/options/options.tpl @@ -26,7 +26,7 @@ {if $show_toolbar}
-
+
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}

diff --git a/admin-dev/themes/default/template/helpers/view/view.tpl b/admin-dev/themes/default/template/helpers/view/view.tpl index e7d444861..fd3caec6e 100644 --- a/admin-dev/themes/default/template/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/helpers/view/view.tpl @@ -26,7 +26,7 @@ {if $show_toolbar}
-
+
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 14209ce7b..90f418664 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -120,7 +120,7 @@ class AdminControllerCore extends Controller protected $toolbar_btn = null; /** @var boolean scrolling toolbar */ - protected $toolbar_fix = true; + protected $toolbar_scroll = true; /** @var boolean set to false to hide toolbar and page title */ protected $show_toolbar = true; @@ -1530,7 +1530,7 @@ class AdminControllerCore extends Controller $helper->title = $this->toolbar_title; $helper->toolbar_btn = $this->toolbar_btn; $helper->show_toolbar = $this->show_toolbar; - $helper->toolbar_fix = $this->toolbar_fix; + $helper->toolbar_scroll = $this->toolbar_scroll; $helper->override_folder = $this->tpl_folder; $helper->actions = $this->actions; $helper->simple_header = $this->list_simple_header; diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php index 6199161cc..e460033e0 100755 --- a/classes/helper/Helper.php +++ b/classes/helper/Helper.php @@ -41,7 +41,7 @@ class HelperCore public $title; public $show_toolbar = true; public $context; - public $toolbar_fix = false; + public $toolbar_scroll = false; /** * @var Module diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php index f7192bf7e..272f5221b 100644 --- a/classes/helper/HelperForm.php +++ b/classes/helper/HelperForm.php @@ -147,7 +147,7 @@ class HelperFormCore extends Helper 'title' => $this->title, 'toolbar_btn' => $this->toolbar_btn, 'show_toolbar' => $this->show_toolbar, - 'toolbar_fix' => $this->toolbar_fix, + 'toolbar_scroll' => $this->toolbar_scroll, 'submit_action' => $this->submit_action, 'firstCall' => $this->first_call, 'current' => $this->currentIndex, diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index ca72b3c39..a6fa73999 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -588,7 +588,7 @@ class HelperListCore extends Helper $this->header_tpl->assign(array_merge($this->tpl_vars, array( 'title' => $this->title, 'show_toolbar' => $this->show_toolbar, - 'toolbar_fix' => $this->toolbar_fix, + 'toolbar_scroll' => $this->toolbar_scroll, 'toolbar_btn' => $this->toolbar_btn, 'table' => $this->table, 'currentIndex' => $this->currentIndex, diff --git a/classes/helper/HelperOptions.php b/classes/helper/HelperOptions.php index 3e2722267..16effc4a3 100644 --- a/classes/helper/HelperOptions.php +++ b/classes/helper/HelperOptions.php @@ -143,7 +143,7 @@ class HelperOptionsCore extends Helper 'title' => $this->title, 'toolbar_btn' => $this->toolbar_btn, 'show_toolbar' => $this->show_toolbar, - 'toolbar_fix' => $this->toolbar_fix, + 'toolbar_scroll' => $this->toolbar_scroll, 'current' => $this->currentIndex, 'table' => $this->table, 'token' => $this->token, diff --git a/classes/helper/HelperView.php b/classes/helper/HelperView.php index f07b49deb..02d018343 100644 --- a/classes/helper/HelperView.php +++ b/classes/helper/HelperView.php @@ -53,7 +53,7 @@ class HelperViewCore extends Helper 'token' => $this->token, 'table' => $this->table, 'show_toolbar' => $this->show_toolbar, - 'toolbar_fix' => $this->toolbar_fix, + 'toolbar_scroll' => $this->toolbar_scroll, 'toolbar_btn' => $this->toolbar_btn, 'link' => $this->context->link ));