From 56e698165ce9517ed30a3d7f57357f5e28f256fe Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Fri, 4 Nov 2011 11:10:12 +0000
Subject: [PATCH] // #PSFV-94 AdminCategories breadcrumb in lead-in, // bugfix
 helperList

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9882 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../themes/template/categories/list_header.tpl  | 14 ++++++++++++++
 classes/HelperList.php                          | 17 +++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 admin-dev/themes/template/categories/list_header.tpl

diff --git a/admin-dev/themes/template/categories/list_header.tpl b/admin-dev/themes/template/categories/list_header.tpl
new file mode 100644
index 000000000..db3bc3595
--- /dev/null
+++ b/admin-dev/themes/template/categories/list_header.tpl
@@ -0,0 +1,14 @@
+{extends file="helper/list/list_header.tpl"}
+{block name=leadin}
+<div class="cat_bar2">
+	{if count($categories_tree) == 0}
+		&nbsp;<img src="../img/admin/home.gif" alt="" /> {l s='Home'}
+	{else}
+			&nbsp;<img src="../img/admin/home.gif" alt="" /> {l s='Home'}&nbsp;>&nbsp;
+
+		{foreach $categories_tree key=key item=category}
+				{$category.name}
+		{/foreach}
+	{/if}
+</div>
+{/block}
diff --git a/classes/HelperList.php b/classes/HelperList.php
index 3a0c33392..d2872a1c2 100644
--- a/classes/HelperList.php
+++ b/classes/HelperList.php
@@ -319,7 +319,7 @@ class HelperListCore extends Helper
 			}
 		}
 
-		$this->content_tpl->assign(array(
+		$this->content_tpl->assign(array_merge($this->tpl_vars, array(
 			'shop_link_type' => $this->shopLinkType,
 			'name' => isset($name) ? $name : null,
 			'is_dnd_identifier' => $this->is_dnd_identifier,
@@ -344,8 +344,7 @@ class HelperListCore extends Helper
 			'has_actions' => !empty($this->actions),
 			'has_bulk_actions' => !empty($this->bulk_actions),
 			'list_skip_actions' => $this->list_skip_actions,
-			'tpl_vars' => $this->tpl_vars
-		));
+		)));
 		return $this->content_tpl->fetch();
 	}
 
@@ -565,8 +564,8 @@ class HelperListCore extends Helper
 			$params['value'] = $value;
 			$this->fieldsDisplay[$key] = $params;
 		}
-
-		$this->header_tpl->assign(array(
+		
+		$this->header_tpl->assign(array_merge($this->tpl_vars, array(
 			'table' => $this->table,
 			'currentIndex' => $this->currentIndex,
 			'action' => $action,
@@ -597,8 +596,7 @@ class HelperListCore extends Helper
 
 			'back' => Tools::getValue('back'),
 			'no_back' => $this->no_back,
-			'tpl_vars' => $this->tpl_vars,
-		));
+		)));
 
 		return $this->header_tpl->fetch();
 	}
@@ -608,7 +606,7 @@ class HelperListCore extends Helper
 	 */
 	public function displayListFooter($token = null)
 	{
-		$this->footer_tpl->assign(array(
+		$this->footer_tpl->assign(array_merge($this->tpl_vars, array(
 			'token' => $this->token,
 			'table' => $this->table,
 			'current' => $this->currentIndex,
@@ -617,8 +615,7 @@ class HelperListCore extends Helper
 
 			'back' => Tools::getValue('back'),
 			'no_back' => $this->no_back,
-			'tpl_vars' =>$this->tpl_vars
-		));
+		)));
 		return $this->footer_tpl->fetch();
 	}