From 0bd753b38f63afded5b1b87210de357bde78a21a Mon Sep 17 00:00:00 2001
From: Thibault GUILLAUME <thibault@antadis.com>
Date: Wed, 21 Oct 2015 17:10:46 +0200
Subject: [PATCH] pub suite

---
 modules/blockadshooks/blockadshooks.php       | 16 ++++++++++++++++
 modules/blockadshooks/classes/Publication.php |  2 +-
 themes/toutpratique/categorycms.tpl           |  4 +++-
 themes/toutpratique/index.tpl                 |  8 ++++++--
 themes/toutpratique/postcms.tpl               | 15 ++++++++-------
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/modules/blockadshooks/blockadshooks.php b/modules/blockadshooks/blockadshooks.php
index 09bca01e..3c6bb708 100644
--- a/modules/blockadshooks/blockadshooks.php
+++ b/modules/blockadshooks/blockadshooks.php
@@ -196,5 +196,21 @@ class Blockadshooks extends Module
     	return $this->runByHook('displayPubliciteTop');
     }
 
+	public function hookDisplayHomeRight1($params)
+    {
+    	return $this->runByHook('displayHomeRight1');
+    }
+    
+    public function hookDisplayHomeRight2($params)
+    {
+    	return $this->runByHook('displayHomeRight2');
+    }
+
+    public function hookDisplayPubliciteRight($params)
+    {
+    	return $this->runByHook('displayPubliciteRight');
+    }
+
+
 }
 ?>
\ No newline at end of file
diff --git a/modules/blockadshooks/classes/Publication.php b/modules/blockadshooks/classes/Publication.php
index ee41ad66..173a02f4 100644
--- a/modules/blockadshooks/classes/Publication.php
+++ b/modules/blockadshooks/classes/Publication.php
@@ -27,7 +27,7 @@ class Publication extends ObjectModel
 			'id_block_ads' => 					array('type' => self::TYPE_INT, 'validate' => 'isInt'),
 			'name'	 => 					array('type' => self::TYPE_STRING, 'validate' => 'isGenericName'),
 			'id_shop' => 					array('type' => self::TYPE_INT, 'validate' => 'isInt'),
-			'content' => 					array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isAnything'),
+			'content' => 					array('type' => self::TYPE_NOTHING, 'lang' => true, 'validate' => 'isAnything'),
 			'date_from' => 					array('type' => self::TYPE_DATE, 'validate' => 'isDateFormat'),
 			'date_to' => 					array('type' => self::TYPE_DATE, 'validate' => 'isDateFormat'),
 			'active'	=> 					array('type' => self::TYPE_INT, 'validate' => 'isInt'),
diff --git a/themes/toutpratique/categorycms.tpl b/themes/toutpratique/categorycms.tpl
index 80c7586f..c57e1c03 100644
--- a/themes/toutpratique/categorycms.tpl
+++ b/themes/toutpratique/categorycms.tpl
@@ -147,7 +147,9 @@
 			</div>
 		</div>
 		<div class="col-md-4">
-			<div style="padding: 20px; background:#f1f1f1; margin-bottom:30px;" class="pub"></div>
+			<div class="pub">
+				{hook h='displayPubliciteRight'}
+			</div>
 
 			{if $child_categories}
 			<div class="list_categories">
diff --git a/themes/toutpratique/index.tpl b/themes/toutpratique/index.tpl
index 573f3bcd..0963bb3e 100644
--- a/themes/toutpratique/index.tpl
+++ b/themes/toutpratique/index.tpl
@@ -61,8 +61,9 @@
 				{/foreach}
 			</div>
 		</div>
-		<div class="col-md-4">			
-			<div class="pub" style="padding: 20px; background:#f1f1f1; margin-bottom:30px;  margin-top:30px">
+		<div class="col-md-4">
+			<div class="pub">
+				{hook h='displayHomeRight1'}
 			</div>
 			<div class="post_home_right">
 				<div class="post_home_top">
@@ -71,6 +72,9 @@
 					{/foreach}
 				</div>
 			</div>
+			<div class="pub">
+				{hook h='displayHomeRight2'}
+			</div>
 		</div>
 	</div>
 	
diff --git a/themes/toutpratique/postcms.tpl b/themes/toutpratique/postcms.tpl
index 50106909..5c2efda3 100644
--- a/themes/toutpratique/postcms.tpl
+++ b/themes/toutpratique/postcms.tpl
@@ -146,12 +146,15 @@
 					</div>
 				</article>
 				<aside class="col-md-4">
-					<div style="padding: 20px; background:#f1f1f1; margin-bottom:30px;" class="pub"></div>
+					<div class="pub">
+						{hook h='displayPubliciteRight'}
+					</div>
+
 					{hook h='displayleftPostCms' id_cmspost={$post->id} mod='blocknewsletter'}
 
 					<div id="stack_right">
 						<div class="hidden-sm hidden-xs">
-							{hook h='displayleftPostCms' id_cmspost={$post->id}  mod='cms_pack'}					
+							{hook h='displayleftPostCms' id_cmspost={$post->id}  mod='cms_pack'}
 						</div>
 			
 						{*	
@@ -175,7 +178,7 @@
 										{foreach from=$all_articles item=article key=key}
 											<li><a href="{$link->getPostCmsLink($article->id)}" title="{$article->title}">{$article->title}</a></li>
 										{/foreach}
-									</ul>					
+									</ul>
 								</div>
 							</div>
 						{/if}
@@ -189,16 +192,14 @@
 									{/foreach}
 								</ul>
 							</div>
-						{/if}				
+						{/if}
 					</div>
 				</aside>
-			</section>		
+			</section>
 		</div>
-
 	</section>
 
 	<div class="container">
-
 		<div class="row">
 			<div class="col-md-12 selection_bottom">
 				{hook h='displayBottomProductCms' id_cmspost={$post->id}}