From 1e8e26cb1df36495556fc49e90e0235b2681569f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Chans=C3=A9aume?= <jchanseaume@openstudio.fr>
Date: Tue, 22 Jul 2014 11:48:16 +0200
Subject: [PATCH] Added fallback for meta description for page category,
 product, folder, content, brand

---
 templates/frontOffice/default/brand.html             | 5 +----
 templates/frontOffice/default/category.html          | 5 ++---
 templates/frontOffice/default/content.html           | 3 +--
 templates/frontOffice/default/folder.html            | 3 +--
 templates/frontOffice/default/includes/meta-seo.html | 6 ++++++
 templates/frontOffice/default/product.html           | 5 ++---
 6 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 templates/frontOffice/default/includes/meta-seo.html

diff --git a/templates/frontOffice/default/brand.html b/templates/frontOffice/default/brand.html
index 23edbfb9d..607bab77a 100644
--- a/templates/frontOffice/default/brand.html
+++ b/templates/frontOffice/default/brand.html
@@ -13,10 +13,7 @@
 {* Meta *}
 {block name="meta"}
     {loop name="brand.seo.meta" type="brand" id="{brand attr="id"}"}
-    {if $META_DESCRIPTION}
-        <meta name="description" content="{$META_DESCRIPTION}">{/if}
-    {if $META_KEYWORDS}
-        <meta name="keywords" content="{$META_KEYWORDS}">{/if}
+    {include file="includes/meta-seo.html"}
     {/loop}
 {/block}
 
diff --git a/templates/frontOffice/default/category.html b/templates/frontOffice/default/category.html
index c421d10c1..833ecd2da 100644
--- a/templates/frontOffice/default/category.html
+++ b/templates/frontOffice/default/category.html
@@ -12,9 +12,8 @@
 
 {* Meta *}
 {block name="meta"}
-    {loop name="category.seo.meta" type="category" current="yes"}
-    {if $META_DESCRIPTION}<meta name="description" content="{$META_DESCRIPTION}">{/if}
-    {if $META_KEYWORDS}<meta name="keywords" content="{$META_KEYWORDS}">{/if}
+    {loop name="category.seo.meta" type="category" category="{category attr="id"}"}
+    {include file="includes/meta-seo.html"}
     {/loop}
 {/block}
 
diff --git a/templates/frontOffice/default/content.html b/templates/frontOffice/default/content.html
index 59775fa78..adba12ed8 100644
--- a/templates/frontOffice/default/content.html
+++ b/templates/frontOffice/default/content.html
@@ -13,8 +13,7 @@
 {* Meta *}
 {block name="meta"}
     {loop name="content.seo.meta" type="content" id="{content attr="id"}"}
-    {if $META_DESCRIPTION}<meta name="description" content="{$META_DESCRIPTION}">{/if}
-    {if $META_KEYWORDS}<meta name="keywords" content="{$META_KEYWORDS}">{/if}
+    {include file="includes/meta-seo.html"}
     {/loop}
 {/block}
 
diff --git a/templates/frontOffice/default/folder.html b/templates/frontOffice/default/folder.html
index 00020f4d5..2c1a076a2 100644
--- a/templates/frontOffice/default/folder.html
+++ b/templates/frontOffice/default/folder.html
@@ -13,8 +13,7 @@
 {* Meta *}
 {block name="meta"}
     {loop name="folder.seo.meta" type="folder" id="{folder attr="id"}"}
-    {if $META_DESCRIPTION}<meta name="description" content="{$META_DESCRIPTION}">{/if}
-    {if $META_KEYWORDS}<meta name="keywords" content="{$META_KEYWORDS}">{/if}
+    {include file="includes/meta-seo.html"}
     {/loop}
 {/block}
 
diff --git a/templates/frontOffice/default/includes/meta-seo.html b/templates/frontOffice/default/includes/meta-seo.html
new file mode 100644
index 000000000..b91bde1a9
--- /dev/null
+++ b/templates/frontOffice/default/includes/meta-seo.html
@@ -0,0 +1,6 @@
+{if $META_DESCRIPTION}
+<meta name="description" content="{$META_DESCRIPTION}">
+{elseif $CHAPO}
+<meta name="description" content="{$CHAPO|truncate:150:""}">
+{/if}
+{if $META_KEYWORDS}<meta name="keywords" content="{$META_KEYWORDS}">{/if}
\ No newline at end of file
diff --git a/templates/frontOffice/default/product.html b/templates/frontOffice/default/product.html
index 404291fe2..c9d8a505b 100644
--- a/templates/frontOffice/default/product.html
+++ b/templates/frontOffice/default/product.html
@@ -5,7 +5,7 @@
 
 {* Page Title *}
 {block name='no-return-functions' append}
-    {loop name="product.seo.title" type="product" id="{product attr="id"}" with_prev_next_info="1"}
+    {loop name="product.seo.title" type="product" id="{product attr="id"}" limit="1" with_prev_next_info="1"}
     {$page_title = {$META_TITLE}}
     {/loop}
 {/block}
@@ -13,8 +13,7 @@
 {* Meta *}
 {block name="meta"}
     {loop name="product.seo.meta" type="product" id="{product attr="id"}" limit="1" with_prev_next_info="1"}
-    {if $META_DESCRIPTION}<meta name="description" content="{$META_DESCRIPTION}">{/if}
-    {if $META_KEYWORDS}<meta name="keywords" content="{$META_KEYWORDS}">{/if}
+    {include file="includes/meta-seo.html"}
     {/loop}
 {/block}