From fd1050b0db58247b00bbd0735d4bc9e723014b49 Mon Sep 17 00:00:00 2001
From: Vincent Augagneur <vincent.augagneur@prestashop.com>
Date: Tue, 10 Dec 2013 09:43:15 +0100
Subject: [PATCH] //tab module list fix

---
 .../template/controllers/localization/content.tpl     |  8 ++------
 classes/controller/AdminController.php                |  2 +-
 controllers/admin/AdminCmsCategoriesController.php    |  1 +
 controllers/admin/AdminDeliverySlipController.php     |  1 +
 controllers/admin/AdminLocalizationController.php     | 11 ++++++++---
 controllers/admin/AdminManufacturersController.php    |  1 +
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/localization/content.tpl b/admin-dev/themes/default/template/controllers/localization/content.tpl
index 4515293f5..81a2423d2 100644
--- a/admin-dev/themes/default/template/controllers/localization/content.tpl
+++ b/admin-dev/themes/default/template/controllers/localization/content.tpl
@@ -23,10 +23,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<div class="width4">
-	{if isset($localization_form)}{$localization_form}{/if}
-</div>
+{if isset($localization_form)}{$localization_form}{/if}
 <br />
-<div class="width4">
-	{if isset($localization_options)}{$localization_options}{/if}
-</div>
\ No newline at end of file
+{if isset($localization_options)}{$localization_options}{/if}
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 18b742196..9d5840d14 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1547,7 +1547,7 @@ class AdminControllerCore extends Controller
 		if (!empty($country_module_list) && is_string($country_module_list) && $country_module_list_xml = simplexml_load_string($country_module_list))
 		{
 			$country_module_list_array = array();
-			if (is_array($country_module_list_xml->module))
+			if (isset($country_module_list_xml->module))
 				foreach ($country_module_list_xml->module as $k => $m)
 					$country_module_list_array[] = (string)$m->name;
 			$this->tab_modules_list['slider_list'] = array_intersect($this->tab_modules_list['slider_list'], $country_module_list_array);
diff --git a/controllers/admin/AdminCmsCategoriesController.php b/controllers/admin/AdminCmsCategoriesController.php
index d973f22be..8c5db0f8c 100644
--- a/controllers/admin/AdminCmsCategoriesController.php
+++ b/controllers/admin/AdminCmsCategoriesController.php
@@ -71,6 +71,7 @@ class AdminCmsCategoriesControllerCore extends AdminController
 	{
 		$this->initToolbar();
         $this->toolbar_btn['new']['href'] .= '&amp;id_parent='.(int)Tools::getValue('id_cms_category');
+        $this->initTabModuleList();
 		return parent::renderList();
 	}
 
diff --git a/controllers/admin/AdminDeliverySlipController.php b/controllers/admin/AdminDeliverySlipController.php
index c2cca91a9..b48faab60 100644
--- a/controllers/admin/AdminDeliverySlipController.php
+++ b/controllers/admin/AdminDeliverySlipController.php
@@ -120,6 +120,7 @@ class AdminDeliverySlipControllerCore extends AdminController
 
 	public function initContent()
 	{
+		$this->initTabModuleList();
 		$this->content .= $this->renderForm().'<br />';
 		$this->show_toolbar = false;
 		$this->content .= $this->renderOptions();
diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php
index 508b7b83c..adabe7b96 100644
--- a/controllers/admin/AdminLocalizationController.php
+++ b/controllers/admin/AdminLocalizationController.php
@@ -304,7 +304,7 @@ class AdminLocalizationControllerCore extends AdminController
 			'download_updated_pack' => 1
 		);
 
-		$this->show_toolbar = false;
+		$this->show_toolbar = true;
 		return parent::renderForm();
 	}
 
@@ -315,7 +315,6 @@ class AdminLocalizationControllerCore extends AdminController
 
 		// toolbar (save, cancel, new, ..)
 		$this->initToolbar();
-
 		$this->context->smarty->assign(array(
 			'localization_form' => $this->renderForm(),
 			'localization_options' => $this->renderOptions(),
@@ -323,9 +322,15 @@ class AdminLocalizationControllerCore extends AdminController
 		));
 	}
 	
+	public function initToolbar()
+	{
+		$this->toolbar_btn = array();
+		$this->initTabModuleList();
+	}
+	
 	public function display()
 	{
-		$this->initContent();
+		$this->initContent();		
 		parent::display();
 	}
 
diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php
index 549925472..d3e66fb3a 100644
--- a/controllers/admin/AdminManufacturersController.php
+++ b/controllers/admin/AdminManufacturersController.php
@@ -638,6 +638,7 @@ class AdminManufacturersControllerCore extends AdminController
 	{
 		// toolbar (save, cancel, new, ..)
 		$this->initToolbar();
+		$this->initTabModuleList();
 		if ($this->display == 'editaddresses' || $this->display == 'addaddress')
 			$this->content .= $this->renderFormAddress();
 		else if ($this->display == 'edit' || $this->display == 'add')