diff --git a/templates/default/account.html b/templates/default/account.html
index ae41ca8c7..59ae512e7 100644
--- a/templates/default/account.html
+++ b/templates/default/account.html
@@ -6,14 +6,11 @@
{block name="body-class"}page-account{/block}
-{block name="breadcrumb"}
-
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+ {$breadcrumbs = [
+ ['title' => {intl l="Account"}, 'url'=>{url path="/account"}]
+ ]}
{/block}
{block name="main-content"}
diff --git a/templates/default/address-update.html b/templates/default/address-update.html
index 3dc05d103..62ac08c25 100644
--- a/templates/default/address-update.html
+++ b/templates/default/address-update.html
@@ -10,8 +10,8 @@
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = [
- ['name' => {intl l="Account"}, 'link'=>{url path="/account"}],
- ['name' => {intl l="Address Update"}, 'link'=>{url path="/address"}]
+ ['title' => {intl l="Account"}, 'url'=>{url path="/account"}],
+ ['title' => {intl l="Address Update"}, 'url'=>{url path="/address"}]
]}
{/block}
diff --git a/templates/default/address.html b/templates/default/address.html
index 033b5e749..29183032d 100644
--- a/templates/default/address.html
+++ b/templates/default/address.html
@@ -10,8 +10,8 @@
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = [
- ['name' => {intl l="Account"}, 'link'=>{url path="/account"}],
- ['name' => {intl l="Address"}, 'link'=>{url path="/address"}]
+ ['title' => {intl l="Account"}, 'url'=>{url path="/account"}],
+ ['title' => {intl l="Address"}, 'url'=>{url path="/address"}]
]}
{/block}
diff --git a/templates/default/cart.html b/templates/default/cart.html
index a2d4af3ea..93daed310 100644
--- a/templates/default/cart.html
+++ b/templates/default/cart.html
@@ -6,7 +6,7 @@
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = [
- ['name' => {intl l="Cart"}, 'link'=>{url path="/cart"}]
+ ['title' => {intl l="Cart"}, 'url'=>{url path="/cart"}]
]}
{/block}
diff --git a/templates/default/category.html b/templates/default/category.html
index 99db32948..2434f7c1a 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -1,23 +1,17 @@
{extends file='layout.tpl'}
-{block name="breadcrumb"}
-
+{* Body Class *}
+{block name="body-class"}page-category{/block}
+
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+ {$sBreadcrumb = []}
+ {loop name="category_path" type="category-path" category="{category attr="id"}"}
+ {$breadcrumbs[] = ['title' => {$TITLE}, 'url'=> {$URL nofilter}]}
+ {/loop}
{/block}
+
{block name="main-content"}
{$limit={$smarty.get.limit|default:8}}
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 5ee6cb472..91398dfc9 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -23,7 +23,7 @@ URL: http://www.thelia.net
{* Page Title *}
-
{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.name} | {/foreach}{/if}Thelia{/strip}{/block}
+
{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} | {/foreach}{/if}Thelia{/strip}{/block}
{* Meta Tags *}
diff --git a/templates/default/login.html b/templates/default/login.html
index fb086537a..1e91874fb 100644
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -6,7 +6,7 @@
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = [
- ['name' => {intl l="Login"}, 'link'=>{url path="/login"}]
+ ['title' => {intl l="Login"}, 'url'=>{url path="/login"}]
]}
{/block}
diff --git a/templates/default/misc/breadcrumb.tpl b/templates/default/misc/breadcrumb.tpl
index b6b67a346..6a8c459af 100644
--- a/templates/default/misc/breadcrumb.tpl
+++ b/templates/default/misc/breadcrumb.tpl
@@ -4,11 +4,11 @@
{intl l="Home"}
{foreach $breadcrumbs as $breadcrumb}
- {if $breadcrumb.name}
+ {if $breadcrumb.title}
{if $breadcrumb@last}
-
{$breadcrumb.name}
+
{$breadcrumb.title}
{else}
-
{$breadcrumb.name}
+
{$breadcrumb.title}
{/if}
{/if}
{/foreach}
diff --git a/templates/default/order-delivery.html b/templates/default/order-delivery.html
index 02b4bdd34..ac8812fec 100644
--- a/templates/default/order-delivery.html
+++ b/templates/default/order-delivery.html
@@ -11,8 +11,8 @@
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = [
- ['name' => {intl l="Cart"}, 'link'=>{url path="/cart"}],
- ['name' => {intl l="Billing and delivery"}, 'link'=>{url path="/order/delivery"}]
+ ['title' => {intl l="Cart"}, 'url'=>{url path="/cart"}],
+ ['title' => {intl l="Billing and delivery"}, 'url'=>{url path="/order/delivery"}]
]}
{/block}
diff --git a/templates/default/order-invoice.html b/templates/default/order-invoice.html
index 2f09a2242..1037f0fe3 100644
--- a/templates/default/order-invoice.html
+++ b/templates/default/order-invoice.html
@@ -12,8 +12,8 @@
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = [
- ['name' => {intl l="Cart"}, 'link'=>{url path="/cart"}],
- ['name' => {intl l="My order"}, 'link'=>{url path="/order/invoice"}]
+ ['title' => {intl l="Cart"}, 'url'=>{url path="/cart"}],
+ ['title' => {intl l="My order"}, 'url'=>{url path="/order/invoice"}]
]}
{/block}
diff --git a/templates/default/order-placed.html b/templates/default/order-placed.html
index 14eadf318..6569beffc 100644
--- a/templates/default/order-placed.html
+++ b/templates/default/order-placed.html
@@ -6,8 +6,8 @@
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = [
- ['name' => {intl l="Cart"}, 'link'=>{url path="/cart"}],
- ['name' => {intl l="Secure Payment"}, 'link'=>{url path="/order/pay"}]
+ ['title' => {intl l="Cart"}, 'url'=>{url path="/cart"}],
+ ['title' => {intl l="Secure Payment"}, 'url'=>{url path="/order/pay"}]
]}
{/block}
diff --git a/templates/default/password.html b/templates/default/password.html
index 9b71545a2..e80989caa 100644
--- a/templates/default/password.html
+++ b/templates/default/password.html
@@ -6,7 +6,7 @@
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = [
- ['name' => {intl l="Password"}, 'link'=>{url path="/password"}]
+ ['title' => {intl l="Password"}, 'url'=>{url path="/password"}]
]}
{/block}
diff --git a/templates/default/product.html b/templates/default/product.html
index 6af242d0a..1c2ed2964 100644
--- a/templates/default/product.html
+++ b/templates/default/product.html
@@ -1,22 +1,20 @@
{extends file="layout.tpl"}
+{* Body Class *}
{block name="body-class"}page-product{/block}
-{block name="breadcrumb"}
-
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+ {$sBreadcrumb = []}
+ {loop type="product" name="product_breadcrumb" id="{product attr="id"}"}
+ {loop name="category_path" type="category-path" category="{$DEFAULT_CATEGORY}"}
+ {$breadcrumbs[] = ['title' => {$TITLE}, 'url'=> {$URL}]}
+ {/loop}
+ {$breadcrumbs[] = ['title' => {$TITLE}, 'url'=> {$URL}]}
+ {/loop}
{/block}
+
{block name="main-content"}
{loop name="product.details" type="product" id="{product attr="id"}"}
diff --git a/templates/default/register.html b/templates/default/register.html
index 2539e9748..1600c027e 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -5,7 +5,7 @@
{* Breadcrumb *}
{block name='no-return-functions' append}
- {$breadcrumbs = [['name' => {intl l="Register"}, 'link'=>{url path="/register"}]]}
+ {$breadcrumbs = [['title' => {intl l="Register"}, 'url'=>{url path="/register?toto=tutu&tutu=titi"}]]}
{/block}
{block name="main-content"}