From 995522c3d02deb0a750da4eb7e85b974b5a375bb Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Wed, 4 Jan 2012 08:21:37 +0000
Subject: [PATCH] // Adding non integrated feature from the old theme to the
 new theme for the module blocklayered

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12095 b9a71923-0436-4b27-9f14-aed3839534dd
---
 themes/default/category-count.tpl |  7 ++++---
 themes/default/category.tpl       | 17 ++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/themes/default/category-count.tpl b/themes/default/category-count.tpl
index d64ef1f69..540d732e8 100644
--- a/themes/default/category-count.tpl
+++ b/themes/default/category-count.tpl
@@ -23,9 +23,10 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{if $category->id == 1 OR $nb_products == 0}{l s='There are no products.'}
+{if $category->id == 1 OR $nb_products == 0}
+	{l s='There are no products.'}
 {else}
-	{if $nb_products == 1}{l s='There is'}{else}{l s='There are'}{/if}
-	{$nb_products}
+	{if $nb_products == 1}{l s='There is'}{else}{l s='There are'}{/if}&#160;
+	{$nb_products}&#160;
 	{if $nb_products == 1}{l s='product.'}{else}{l s='products.'}{/if}
 {/if}
\ No newline at end of file
diff --git a/themes/default/category.tpl b/themes/default/category.tpl
index 7f42a6399..abfda959e 100644
--- a/themes/default/category.tpl
+++ b/themes/default/category.tpl
@@ -29,16 +29,15 @@
 
 {if isset($category)}
 	{if $category->id AND $category->active}
-		<h1>{strip}{$category->name|escape:'htmlall':'UTF-8'}{/strip}</h1>
+		<h1>
+			{strip}
+				{$category->name|escape:'htmlall':'UTF-8'}
+				{$categoryNameComplement|escape:'htmlall':'UTF-8'}
+			{/strip}
+		</h1>
 		
-		<div class="resumecat">
-		{if $category->id == 1 OR $nb_products == 0}
-			{l s='There are no products.'}
-		{else}
-			{if $nb_products == 1}{l s='There is'}{else}{l s='There are'}{/if}&#160;
-			{$nb_products}&#160;
-			{if $nb_products == 1}{l s='product.'}{else}{l s='products.'}{/if}
-		{/if}
+		<div class="resumecat category-product-count">
+			{include file="$tpl_dir./category-count.tpl"}
 		</div>
 		
 		{if $scenes || $category->description}