From 23dd595f1f16dc9de6a7623af16145ac1781a2f9 Mon Sep 17 00:00:00 2001
From: Lorenzo Giacomelli <l.giacomelli@asdynamics.it>
Date: Sat, 26 Mar 2016 12:13:53 +0100
Subject: [PATCH] Aggiustata index con 3 ansa, banner alla fine della
 middlebar, monfo animale nella rightBarNews

---
 public/index.php        | 38 ++++++++++++++++++++++++++++++++++++--
 public/style/public.css |  8 ++++----
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/public/index.php b/public/index.php
index 473c197..56a5b36 100644
--- a/public/index.php
+++ b/public/index.php
@@ -21,7 +21,7 @@ try {
 	
 	$ansaNews = GlobalVariables::get("dao")->query("NotiziaModel",
 				array('$and'=>array(array("isAnsa"=>true),array("status"=>NotiziaModel::STATUS_ACCEPTED))),
-				array("sort"=>array("about.data"=>-1),"limit"=>2)
+				array("sort"=>array("about.data"=>-1),"limit"=>3)
 			);
 	
 	$ansaIds = array();
@@ -109,6 +109,16 @@ try {
 		$lastViaggi->testo = strip_tags($lastViaggi->testo);
 		$lastViaggi->sottotitolo = strip_tags($lastViaggi->sottotitolo);
 	}
+	
+	
+	$animalNews = GlobalVariables::get("dao")->getFirst("NotiziaModel",
+			array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_ANIMALI),array('_id'=>array('$nin'=>$ansaIds)))),
+			array("sort"=>array("about.data"=>-1))
+	);
+	if (!is_null($animalNews)){
+		$animalNews->testo = strip_tags($animalNews->testo);
+		$animalNews->sottotitolo = strip_tags($animalNews->sottotitolo);
+	}
 // 	var_dump($politicaNews);
 // 	if(sizeof($politicaNews)<=0){
 // 		echo "non trovateee!!!!";
@@ -314,6 +324,7 @@ catch (Exception $ex){
 			<?php }
 				}?>
 		</div>
+		<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY);?></div>
 	</div>
 	<div class="rightBarNews">
 		<?php HTMLHelper::getMeteoBlock(); ?>
@@ -382,7 +393,7 @@ catch (Exception $ex){
 			</div>
 			<?php if(!is_null($lastViaggi)){
 					$stringTitle = (strlen($lastViaggi->titolo) > 53) ? substr($lastViaggi->titolo,0,50).'...' : $lastViaggi->titolo;?>
-					<div class="viaggiContainer">
+					<div class="animaliContainer">
 						<?php $media = DaoMediaHandler::getMainMediaFromModel($lastViaggi);
 								if(!is_null($media)){?>
 									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
@@ -398,6 +409,29 @@ catch (Exception $ex){
 						</script>
 		<?php	}?>			
 		</div>
+		<div class="animali">
+			<div class="categoryBar" style="text-align:left;">
+				<div class="categoryTag"><span>Animali</span></div>
+				<div class="categoryLine"></div>
+			</div>
+			<?php if(!is_null($animalNews)){
+					$stringTitle = (strlen($animalNews->titolo) > 53) ? substr($animalNews->titolo,0,50).'...' : $animalNews->titolo;?>
+					<div class="animaliContainer">
+						<?php $media = DaoMediaHandler::getMainMediaFromModel($animalNews);
+								if(!is_null($media)){?>
+									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
+						<?php 	}?>
+						<div class="animaliTitle"><?php echo $stringTitle;?></div>
+					</div>
+					<script type="text/javascript">
+							$(document).ready(function(event){
+								$(".animaliTitle").click(function(event){
+									window.location.href="articolo.php?id=<?php echo $animalNews->id;?>";
+								});							
+							});
+						</script>
+		<?php	}?>			
+		</div>
 	</div>
 	<?php 
 		GUIHandler::generateFooter();
diff --git a/public/style/public.css b/public/style/public.css
index 99fe2eb..faf1eb0 100644
--- a/public/style/public.css
+++ b/public/style/public.css
@@ -163,7 +163,7 @@ display: inline-block;
                            |_|          |___/      
 */
 
-.ansaContainer{margin-bottom:25px; border:none;height:420px}
+.ansaContainer{margin-bottom:25px; border:none;}
 .ansa{border:solid #d6d6d6 1px;border-left:0px;border-right:0px;border-top:0px;/* height:180px; */}
 .ansa> div {display:inline-block;vertical-align:top;}
 
@@ -298,9 +298,9 @@ display: inline-block;
 .gossipTitle{margin-bottom:5px;font-weight:bold;font-size:20px;}
 .gossipSubtitle{margin-bottom:5px;color:#64bff0;font-weight:bold;font-size:15px;}
 
-.viaggiContainer{/* max-height:165px; */margin-top:5px;margin-bottom:5px;}
-.viaggiContainer > .culturaMainMedia{text-align:left;}
-.viaggiTitle{cursor:pointer;margin-bottom:5px;font-weight:bold;font-size:17px;}
+.animaliContainer,.viaggiContainer{/* max-height:165px; */margin-top:5px;margin-bottom:5px;}
+.animaliContainer > .culturaMainMedia,.viaggiContainer > .culturaMainMedia{text-align:left;}
+.animaliTitle,.viaggiTitle{cursor:pointer;margin-bottom:5px;font-weight:bold;font-size:17px;}
 
 /*
     _         _   _           _