// rename $toolbar_fix to $toolbar_scroll part2

2012-02-28 17:39:40 +00:00
parent d29e810d8d
commit e462d968f0
17 changed files with 22 additions and 22 deletions
@@ -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;
@@ -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')),
@@ -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;
@@ -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
@@ -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;
@@ -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')
@@ -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,
@@ -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();
@@ -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);
 	}
@@ -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()
@@ -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;
@@ -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;
@@ -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';
@@ -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';
@@ -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;
@@ -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();
 	}
@@ -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;