From 6bf7fa690829ea26350fd3879514b7bc626869f1 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Thu, 12 Apr 2012 08:34:38 +0000
Subject: [PATCH] [*] BO : #PI-123 - toolbar and page title refactoring

---
 .../controllers/access/helpers/form/form.tpl  |  12 +-
 .../accounting_configuration/content.tpl      |  14 +-
 .../accounting_registered_number/content.tpl  |  14 +-
 .../attribute_generator/content.tpl           |  12 +-
 .../template/controllers/cart_rules/form.tpl  |  17 +-
 .../controllers/import/helpers/form/form.tpl  |  15 +-
 .../controllers/modules_positions/form.tpl    |  13 +-
 .../modules_positions/list_modules.tpl        |  15 +-
 .../template/controllers/orders/form.tpl      |  20 +--
 .../controllers/search/helpers/view/view.tpl  |  14 +-
 .../default/template/helpers/form/form.tpl    |  13 +-
 .../template/helpers/list/list_header.tpl     |  12 +-
 .../template/helpers/options/options.tpl      |  15 +-
 .../default/template/helpers/view/view.tpl    |  13 +-
 admin-dev/themes/default/template/toolbar.tpl | 158 ++++++++++--------
 classes/controller/AdminController.php        |  46 ++---
 classes/helper/HelperView.php                 |   1 -
 .../AdminAttributeGeneratorController.php     |   1 +
 .../admin/AdminAttributesGroupsController.php |  23 +--
 .../admin/AdminCartRulesController.php        |   2 +-
 controllers/admin/AdminModulesController.php  |  20 ---
 .../admin/AdminModulesPositionsController.php |   1 +
 controllers/admin/AdminOrdersController.php   |   2 +-
 controllers/admin/AdminProductsController.php |   2 +-
 24 files changed, 162 insertions(+), 293 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
index e7a855f26..6208b3a71 100644
--- a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
@@ -168,18 +168,10 @@
 
 </script>
 
-
-<div class="toolbarBox">
 {if $show_toolbar}
-	{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>
-{/if}
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
 	<div class="leadin">{block name="leadin"}{/block}</div>
-</div>
+{/if}
 
 <div class="productTabs">
 	<ul class="tab">
diff --git a/admin-dev/themes/default/template/controllers/accounting_configuration/content.tpl b/admin-dev/themes/default/template/controllers/accounting_configuration/content.tpl
index 082019a10..6bd7674eb 100644
--- a/admin-dev/themes/default/template/controllers/accounting_configuration/content.tpl
+++ b/admin-dev/themes/default/template/controllers/accounting_configuration/content.tpl
@@ -24,16 +24,10 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<div class="toolbarBox">
-{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-	<div class="pageTitle">
-		<h3>
-				<span id="current_obj" style="font-weight: normal;">
-				{$title|default:'&nbsp;'}
-				</span>
-		</h3>
-	</div>
-</div>
+{if $show_toolbar}
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+	<div class="leadin">{block name="leadin"}{/block}</div>
+{/if}
 
 {if !$has_shop_selected}
 <div class="hint" style="display:block">{l s='Please select the shop you want to configure'}</div>
diff --git a/admin-dev/themes/default/template/controllers/accounting_registered_number/content.tpl b/admin-dev/themes/default/template/controllers/accounting_registered_number/content.tpl
index ad20194c9..4c7944dfd 100644
--- a/admin-dev/themes/default/template/controllers/accounting_registered_number/content.tpl
+++ b/admin-dev/themes/default/template/controllers/accounting_registered_number/content.tpl
@@ -24,16 +24,10 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<div class="toolbarBox">
-		{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-		<div class="pageTitle">
-			<h3>
-				<span id="current_obj" style="font-weight: normal;">
-					{$title|default:'&nbsp;'}
-				</span>
-			</h3>
-		</div>
-</div>
+{if $show_toolbar}
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+	<div class="leadin">{block name="leadin"}{/block}</div>
+{/if}
 
 <div id="account_list">
 	{foreach from=$account_number_list item=detail key=name}
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 1abccdeaf..8a2be937c 100644
--- a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
+++ b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
@@ -58,14 +58,10 @@
 	});
 </script>
 
-<div class="toolbarBox">
-	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-	<div class="pageTitle">
-	<h3>
-		<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-	</h3>
-	</div>
-</div>
+
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
+
 
 {if $generate}
 	<div class="module_confirmation conf confirm">
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
index d61bb91cd..9a86bcbe0 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
@@ -1,18 +1,5 @@
-{if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
-				{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>
-	</div>
-	<div class="leadin">{block name="leadin"}{/block}</div>
-{/if}
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
 
 <div>
  	<div class="productTabs">
diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
index be24c380c..a1eb3acf7 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -24,19 +24,8 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox{if $toolbar_scroll} toolbarHead{/if}">
-				{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-				<div class="pageTitle">
-				<h3>
-					<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-				</h3>
-				</div>
-			<div class="leadin">{block name="leadin"}{/block}</div>
-		</div>
-	</div>
-{/if}
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
 
 {if $module_confirmation}
 	<div class="module_confirmation conf confirm">
diff --git a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
index 6f16137b2..341349287 100644
--- a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
+++ b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
@@ -24,16 +24,9 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<div class="toolbarBox">
-{if $show_toolbar}
-	{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>
-{/if}
-</div>
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
+
 <form action="{$url_submit}" id={$table}_form method="post">
 	{if $display_key}
 		<input type="hidden" name="show_modules" value="{$display_key}" />
diff --git a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
index ec2116505..21ee20537 100644
--- a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
+++ b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
@@ -30,19 +30,8 @@
 </script>
 <script type="text/javascript" src="../js/admin-dnd.js"></script>
 
-{if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
-			{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>
-	</div>
-{/if}
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
 
 <div class="filter-module">
 <form>
diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index 1147dd469..a8cf7e9cd 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -840,23 +840,11 @@
 			}
 		});
 	}
-
 </script>
-{if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
-				{include file="toolbar.tpl"}
-				<div class="pageTitle">
-				<h3>
-					{block name=pageTitle}
-						<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-					{/block}
-				</h3>
-				</div>
-		</div>
-	</div>
-	<div class="leadin">{block name="leadin"}{/block}</div>
-{/if}
+
+{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+<div class="leadin">{block name="leadin"}{/block}</div>
+
 <fieldset id="customer_part"><legend><img src="../img/admin/tab-customers.gif" />{l s='Customer'}</legend>
 	<p><label>{l s='Search customers:'}</label><input type="text" id="customer" value="" />
 	<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')}&addcustomer&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span></a></p>
diff --git a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
index bdec6ea79..3ff352c40 100644
--- a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
@@ -31,18 +31,8 @@ $(function() {
 </script>
 
 {if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
-				{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>
-	</div>
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+	<div class="leadin">{block name="leadin"}{/block}</div>
 {/if}
 
 {if isset($features)}
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index ccb7b51e0..ff07026f2 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -25,18 +25,7 @@
 *}
 
 {if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
-				{include file="toolbar.tpl"}
-				<div class="pageTitle">
-				<h3>
-					{block name=pageTitle}
-						<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-					{/block}
-				</h3>
-				</div>
-		</div>
-	</div>
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
 	<div class="leadin">{block name="leadin"}{/block}</div>
 {/if}
 
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 89806758a..d9f682cca 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -59,17 +59,7 @@
 {/if}{* End if simple_header *}
 
 {if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
-			{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>
-	</div>
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
 {/if}
 
 {if !$simple_header}
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index b4ca5e1dd..7f0a3c215 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -25,20 +25,7 @@
 *}
 
 {if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
-				{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>
-	</div>
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
 	<div class="leadin">{block name="leadin"}{/block}</div>
 {/if}
 
diff --git a/admin-dev/themes/default/template/helpers/view/view.tpl b/admin-dev/themes/default/template/helpers/view/view.tpl
index fd3caec6e..0fda6f5dc 100644
--- a/admin-dev/themes/default/template/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/helpers/view/view.tpl
@@ -25,18 +25,7 @@
 *}
 
 {if $show_toolbar}
-	<div class="toolbar-placeholder">
-		<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
-				{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>
-	</div>
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
 {/if}
 
 <div class="leadin">{block name="leadin"}{/block}</div>
diff --git a/admin-dev/themes/default/template/toolbar.tpl b/admin-dev/themes/default/template/toolbar.tpl
index cb8292774..6b396b616 100644
--- a/admin-dev/themes/default/template/toolbar.tpl
+++ b/admin-dev/themes/default/template/toolbar.tpl
@@ -23,77 +23,101 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{block name=toolbarBox}
-	<ul class="cc_button">
-		{foreach from=$toolbar_btn item=btn key=k}
-			<li>
-				<a id="desc-{$table}-{$btn.imgclass|default:$k}" class="toolbar_btn" {if isset($btn.href)}href="{$btn.href}"{/if} title="{$btn.desc}" {if isset($btn.target) && $btn.target}target="_blank"{/if}{if isset($btn.js) && $btn.js}onclick="{$btn.js}"{/if}>
-					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>
-					<div {if isset($btn.force_desc) && $btn.force_desc == true } class="locked" {/if}>{$btn.desc}</div>
-				</a>
-			</li>
-		{/foreach}
-	</ul>
 
-	<script language="javascript">
-		$(function() {
-			//get reference on save link
-			btn_save = $('span[class~="process-icon-save"]').parent();
+<div class="toolbar-placeholder">
+	<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
+		{block name=toolbarBox}
+			<ul class="cc_button">
+				{foreach from=$toolbar_btn item=btn key=k}
+					<li>
+						<a id="desc-{$table}-{$btn.imgclass|default:$k}" class="toolbar_btn" {if isset($btn.href)}href="{$btn.href}"{/if} title="{$btn.desc}" {if isset($btn.target) && $btn.target}target="_blank"{/if}{if isset($btn.js) && $btn.js}onclick="{$btn.js}"{/if}>
+							<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>
+							<div {if isset($btn.force_desc) && $btn.force_desc == true } class="locked" {/if}>{$btn.desc}</div>
+						</a>
+					</li>
+				{/foreach}
+			</ul>
 
-			//get reference on form submit button
-			btn_submit = $('#{$table}_form_submit_btn');
+			<script language="javascript">
+				$(function() {
+					//get reference on save link
+					btn_save = $('span[class~="process-icon-save"]').parent();
 
-			if (btn_save.length > 0 && btn_submit.length > 0)
-			{
-				//get reference on save and stay link
-				btn_save_and_stay = $('span[class~="process-icon-save-and-stay"]').parent();
+					//get reference on form submit button
+					btn_submit = $('#{$table}_form_submit_btn');
 
-				//get reference on current save link label
-				lbl_save = $('#desc-{$table}-save div');
-
-				//override save link label with submit button value
-				if (btn_submit.val().length > 0)
-					lbl_save.html(btn_submit.attr("value"));
-
-				if (btn_save_and_stay.length > 0)
-				{
-
-					//get reference on current save link label
-					lbl_save_and_stay = $('#desc-{$table}-save-and-stay div');
-
-					//override save and stay link label with submit button value
-					if (btn_submit.val().length > 0 && lbl_save_and_stay && !lbl_save_and_stay.hasClass('locked'))
+					if (btn_save.length > 0 && btn_submit.length > 0)
 					{
-						lbl_save_and_stay.html(btn_submit.val() + " {l s='and stay'} ");
-					}
-
-				}
-
-				//hide standard submit button
-				btn_submit.hide();
-
-				//submit the form
-				{block name=formSubmit}
-					btn_save.click(function() {
-						//add hidden input to emulate submit button click when posting the form -> field name posted
-						btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
-
-						$('#{$table}_form').submit();
-						return false;
-					});
-
-					if (btn_save_and_stay)
-					{
-						btn_save_and_stay.click(function() {
-							//add hidden input to emulate submit button click when posting the form -> field name posted
-							btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
-
-							$('#{$table}_form').submit();
-							return false;
-						});
+						//get reference on save and stay link
+						btn_save_and_stay = $('span[class~="process-icon-save-and-stay"]').parent();
+
+						//get reference on current save link label
+						lbl_save = $('#desc-{$table}-save div');
+
+						//override save link label with submit button value
+						if (btn_submit.val().length > 0)
+							lbl_save.html(btn_submit.attr("value"));
+
+						if (btn_save_and_stay.length > 0)
+						{
+
+							//get reference on current save link label
+							lbl_save_and_stay = $('#desc-{$table}-save-and-stay div');
+
+							//override save and stay link label with submit button value
+							if (btn_submit.val().length > 0 && lbl_save_and_stay && !lbl_save_and_stay.hasClass('locked'))
+							{
+								lbl_save_and_stay.html(btn_submit.val() + " {l s='and stay'} ");
+							}
+
+						}
+
+						//hide standard submit button
+						btn_submit.hide();
+
+						//submit the form
+						{block name=formSubmit}
+							btn_save.click(function() {
+								//add hidden input to emulate submit button click when posting the form -> field name posted
+								btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
+
+								$('#{$table}_form').submit();
+								return false;
+							});
+
+							if (btn_save_and_stay)
+							{
+								btn_save_and_stay.click(function() {
+									//add hidden input to emulate submit button click when posting the form -> field name posted
+									btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
+
+									$('#{$table}_form').submit();
+									return false;
+								});
+							}
+						{/block}
 					}
+				});
+			</script>
+		{/block}
+		<div class="pageTitle">
+			<h3>{block name=pageTitle}
+				<span id="current_obj" style="font-weight: normal;">
+					{if $title}
+						{foreach $title as $key => $item name=title}
+							{* Use strip_tags because if the string already has been through htmlentities using escape will break it *}
+							<span class="breadcrumb item-{$key} ">{$item|strip_tags}
+								{if !$smarty.foreach.title.last}
+									<img alt="&gt;" style="margin-right:5px" src="../img/admin/separator_breadcrum.png">
+								{/if}
+							</span>
+						{/foreach}
+					{else}
+						&nbsp;
+					{/if}
+				</span>
 				{/block}
-			}
-		});
-	</script>
-{/block}
+			</h3>
+		</div>
+	</div>
+</div>
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 87e7fb6c3..b0a087ed6 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -41,7 +41,7 @@ class AdminControllerCore extends Controller
 
 	public $layout = 'layout.tpl';
 
-	public $meta_title = 'Administration panel';
+	protected $meta_title;
 
 	public $template = 'content.tpl';
 
@@ -258,7 +258,6 @@ class AdminControllerCore extends Controller
 		$this->controller_name = get_class($this);
 		if (strpos($this->controller_name, 'Controller'))
 			$this->controller_name = substr($this->controller_name, 0, -10);
-
 		parent::__construct();
 
 		if ($this->multishop_context == -1)
@@ -313,6 +312,18 @@ class AdminControllerCore extends Controller
 		$this->initShopContext();
 	}
 
+	/**
+	 * Set breadcrumbs array for the controller page
+	 */
+	public function initBreadcrumbs()
+	{
+		$tabs = array();
+		$tabs = Tab::recursiveTab($this->id, $tabs);
+		$tabs = array_reverse($tabs);
+		foreach ($tabs as $tab)
+			$this->breadcrumbs[] = $tab['name'];
+	}
+
 	/**
 	 * set default toolbar_title to admin breadcrumb
 	 *
@@ -320,36 +331,23 @@ class AdminControllerCore extends Controller
 	 */
 	public function initToolbarTitle()
 	{
-		// Breadcrumbs
-		$tabs = array();
-		$tabs = Tab::recursiveTab($this->id, $tabs);
-		$tabs = array_reverse($tabs);
+		$bread_extended = array_unique($this->breadcrumbs);
 
-		$bread = '';
 		switch ($this->display)
 		{
 			case 'edit':
-				$current_tab = array_pop($tabs);
-				$tabs[] = array('name' => sprintf($this->l('Edit %s'), $current_tab['name']));
+				$bread_extended[] = $this->l('Edit');
 				break;
 
 			case 'add':
-				$current_tab = array_pop($tabs);
-				$tabs[] = array('name' => sprintf($this->l('Add %s'), $current_tab['name']));
+				$bread_extended[] = $this->l('Add new');
 				break;
 
 			case 'view':
-				$current_tab = array_pop($tabs);
-				$tabs[] = array('name' => sprintf($this->l('View %s'), $current_tab['name']));
+				$bread_extended[] = $this->l('View');
 				break;
 		}
-		// note : this should use a tpl file
-		foreach ($tabs as $key => $item)
-			$bread .= '<span class="breadcrumb item-'.$key.' ">'.Tools::safeOutput($item['name']).'</span> : ';
-
-		$bread = rtrim($bread, ': ');
-
-		$this->toolbar_title = $bread;
+		$this->toolbar_title = $bread_extended;
 	}
 
 	/**
@@ -1081,6 +1079,10 @@ class AdminControllerCore extends Controller
 	{
 		$this->context->smarty->assign('display_header', $this->display_header);
 		$this->context->smarty->assign('display_footer', $this->display_footer);
+
+		// Use page title from meta_title if it has been set else from the breadcrumbs array
+		if (!$this->meta_title)
+			$this->meta_title = isset($this->breadcrumbs[1]) ? $this->breadcrumbs[1] : $this->breadcrumbs[0];
 		$this->context->smarty->assign('meta_title', $this->meta_title);
 
 		$tpl_action = $this->tpl_folder.$this->display.'.tpl';
@@ -1556,7 +1558,7 @@ class AdminControllerCore extends Controller
 	 * non-static method which uses AdminController::translate()
 	 *
 	 * @param mixed $string term or expression in english
-	 * @param string $class name of the class, without "Controller" suffix
+	 * @param string $class name of the class
 	 * @param boolan $addslashes if set to true, the return value will pass through addslashes(). Otherwise, stripslashes().
 	 * @param boolean $htmlentities if set to true(default), the return value will pass through htmlentities($string, ENT_QUOTES, 'utf-8')
 	 * @return string the translation if available, or the english default text.
@@ -1681,6 +1683,8 @@ class AdminControllerCore extends Controller
 			$this->context->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
 		elseif ($this->context->shop->id != $shop_id)
 			$this->context->shop = new Shop($shop_id);
+
+		$this->initBreadcrumbs();
 	}
 
 	/**
diff --git a/classes/helper/HelperView.php b/classes/helper/HelperView.php
index 02d018343..c2b313f42 100644
--- a/classes/helper/HelperView.php
+++ b/classes/helper/HelperView.php
@@ -49,7 +49,6 @@ class HelperViewCore extends Helper
 		$this->tpl->assign(array(
 			'title' => $this->title,
 			'current' => $this->currentIndex,
-			'title' => $this->title,
 			'token' => $this->token,
 			'table' => $this->table,
 			'show_toolbar' => $this->show_toolbar,
diff --git a/controllers/admin/AdminAttributeGeneratorController.php b/controllers/admin/AdminAttributeGeneratorController.php
index e0e4ca946..83ca7c67b 100644
--- a/controllers/admin/AdminAttributeGeneratorController.php
+++ b/controllers/admin/AdminAttributeGeneratorController.php
@@ -249,6 +249,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
 			'attribute_groups' => $attribute_groups,
 			'attribute_js' => $js_attributes,
 			'toolbar_btn' => $this->toolbar_btn,
+			'toolbar_scroll' => true,
 			'title' => $this->toolbar_title,
 		));
 	}
diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php
index 6a6692e63..5ef3f3c0c 100644
--- a/controllers/admin/AdminAttributesGroupsController.php
+++ b/controllers/admin/AdminAttributesGroupsController.php
@@ -504,36 +504,29 @@ class AdminAttributesGroupsControllerCore extends AdminController
 
 	public function initToolbarTitle()
 	{
-		// Breadcrumbs
-		$tabs = array();
-		$tabs = Tab::recursiveTab($this->id, $tabs);
-		$tabs = array_reverse($tabs);
+		$this->initBreadcrumbs();
+
+		$bread_extended = $this->breadcrumbs;
 
-		$bread = '';
 		switch ($this->display)
 		{
 			case 'edit':
-				$tabs[] = array('name' => $this->l('Edit new Attribute'));
+				$bread_extended[] = $this->l('Edit new Attribute');
 				break;
 
 			case 'add':
-				$tabs[] = array('name' => $this->l('Add new Attribute'));
+				$bread_extended[] = $this->l('Add new Attribute');
 				break;
 
 			case 'editAttributes':
 				if ($this->id_attribute)
-					$tabs[] = array('name' => $this->l('Edit Value'));
+					$bread_extended[] = $this->l('Edit Value');
 				else
-					$tabs[] = array('name' => $this->l('Add new Value'));
+					$bread_extended[] = $this->l('Add new Value');
 				break;
 		}
-		// note : this should use a tpl file
-		foreach ($tabs as $key => $item)
-			$bread .= '<span class="breadcrumb item-'.$key.' ">'.$item['name'].'</span> : ';
 
-		$bread = rtrim($bread, ': ');
-
-		$this->toolbar_title = $bread;
+		$this->toolbar_title = $bread_extended;
 	}
 
 	public function initProcess()
diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php
index 9133cc001..ae7cfcd99 100644
--- a/controllers/admin/AdminCartRulesController.php
+++ b/controllers/admin/AdminCartRulesController.php
@@ -476,7 +476,7 @@ class AdminCartRulesControllerCore extends AdminController
 				'show_toolbar' => true,
 				'toolbar_btn' => $this->toolbar_btn,
 				'toolbar_scroll' => $this->toolbar_scroll,
-				'title' => $this->l('Payment: Cart Rules'),
+				'title' => array($this->l('Payment'), $this->l('Cart Rules')),
 				'defaultDateFrom' => date('Y-m-d H:00:00'),
 				'defaultDateTo' => date('Y-m-d H:00:00', strtotime('+1 month')),
 				'customerFilter' => $customer_filter,
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index a46fda99f..9be039dbb 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -409,11 +409,6 @@ class AdminModulesControllerCore extends AdminController
 		}
 	}
 
-
-
-
-
-
 	/*
 	** Filter Configuration Methods
 	** Set and reset filter configuration
@@ -436,9 +431,6 @@ class AdminModulesControllerCore extends AdminController
 		Configuration::updateValue('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee, '');
 	}
 
-
-
-
 	/*
 	** Post Process Filter
 	**
@@ -470,11 +462,6 @@ class AdminModulesControllerCore extends AdminController
 		Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token);
 	}
 
-
-
-
-
-
 	/*
 	** Post Process Module CallBack
 	**
@@ -875,12 +862,10 @@ class AdminModulesControllerCore extends AdminController
 			return false;
 		}
 
-
 		// Filter on interest
 		if ((int)Db::getInstance()->getValue('SELECT `id_module_preference` FROM `'._DB_PREFIX_.'module_preference` WHERE `module` = \''.pSQL($module->name).'\' AND `id_employee` = '.(int)$this->id_employee.' AND `interest` = 0') > 0)
 				return true;
 
-
 		// Filter on favorites
 		if (Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee) == 'favorites')
 		{
@@ -904,7 +889,6 @@ class AdminModulesControllerCore extends AdminController
 				return true;
 		}
 
-
 		// Filter on module type and author
 		$show_type_modules = $this->filter_configuration['PS_SHOW_TYPE_MODULES_'.(int)$this->id_employee];
 		if ($show_type_modules == 'nativeModules' && !in_array($module->name, $this->list_natives_modules))
@@ -924,7 +908,6 @@ class AdminModulesControllerCore extends AdminController
 				return true;
 		}
 
-
 		// Filter on install status
 		$show_installed_modules = $this->filter_configuration['PS_SHOW_INSTALLED_MODULES_'.(int)$this->id_employee];
 		if ($show_installed_modules == 'installed' && !$module->id)
@@ -940,7 +923,6 @@ class AdminModulesControllerCore extends AdminController
 		if ($show_enabled_modules == 'disabled' && $module->active)
 			return true;
 
-
 		// Filter on country
 		$show_country_modules = $this->filter_configuration['PS_SHOW_COUNTRY_MODULES_'.(int)$this->id_employee];
 		if ($show_country_modules && (isset($module->limited_countries) && !empty($module->limited_countries)
@@ -949,7 +931,6 @@ class AdminModulesControllerCore extends AdminController
 				|| (!is_array($module->limited_countries) && strtolower($this->iso_default_country) != strval($module->limited_countries)))))
 			return true;
 
-
 		// Module has not been filtered		
 		return false;
 	}
@@ -990,7 +971,6 @@ class AdminModulesControllerCore extends AdminController
 			$modules_preferences[$v['module']] = $v;
 		}
 
-
 		// Retrieve Modules List
 		$modules = Module::getModulesOnDisk(true, $this->logged_on_addons);
 		$this->initModulesList($modules);
diff --git a/controllers/admin/AdminModulesPositionsController.php b/controllers/admin/AdminModulesPositionsController.php
index d3997695a..5790651f2 100644
--- a/controllers/admin/AdminModulesPositionsController.php
+++ b/controllers/admin/AdminModulesPositionsController.php
@@ -360,6 +360,7 @@ class AdminModulesPositionsControllerCore extends AdminController
 			'modules' => $modules,
 			'show_toolbar' => true,
 			'toolbar_btn' => $this->toolbar_btn,
+			'toolbar_scroll' => $this->toolbar_scroll,
 			'title' => $this->toolbar_title,
 			'table' => 'hook_module',
 		));
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 603792454..17209950e 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -166,7 +166,7 @@ class AdminOrdersControllerCore extends AdminController
 			'show_toolbar' => $this->show_toolbar,
 			'toolbar_btn' => $this->toolbar_btn,
 			'toolbar_scroll' => $this->toolbar_scroll,
-			'title' => $this->l('Orders: create order'),
+			'title' => array($this->l('Orders'), $this->l('create order')),
 		));
 		$this->content .= $this->createTemplate('form.tpl')->fetch();
 	}
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 9217b6c05..a262bb244 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2133,7 +2133,7 @@ class AdminProductsControllerCore extends AdminController
 		parent::initToolbarTitle();
 			if ($product = $this->loadObject(true))
 				if ((bool)$product->id)
-					$this->toolbar_title .= ' ('.$product->name[$this->context->language->id].')';
+					$this->toolbar_title[2] = $this->toolbar_title[2].' ('.$product->name[$this->context->language->id].')';
 	}
 
 	/**