From 453a818c5562758d17451d4fb5b374e6a63cbea5 Mon Sep 17 00:00:00 2001
From: touffies <claffont@openstudio.fr>
Date: Wed, 6 Nov 2013 15:17:52 +0100
Subject: [PATCH] Display the number of results (Items)  on the category page
 or search page

---
 templates/default/I18n/en_US.php        |  4 ++
 templates/default/I18n/es_ES.php        |  4 ++
 templates/default/I18n/fr_FR.php        |  4 ++
 templates/default/I18n/it_IT.php        |  4 ++
 templates/default/category.html         |  2 +-
 templates/default/includes/toolbar.html |  2 +-
 templates/default/search.html           |  3 +-
 templates/default/view_all.html         | 53 ++++++++++---------------
 8 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/templates/default/I18n/en_US.php b/templates/default/I18n/en_US.php
index 24bf81612..07b7e6411 100755
--- a/templates/default/I18n/en_US.php
+++ b/templates/default/I18n/en_US.php
@@ -156,6 +156,10 @@ return array (
   'List' => 'List',
   'Next' => 'Next',
   'Previous' => 'Previous',
+  '%nb Items' => '%nb Items',
+  '%nb Item' => '%nb Item',
+  'Latest products' => 'Latest products',
+  'Product Offers' => 'Product Offers',
 /*
   'The page cannot be found' => 'The page cannot be found',
   'What\'s your name?' => 'What\'s your name?',
diff --git a/templates/default/I18n/es_ES.php b/templates/default/I18n/es_ES.php
index 427227f1c..a5c5950ee 100755
--- a/templates/default/I18n/es_ES.php
+++ b/templates/default/I18n/es_ES.php
@@ -156,6 +156,10 @@ return array (
   'List' => '',
   'Next' => '',
   'Previous' => '',
+  '%nb Items' => '',
+  '%nb Item' => '',
+  'Latest products' => '',
+  'Product Offers' => '',
 /*
   'The page cannot be found' => '',
   'What\'s your name?' => '',
diff --git a/templates/default/I18n/fr_FR.php b/templates/default/I18n/fr_FR.php
index b5f6a6290..3ed34e1f7 100755
--- a/templates/default/I18n/fr_FR.php
+++ b/templates/default/I18n/fr_FR.php
@@ -156,6 +156,10 @@ return array (
     'List' => 'Liste',
     'Next' => 'Suivant',
     'Previous' => 'Précédent',
+    '%nb Items' => '%nb produits',
+    '%nb Item' => '%nb produit',
+    'Latest products' => 'Derniers produits',
+    'Product Offers' => 'Produits en promotion',
 
     /*
       'The page cannot be found' => '',
diff --git a/templates/default/I18n/it_IT.php b/templates/default/I18n/it_IT.php
index 427227f1c..a5c5950ee 100755
--- a/templates/default/I18n/it_IT.php
+++ b/templates/default/I18n/it_IT.php
@@ -156,6 +156,10 @@ return array (
   'List' => '',
   'Next' => '',
   'Previous' => '',
+  '%nb Items' => '',
+  '%nb Item' => '',
+  'Latest products' => '',
+  'Product Offers' => '',
 /*
   'The page cannot be found' => '',
   'What\'s your name?' => '',
diff --git a/templates/default/category.html b/templates/default/category.html
index b47abd222..f89deef2c 100644
--- a/templates/default/category.html
+++ b/templates/default/category.html
@@ -19,7 +19,7 @@
         {$product_order={$smarty.get.order|default:'alpha'}}
         <article class="col-main {$smarty.get.mode|default:"grid"}" role="main">
             {ifloop rel="product_list"}
-                {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order}
+                {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={count type="product" category={category attr="id"}}}
                 <div id="category-products">
                     <div class="products-content">
                         <ul class="product-col-4">
diff --git a/templates/default/includes/toolbar.html b/templates/default/includes/toolbar.html
index c512ba90a..07733634b 100644
--- a/templates/default/includes/toolbar.html
+++ b/templates/default/includes/toolbar.html
@@ -1,7 +1,7 @@
 <div class="toolbar toolbar-{$toolbar}" role="toolbar">
     {if $toolbar == "top" }
     <div class="sorter-container">
-        {*<span class="amount">9 {intl l="Item(s)"}</span>*}
+        <span class="amount">{if ($amount > 1)}{intl l="%nb Items" nb="{$amount}"}{else}{intl l="%nb Item" nb="{$amount}"}{/if}</span>
 
             <span class="limiter">
                 <label for="limit-top">{intl l="Show"}</label>
diff --git a/templates/default/search.html b/templates/default/search.html
index 7c8e212b4..ff8955cf0 100644
--- a/templates/default/search.html
+++ b/templates/default/search.html
@@ -20,14 +20,13 @@
     <article class="col-main  {$smarty.get.mode|default:"grid"}"  role="main" aria-labelledby="main-label">
 
         <h1 id="main-label" class="page-header">{intl l="Search Result for"} <small>{$smarty.get.q}</small></h1>
-        {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order}
+        {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={count type="product" title="{$smarty.get.q}"}}
         <div id="category-products">
             <div class="products-content">
                 {ifloop rel="product_list"}
                     <ul class="product-col-3">
                         {loop type="product" name="product_list" title="{$smarty.get.q}"  limit=$limit page=$product_page order=$product_order}
                             {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="369" height="247"}
-                            {assign "products_count" $LOOP_TOTAL}
                         {/loop}
                     </ul>
                 {/ifloop}
diff --git a/templates/default/view_all.html b/templates/default/view_all.html
index cd3650151..4d2fb66be 100644
--- a/templates/default/view_all.html
+++ b/templates/default/view_all.html
@@ -13,43 +13,34 @@
 {block name="main-content"}
     <div class="main">
 
+    {* Parameters *}
     {$limit={$smarty.get.limit|default:8}}
     {$product_page={$smarty.get.page|default:1}}
-    {$product_order={$smarty.get.order|default:'alpha'}}
+    {$product_order={$smarty.get.order|default:'new'}}
+    {$product_type={$smarty.get.type|default:'new'}}
 
-<article class="col-main  {$smarty.get.mode|default:"grid"}"  role="main" aria-labelledby="main-label">
+    <article class="col-main  {$smarty.get.mode|default:"grid"}"  role="main" aria-labelledby="main-label">
 
-    {if $smarty.get.type == "new"}
-        <h1 id="main-label" class="page-header">{intl l="View all"} {$smarty.get.type} {intl l="products"}</h1>
-        {else}
-        <h1 id="main-label" class="page-header">{intl l="View all"} {intl l="offers"}</h1>
-    {/if}
-    {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order}
-    <div id="category-products">
-        <div class="products-content">
-            {ifloop rel="product_list"}
-                <ul class="product-col-3">
-                    {if $smarty.get.type == "new"}
-                        {loop type="product" name="product_list" limit=$limit page=$product_page order=$product_order}
+        <h1 id="main-label" class="page-header">{if $product_type == "new"}{intl l="Latest products"}{elseif $product_type == "offers"}{intl l="Product Offers"}{/if}</h1>
+
+        {include file="includes/toolbar.html" toolbar="top" limit=$limit order=$product_order amount={count type="product" promo="{$product_type == "offers"}" new="{$product_type == "new"}"}}
+        <div id="category-products">
+            <div class="products-content">
+                {ifloop rel="product_list"}
+                    <ul class="product-col-3">
+                        {loop type="product" promo="{$product_type == "offers"}" new="{$product_type == "new"}" name="product_list" limit=$limit page=$product_page order=$product_order}
                             {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="700" height="320"}
                         {/loop}
-                        {else}
-                        {loop type="product" name="product_list"  promo="yes" limit=$limit page=$product_page order=$product_order}
-                            {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="700" height="320"}
-                        {/loop}
-                    {/if}
-
-
-                </ul>
-            {/ifloop}
-            {elseloop  rel="product_list"}
-                <h2 class="text-center">{intl l="No results found"} </h2>
-            {/elseloop}
-        </div>
-    </div><!-- /#category-products -->
-    {ifloop rel="product_list"}
-        {include file="includes/toolbar.html" toolbar="bottom"}
-    {/ifloop}
+                    </ul>
+                {/ifloop}
+                {elseloop  rel="product_list"}
+                    <h2 class="text-center">{intl l="No results found"} </h2>
+                {/elseloop}
+            </div>
+        </div><!-- /#category-products -->
+        {ifloop rel="product_list"}
+            {include file="includes/toolbar.html" toolbar="bottom"}
+        {/ifloop}
     </article>
 
 </div><!-- /.layout -->