// #PSFV-94 - fixed bug related to new breadcrumb system

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9881 b9a71923-0436-4b27-9f14-aed3839534dd

admin-dev/themes/template/header.tpl

@@ -306,19 +306,6 @@ $(document).ready(function()
 								</div>
 							{/if}
 							
-							{* We should display breadcrumb only if needed *}
-							{if count($tabs_breadcrumb)>1}
-							<div class="path_bar">
-								<div id="help-button" class="floatr" style="display: none; font-family: Verdana; font-size: 10px; margin-right: 4px; margin-top: 4px;"></div>
-								<a href="?token={$home_token}">{l s='Back Office'}</a>
-								{foreach $tabs_breadcrumb AS $item}
-									<img src="../img/admin/separator_breadcrum.png" style="margin-right:5px" alt="&gt;" />
-									{if isset($item.token)}<a href="?controller={$item.class_name}&token={$item.token}">{/if}
-									{$item.name}
-									{if isset($item.token)}</a>{/if}
-								{/foreach}
-							</div>
-							{/if}
 							{if $is_multishop && $shop_context != 'all'}
 								<div class="multishop_info">
 									{if $shop_context == 'group'}

admin-dev/themes/template/helper/list/list_header.tpl

@@ -56,17 +56,20 @@
 		});
 	</script>
 
-	{if $show_toolbar}
-		<div class="pageTitle">
-		<h3>{block name=pageTitle}
-			<span id="current_obj" style="font-weight: normal;">{$page_title|default:'&nbsp;'}</span>
-			{/block}</h3>
-		</div>
-		{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-	{/if}
 
 {/if}{* End if simple_header *}
 
+{if $show_toolbar}
+<div class="toolbarBox">
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
+	<div class="pageTitle">
+	<h3>{block name=pageTitle}
+		<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
+		{/block}</h3>
+	</div>
+</div>
+{/if}
+{block name="leadin"}{/block}
 <a name="{$table}">&nbsp;</a>
 
 <form method="post" action="{$action}" class="form">

admin-dev/themes/template/toolbar.tpl

@@ -24,7 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<div class="toolbarBox">
 {block name=toolbarBox}
 	<ul class="cc_button">
 		{foreach from=$toolbar_btn item=btn key=k}
@@ -36,11 +35,6 @@
 			</li>
 		{/foreach}
 	</ul>
-	<div class="pageTitle">
-	<h3>{block name=pageTitle}
-		<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-		{/block}</h3>
-	</div>
 	<script language="javascript">
 		$(function() {
 			//get reference on save link
@@ -70,4 +64,3 @@
 		});
 	</script>
 {/block}
-</div>