From e462d968f0186bb7e8f73cc15d45058dc5e24af8 Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Tue, 28 Feb 2012 17:39:40 +0000 Subject: [PATCH] // rename $toolbar_fix to $toolbar_scroll part2 --- controllers/admin/AdminAttributesGroupsController.php | 2 +- controllers/admin/AdminCartRulesController.php | 2 +- controllers/admin/AdminFeaturesController.php | 4 ++-- controllers/admin/AdminImportController.php | 2 +- controllers/admin/AdminManufacturersController.php | 2 +- controllers/admin/AdminMetaController.php | 4 ++-- controllers/admin/AdminModulesPositionsController.php | 2 +- controllers/admin/AdminOrdersController.php | 2 +- controllers/admin/AdminProductsController.php | 2 +- controllers/admin/AdminShopController.php | 2 +- controllers/admin/AdminStatusesController.php | 2 +- controllers/admin/AdminStockManagementController.php | 2 +- controllers/admin/AdminSupplyOrdersController.php | 8 ++++---- controllers/admin/AdminTabsController.php | 2 +- controllers/admin/AdminTaxRulesGroupController.php | 2 +- controllers/admin/AdminTranslationsController.php | 2 +- modules/blockcms/blockcms.php | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php index dcb2710b0..c497f6886 100644 --- a/controllers/admin/AdminAttributesGroupsController.php +++ b/controllers/admin/AdminAttributesGroupsController.php @@ -146,7 +146,7 @@ class AdminAttributesGroupsControllerCore extends AdminController $helper->no_link = true; $helper->shopLinkType = ''; $helper->identifier = $this->identifier; - $helper->toolbar_fix = false; + $helper->toolbar_scroll = false; $helper->orderBy = 'position'; $helper->orderWay = 'ASC'; $helper->currentIndex = self::$currentIndex; diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index 8cb966982..d9fd8064d 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -466,7 +466,7 @@ class AdminCartRulesControllerCore extends AdminController array( 'show_toolbar' => true, 'toolbar_btn' => $this->toolbar_btn, - 'toolbar_fix' => $this->toolbar_fix, + 'toolbar_scroll' => $this->toolbar_scroll, 'title' => $this->l('Payment : Cart Rules '), 'defaultDateFrom' => date('Y-m-d H:00:00'), 'defaultDateTo' => date('Y-m-d H:00:00', strtotime('+1 month')), diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index 40d8ab715..dd47bff34 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -131,7 +131,7 @@ class AdminFeaturesControllerCore extends AdminController $helper->no_link = true; $helper->shopLinkType = ''; $helper->identifier = $this->identifier; - $helper->toolbar_fix = false; + $helper->toolbar_scroll = false; $helper->orderBy = 'position'; $helper->orderWay = 'ASC'; $helper->currentIndex = self::$currentIndex; @@ -286,7 +286,7 @@ class AdminFeaturesControllerCore extends AdminController $helper->identifier = 'id_feature_value'; $helper->override_folder = 'feature_value/'; $helper->id = $feature_value->id; - $helper->toolbar_fix = false; + $helper->toolbar_scroll = false; $helper->tpl_vars = $this->tpl_vars; $helper->languages = $this->_languages; $helper->default_form_language = $this->default_form_language; diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index ef911563e..4e2cbc1d6 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -431,7 +431,7 @@ class AdminImportControllerCore extends AdminController $this->fields_form = array(''); - $this->toolbar_fix = false; + $this->toolbar_scroll = false; $this->toolbar_btn = array(); // adds fancybox diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 1ef8788d6..27cd103fb 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -518,7 +518,7 @@ class AdminManufacturersControllerCore extends AdminController $helper->identifier = $this->identifier; $helper->title = $this->l('Edit Addresses'); $helper->id = $address->id; - $helper->toolbar_fix = true; + $helper->toolbar_scroll = true; $helper->languages = $this->_languages; $helper->default_form_language = $this->default_form_language; $helper->allow_employee_form_lang = $this->allow_employee_form_lang; diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index 69f6e9aa5..be1cc636a 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -30,7 +30,7 @@ class AdminMetaControllerCore extends AdminController public $table = 'meta'; public $className = 'Meta'; public $lang = true; - protected $toolbar_fix = false; + protected $toolbar_scroll = false; public function __construct() { @@ -319,7 +319,7 @@ class AdminMetaControllerCore extends AdminController { $helper = new HelperOptions($this); $this->setHelperDisplay($helper); - $helper->toolbar_fix = true; + $helper->toolbar_scroll = true; $helper->toolbar_btn = array('save' => array( 'href' => '#', 'desc' => $this->l('Save') diff --git a/controllers/admin/AdminModulesPositionsController.php b/controllers/admin/AdminModulesPositionsController.php index 4f8e73e33..592ca85fe 100644 --- a/controllers/admin/AdminModulesPositionsController.php +++ b/controllers/admin/AdminModulesPositionsController.php @@ -272,7 +272,7 @@ class AdminModulesPositionsControllerCore extends AdminController 'show_toolbar' => true, 'toolbar_btn' => $this->toolbar_btn, 'title' => $this->toolbar_title, - 'toolbar_fix' => 'false', + 'toolbar_scroll' => 'false', 'token' => $this->token, 'url_show_modules' => self::$currentIndex.'&token='.$this->token.'&show_modules=', 'modules' => $module_instances, diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 1c2bd0dca..0c0c44a41 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -107,7 +107,7 @@ class AdminOrdersControllerCore extends AdminController 'order_states' => OrderState::getOrderStates((int)Context::getContext()->language->id), 'show_toolbar' => $this->show_toolbar, 'toolbar_btn' => $this->toolbar_btn, - 'toolbar_fix' => $this->toolbar_fix, + 'toolbar_scroll' => $this->toolbar_scroll, 'title' => $this->l('Orders : create order'), )); $this->content .= $this->createTemplate('form.tpl')->fetch(); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 0be92954e..cc8e5ace7 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2105,7 +2105,7 @@ class AdminProductsControllerCore extends AdminController } parent::initToolbar(); - $this->context->smarty->assign('toolbar_fix', 1); + $this->context->smarty->assign('toolbar_scroll', 1); $this->context->smarty->assign('show_toolbar', 1); $this->context->smarty->assign('toolbar_btn', $this->toolbar_btn); } diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index 7fc0b2463..09ca456dd 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -146,7 +146,7 @@ class AdminShopControllerCore extends AdminController } parent::initToolbar(); - $this->context->smarty->assign('toolbar_fix', 1); + $this->context->smarty->assign('toolbar_scroll', 1); } public function renderList() diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php index 82f8cec49..346f5bc2d 100644 --- a/controllers/admin/AdminStatusesController.php +++ b/controllers/admin/AdminStatusesController.php @@ -373,7 +373,7 @@ class AdminStatusesControllerCore extends AdminController $helper->table = 'order_return_state'; $helper->identifier = 'id_order_return_state'; $helper->id = $order_return_state->id; - $helper->toolbar_fix = false; + $helper->toolbar_scroll = false; $helper->languages = $this->_languages; $helper->default_form_language = $this->default_form_language; $helper->allow_employee_form_lang = $this->allow_employee_form_lang; diff --git a/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php index e51163fd5..f405b2386 100644 --- a/controllers/admin/AdminStockManagementController.php +++ b/controllers/admin/AdminStockManagementController.php @@ -826,7 +826,7 @@ class AdminStockManagementControllerCore extends AdminController // Render list $helper = new HelperList(); $helper->bulk_actions = array(); - $helper->toolbar_fix = $this->toolbar_fix; + $helper->toolbar_scroll = $this->toolbar_scroll; $helper->show_toolbar = false; $helper->actions = $this->actions; $helper->list_skip_actions = $this->list_skip_actions; diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index 4b7a4e562..e27283c85 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -577,7 +577,7 @@ class AdminSupplyOrdersControllerCore extends AdminController $helper->submit_action = 'submitChangestate'; $helper->currentIndex = self::$currentIndex; $helper->toolbar_btn = $this->toolbar_btn; - $helper->toolbar_fix = false; + $helper->toolbar_scroll = false; $helper->token = $this->token; $helper->id = null; // no display standard hidden field in the form $helper->languages = $this->_languages; @@ -1523,7 +1523,7 @@ class AdminSupplyOrdersControllerCore extends AdminController $helper = new HelperList(); $helper->no_link = true; $helper->show_toolbar = false; - $helper->toolbar_fix = false; + $helper->toolbar_scroll = false; $helper->shopLinkType = ''; $helper->identifier = $this->identifier; //$helper->colorOnBackground = true; @@ -1576,7 +1576,7 @@ class AdminSupplyOrdersControllerCore extends AdminController $helper = new HelperList(); $helper->no_link = true; $helper->show_toolbar = false; - $helper->toolbar_fix = false; + $helper->toolbar_scroll = false; $helper->shopLinkType = ''; $helper->identifier = $this->identifier; $helper->colorOnBackground = true; @@ -1663,7 +1663,7 @@ class AdminSupplyOrdersControllerCore extends AdminController public function renderView() { $this->show_toolbar = true; - $this->toolbar_fix = false; + $this->toolbar_scroll = false; $this->table = 'supply_order_detail'; $this->identifier = 'id_supply_order_detail'; $this->className = 'SupplyOrderDetail'; diff --git a/controllers/admin/AdminTabsController.php b/controllers/admin/AdminTabsController.php index b905379fc..9cf72413a 100644 --- a/controllers/admin/AdminTabsController.php +++ b/controllers/admin/AdminTabsController.php @@ -223,7 +223,7 @@ class AdminTabsControllerCore extends AdminController $helper->shopLinkType = ''; $helper->identifier = $this->identifier; $helper->imageType = $this->imageType; - $helper->toolbar_fix = false; + $helper->toolbar_scroll = false; $helper->show_toolbar = false; $helper->orderBy = 'position'; $helper->orderWay = 'ASC'; diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php index 878498592..1871bbe62 100644 --- a/controllers/admin/AdminTaxRulesGroupController.php +++ b/controllers/admin/AdminTaxRulesGroupController.php @@ -333,7 +333,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController $helper->table = 'tax_rule'; $helper->identifier = 'id_tax_rule'; $helper->id = $obj->id; - $helper->toolbar_fix = true; + $helper->toolbar_scroll = true; $helper->show_toolbar = false; $helper->languages = $this->_languages; $helper->default_form_language = $this->default_form_language; diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 75375f048..62df00475 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -120,7 +120,7 @@ class AdminTranslationsControllerCore extends AdminController 'url_create_language' => 'index.php?tab=AdminLanguages&addlang&token='.Tools::getAdminToken('AdminLanguages'.(int)(Tab::getIdFromClassName('AdminLanguages')).(int)$this->context->employee->id), ); - $this->toolbar_fix = false; + $this->toolbar_scroll = false; $this->base_tpl_view = 'main.tpl'; return parent::renderView(); } diff --git a/modules/blockcms/blockcms.php b/modules/blockcms/blockcms.php index 2668f9131..23b42b87b 100755 --- a/modules/blockcms/blockcms.php +++ b/modules/blockcms/blockcms.php @@ -428,7 +428,7 @@ class BlockCms extends Module $helper->currentIndex = AdminController::$currentIndex.'&configure='.$this->name; $helper->default_form_language = $this->context->controller->default_form_language; $helper->allow_employee_form_lang = $this->context->controller->allow_employee_form_lang; - $helper->toolbar_fix = true; + $helper->toolbar_scroll = true; $helper->toolbar_btn = $this->initToolbar(); return $helper;