From 7895f8643e1be9edf64c344fabf8e69c9e54402e Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Wed, 6 Nov 2013 14:42:56 +0100
Subject: [PATCH] // Fix missing page header in combinations generator

---
 .../controllers/attribute_generator/content.tpl    |  2 +-
 .../admin/AdminAttributeGeneratorController.php    | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
index e2a5ee277..e488dfcca 100644
--- a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
+++ b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
@@ -61,7 +61,7 @@
 	$(document).ready(function() { $('.price_impact').each(function() { calcPrice($(this), false); }); });
 </script>
 
-{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+{include file="page_header_toolbar.tpl" toolbar_btn=$page_header_toolbar_btn title=$page_header_toolbar_title}
 <div class="leadin">{block name="leadin"}{/block}</div>
 
 {if $generate}<div class="module_confirmation conf confirm">{l s='%d product(s) successfully created.' sprintf=$combinations_size}</div>{/if}
diff --git a/controllers/admin/AdminAttributeGeneratorController.php b/controllers/admin/AdminAttributeGeneratorController.php
index 6f104c0a9..e35b6f5a7 100644
--- a/controllers/admin/AdminAttributeGeneratorController.php
+++ b/controllers/admin/AdminAttributeGeneratorController.php
@@ -196,9 +196,12 @@ class AdminAttributeGeneratorControllerCore extends AdminController
 		));
 	}
 
-	public function initToolbar()
+	public function initPageHeaderToolbar()
 	{
-		$this->toolbar_btn['back'] = array(
+		parent::initPageHeaderToolbar();
+
+		$this->page_header_toolbar_title = $this->l('Attributes generator');
+		$this->page_header_toolbar_btn['back'] = array(
 			'href' => $this->context->link->getAdminLink('AdminProducts').'&id_product='.(int)Tools::getValue('id_product').'&addproduct&key_tab=Combinations',
 			'desc' => $this->l('Back to the product')
 		);
@@ -215,8 +218,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
 		}
 
 		// Init toolbar
-		$this->initToolbarTitle();
-		$this->initToolbar();
+		$this->initPageHeaderToolbar();
 		$this->initGroupTable();
 
 		$attributes = Attribute::getAttributes(Context::getContext()->language->id, true);
@@ -239,7 +241,9 @@ class AdminAttributeGeneratorControllerCore extends AdminController
 			'attribute_js' => $attribute_js,
 			'toolbar_btn' => $this->toolbar_btn,
 			'toolbar_scroll' => true,
-			'title' => $this->toolbar_title,
+			'show_page_header_toolbar' => $this->show_page_header_toolbar,
+			'page_header_toolbar_title' => $this->page_header_toolbar_title,
+			'page_header_toolbar_btn' => $this->page_header_toolbar_btn
 		));
 	}
 }