Nuovi banner lunghi

Creati nuovi banner lunghi
Aumentate numero notizie ansa
Aumentate numero notizie cronaca in homepage
fix mobile articolo per show player video
modifica amministrazione per show player mobile

private/common/config.local.php

@@ -31,7 +31,8 @@ $currentSystem->apache->user 		= "var-www";
 $currentSystem->apache->group 		= "var-www";
 $currentSystem->apache->workdir		= "/var/www"; // Il path in cui inserire la cartella con le pagine html
 
-$currentSystem->remoteLocationPath = "http://localhost/fdn2/";
+// $currentSystem->remoteLocationPath = "http://10.0.0.64/fdn2/";
+	$currentSystem->remoteLocationPath = "http://192.168.1.129/fdn2/";
 
 $backupSystem = new stdClass();
 $backupSystem->account = "40a911e14db8ad6faf0a0e7385e7c267";

private/lib/dao/models/BannerModel.php

@@ -12,12 +12,14 @@ class BannerModel extends HasMediaModel{
 	
 	const POSITION_HEAD = 1;
 	const POSITION_BODY = 2;
+	const POSITION_LONG = 3;
 	
 	const GENERAL_CATEGORY = 0;
 	
 	public static $BANNER_POSITIONS = array(
 		self::POSITION_HEAD=>array("label"=>"Testata"),
-		self::POSITION_BODY=>array("label"=>"Corpo")
+		self::POSITION_BODY=>array("label"=>"Corpo"),
+		self::POSITION_LONG=>array("label"=>"Corpo Lungo")
 	);
 	
 	public function __construct($saveableObject = null){

public/admin/editBanner.php

@@ -93,6 +93,7 @@ try{
 					<option disabled selected style="display:none;">Seleziona Posizione</option>
 					<option <?php echo $banner->position==BannerModel::POSITION_HEAD?"selected":"";?> value="<?php echo BannerModel::POSITION_HEAD;?>"><?php echo BannerModel::$BANNER_POSITIONS[BannerModel::POSITION_HEAD]["label"];?></option>
 					<option <?php echo $banner->position==BannerModel::POSITION_BODY?"selected":"";?> value="<?php echo BannerModel::POSITION_BODY;?>"><?php echo BannerModel::$BANNER_POSITIONS[BannerModel::POSITION_BODY]["label"];?></option>
+					<option <?php echo $banner->position==BannerModel::POSITION_LONG?"selected":"";?> value="<?php echo BannerModel::POSITION_LONG;?>"><?php echo BannerModel::$BANNER_POSITIONS[BannerModel::POSITION_LONG]["label"];?></option>
 				</select>
 			</div>
 			<div>

public/admin/homeMultimedia.php

@@ -117,6 +117,8 @@ HTMLHelper::generateAdminHead();
 
 <script type="text/javascript">
 	$(document).ready(function(event){
+
+		
 		$("#mediaMenu_addMedia").click(function(event){
 			$("form#mediaForm").attr("action","addMultimedia.php");
 			$("form#mediaForm input[type=hidden][name=id]").val("<?php echo $notiziaId;?>");
@@ -148,6 +150,22 @@ HTMLHelper::generateAdminHead();
 			openPagePost("homeMultimedia.php", [{name:"id",value:"<?php echo $notiziaId;?>"},{name:"setMain",value:paramStr}]);
 		});
 
+		$("video").on('canplay',function (event){
+			$(".videoContainerForImageAppend img.poster").hide();
+			
+			$(".videoContainerForImageAppend video.localVideo").attr("style","");
+		}
+// 		$("video").on('loadstart',function (event){
+// 			$(this).addClass("loading");
+// 		});
+
+// 		$("video").on('canplay',function (event){
+// 			$(this).removeClass("loading");
+// 			$(this).attr('poster','');
+// 		});
+
+
+		
 // 		$("#mediaMenu_unsetMain").click(function (){
 //			openPagePost("homeMultimedia.php", [{name:"id",value:"<?php echo $notiziaId;?>"},{name:"rmMain",value:"true"}]);
 // 		});

public/admin/newBanner.php

@@ -195,6 +195,7 @@ try{
 					<option disabled selected style="display:none;">Seleziona Posizione</option>
 					<option value="<?php echo BannerModel::POSITION_HEAD;?>"><?php echo BannerModel::$BANNER_POSITIONS[BannerModel::POSITION_HEAD]["label"];?></option>
 					<option value="<?php echo BannerModel::POSITION_BODY;?>"><?php echo BannerModel::$BANNER_POSITIONS[BannerModel::POSITION_BODY]["label"];?></option>
+					<option value="<?php echo BannerModel::POSITION_LONG;?>"><?php echo BannerModel::$BANNER_POSITIONS[BannerModel::POSITION_LONG]["label"];?></option>
 				</select>
 			</div>
 			<div>

public/articolo.php

@@ -437,6 +437,15 @@ function loadImage(pos){
 // 			});
 		});
 
+		$("video").on('loadstart',function (event){
+			$(this).addClass("loading");
+		});
+
+		$("video").on('canplay',function (event){
+			$(this).removeClass("loading");
+			$(this).attr('poster','');
+		});
+
 <?php if($articolo->hasProperty("sondaggio") && !is_null($articolo->sondaggio)){
 	$colori=array('#434348', '#90ed7d', '#f7a35c', '#8085e9', '#f15c80', '#e4d354', '#2b908f', '#f45b5b', '#91e8e1','#7cb5ec');?>
 		$("#sondaggioGraph").highcharts({
@@ -466,12 +475,7 @@ function loadImage(pos){
 			}]
 		});
 <?php }
-?>
-<?php 
-// if(sizeof($medias)>0){?>
 	
-<?php 
-// }
 ?>
 });
 </script>

public/index.php

@@ -29,7 +29,7 @@ try {
 	$ansaNews = GlobalVariables::get("dao")->query("NotiziaModel",
 // 				array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$lte'=>new MongoDate())),
 				array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
-				array("sort"=>array("about.lastEdit"=>-1),"limit"=>5));
+				array("sort"=>array("about.lastEdit"=>-1),"limit"=>8));
 	
 	$ansaIds = array();
 	if (sizeof($ansaNews)>0){
@@ -52,7 +52,7 @@ try {
 	$cronacaNews = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_CRONACA,'_id'=>array('$nin'=>$ansaIds),
 					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
-			array("sort"=>array("about.lastEdit"=>-1),"limit"=>3)
+			array("sort"=>array("about.lastEdit"=>-1),"limit"=>6)
 	);
 	if (sizeof($cronacaNews)>0){
 		$cronacaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $cronacaNews);
@@ -79,7 +79,7 @@ try {
 	$ristorantiNews = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_RISTORANTI,'_id'=>array('$nin'=>$ansaIds),
 					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
-			array("sort"=>array("about.lastEdit"=>-1),"limit"=>3)
+			array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
 	);
 	if (sizeof($ristorantiNews)>0){
 		$ristorantiNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $ristorantiNews);
@@ -92,8 +92,8 @@ try {
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$in'=>$idArray),"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ),'$gte'=>new MongoDB\BSON\UTCDateTime(strtotime('-2 months') * 1000 ))),
 			array("sort"=>array("about.lastEdit"=>-1))
 	);
-	if (sizeof($lastsNews)<4){
-		$missing = 5-sizeof($lastsNews);
+	if (sizeof($lastsNews)<5){
+		$missing = 6-sizeof($lastsNews);
 		$add = GlobalVariables::get("dao")->query("NotiziaModel",
 				array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$nin'=>$idArray),"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
 				array("sort"=>array("about.lastEdit"=>-1),"limit"=>$missing)
@@ -136,16 +136,20 @@ try {
 // 	}
 	$elezioni = array();
 	
-	$lastViaggi = GlobalVariables::get("dao")->getFirst("NotiziaModel",
+	$lastViaggi = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_VIAGGI,'_id'=>array('$nin'=>$ansaIds),
 					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
-			array("sort"=>array("about.lastEdit"=>-1))
+			array("sort"=>array("about.lastEdit"=>-1),"limit"=>2)
 	);
-	if (!is_null($lastViaggi)){
-		$lastViaggi->testo = strip_tags($lastViaggi->testo);
-		$lastViaggi->sottotitolo = strip_tags($lastViaggi->sottotitolo);
+	if (sizeof($lastViaggi)>0){
+		$lastViaggi = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $lastViaggi);
 	}
 	
+// 	if (!is_null($lastViaggi)){
+// 		$lastViaggi->testo = strip_tags($lastViaggi->testo);
+// 		$lastViaggi->sottotitolo = strip_tags($lastViaggi->sottotitolo);
+// 	}
+	
 	
 	$animalNews = GlobalVariables::get("dao")->getFirst("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_ANIMALI,'_id'=>array('$nin'=>$ansaIds),
@@ -157,15 +161,19 @@ try {
 		$animalNews->sottotitolo = strip_tags($animalNews->sottotitolo);
 	}
 	
-	$saluteNews = GlobalVariables::get("dao")->getFirst("NotiziaModel",
+	$saluteNews = GlobalVariables::get("dao")->query("NotiziaModel",
 			array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_SALUTE,'_id'=>array('$nin'=>$ansaIds),
 					"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
-			array("sort"=>array("about.lastEdit"=>-1))
+			array("sort"=>array("about.lastEdit"=>-1),"limit"=>2)
 	);
-	if (!is_null($saluteNews)){
-		$saluteNews->testo = strip_tags($saluteNews->testo);
-		$saluteNews->sottotitolo = strip_tags($saluteNews->sottotitolo);
+	if (sizeof($saluteNews)>0){
+		$saluteNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $saluteNews);
 	}
+	
+// 	if (!is_null($saluteNews)){
+// 		$saluteNews->testo = strip_tags($saluteNews->testo);
+// 		$saluteNews->sottotitolo = strip_tags($saluteNews->sottotitolo);
+// 	}
 // 	var_dump($politicaNews);
 // 	if(sizeof($politicaNews)<=0){
 // 		echo "non trovateee!!!!";
@@ -307,6 +315,7 @@ catch (Exception $ex){
 		</div>
 	</div>
 	<div class="middleBarNews">
+		<div class="middleLongBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_LONG);?></div>
 		<div class="titleContainer">
 			<div class="categoryTitle">CULTURA&SPETTACOLO</div>
 			<div class="culturaLine"></div>
@@ -358,19 +367,24 @@ catch (Exception $ex){
 				<div class="categoryTag"><span>SALUTE</span></div>
 				<div class="categoryLine"></div>
 			</div>
-			<?php if(!is_null($saluteNews)){
+			<?php if(sizeof($saluteNews)>0){
+					$i=0;
 // 					$stringTitle = (strlen($saluteNews->titolo) > 53) ? htmlentities( substr( html_entity_decode( $saluteNews->titolo ) ,0,50) ) .'...' : $saluteNews->titolo;
-					$stringTitle = $saluteNews->cutTextHtmlSafe("titolo",50);
+					foreach ($saluteNews as $salute){
+					$i++;
+					$stringTitle = $salute->cutTextHtmlSafe("titolo",50);
 					?>
-					<a href="<?php echo $saluteNews->getAbsoluteUrl();?>" class="saluteContainer">
-						<?php $media = DaoMediaHandler::getMainMediaFromModel($saluteNews);
+					<a href="<?php echo $salute->getAbsoluteUrl();?>" id="salute_<?php echo $i;?>" class="saluteContainer">
+						<?php $media = DaoMediaHandler::getMainMediaFromModel($salute);
 								if(!is_null($media)){?>
 									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
 						<?php 	}?>
 						<div class="saluteTitle"><?php echo $stringTitle;?></div>
 					</a>
-		<?php	}?>			
+		<?php		}
+				}?>			
 		</div>
+		<div class="middleLongBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_LONG);?></div>
 	</div>
 	<div class="rightBarNews">
 		<?php HTMLHelper::getMeteoBlock(); ?>
@@ -445,6 +459,7 @@ catch (Exception $ex){
 			}?>
 			
 		</div>
+		<div class="middleLongBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_LONG);?></div>
 	<?php 
 		if(sizeof($elezioni)>0){
 	?>
@@ -475,18 +490,21 @@ catch (Exception $ex){
 					<div class="categoryTag"><span>VIAGGI</span></div>
 					<div class="categoryLine"></div>
 				</div>
-				<?php if(!is_null($lastViaggi)){
+				<?php if(sizeof($lastViaggi)>0){
+						$i=0;
 // 						$stringTitle = (strlen($lastViaggi->titolo) > 53) ? htmlentities( substr( html_entity_decode( $lastViaggi->titolo ) ,0,50) ) .'...' : $lastViaggi->titolo;
-						$stringTitle = $lastViaggi->cutTextHtmlSafe("titolo",50);
+						foreach ($lastViaggi as $viaggi){
+						$stringTitle = $viaggi->cutTextHtmlSafe("titolo",50);
 						?>
-						<a href="<?php echo $lastViaggi->getAbsoluteUrl();?>" class="animaliContainer">
-							<?php $media = DaoMediaHandler::getMainMediaFromModel($lastViaggi);
+						<a href="<?php echo $viaggi->getAbsoluteUrl();?>" id="viaggi_<?php echo $i;?>"class="animaliContainer">
+							<?php $media = DaoMediaHandler::getMainMediaFromModel($viaggi);
 									if(!is_null($media)){?>
 										<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
 							<?php 	}?>
 							<div class="viaggiTitle"><?php echo $stringTitle;?></div>
 						</a>
-			<?php	}?>			
+			<?php		}
+					}?>			
 			</div>
 	<?php 
 		}
@@ -509,6 +527,7 @@ catch (Exception $ex){
 					</a>
 		<?php	}?>			
 		</div>
+		<div class="middleLongBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_LONG);?></div>
 	</div>
 	<?php 
 		GUIHandler::generateFooter();

public/mobile/articolo.php

@@ -172,6 +172,13 @@ GUIHandlerMobile::generateHtmlHeaders(array("additionalMetadata"=>$additionalHea
 							</div>
 						<?php 
 					}
+					else if($media->getType() == MediaModel::TYPE_LOCALVIDEO){
+						?>
+							<div class="localVideoContainer">
+								<?php $media->renderMedia(array("size"=>MediaRenderer::SIZE_BIG,"clickable"=>true));?>
+							</div>
+						<?php
+					}
 					else {
 						?>
 							<div >
@@ -374,6 +381,24 @@ function loadImage(pos){
 // 			});
 		});
 
+
+		$("img.poster").hide();
+		$("video.localVideo").attr("style","");
+
+// 		$("video.localVideo").on('canplay',function(event){
+// 			$("img.poster").hide();
+// 			$("video.localVideo").attr("style","");
+// 		});
+
+// 		$("video").on('loadstart',function (event){
+// 			alert("asd");
+// 			$(this).addClass("loading");
+// 		});
+
+// 		$("video").on('canplay',function (event){
+// 			$(this).removeClass("loading");
+// 			$(this).attr('poster','');
+// 		});
 		
 
 

public/mobile/index.php

@@ -378,6 +378,10 @@ catch (Exception $ex){
 	<script type="text/javascript">
 		$(document).ready(function(){
 			$(".newsBarMobile").css({"margin-top":$(".headContainer").outerHeight()});
+
+			$("img.poster").hide();
+			$("video.localVideo").attr("style","");
+				
 		});
 	</script>
 	<?php 

public/mobile/style/public.css

@@ -117,8 +117,8 @@ body{font-family:lato, arial;}
 .secondaryNews .newsImage{display:inline-block;box-sizing:border-box;padding:2vw;width:15vw;vertical-align:middle;text-align:center;}
 .secondaryNews .newsImage img{width:10vw;}
 .secondaryNews .newsImage iframe{width:10vw;height:5.6vw;}
-.secondaryNews .newsImage video.localVideo{max-width:100%;}
-.secondaryNews .newsImage .videoContainerForImageAppend img.poster{max-width:100%;max-height:100%;background-color:black;position:absolute;top:0;left:0;z-index:1000;} 
+.localVideoContainer video.localVideo, .secondaryNews .newsImage video.localVideo{max-width:100%;}
+.localVideoContainer .videoContainerForImageAppend img.poster, .secondaryNews .newsImage .videoContainerForImageAppend img.poster{max-width:100%;max-height:100%;background-color:black;position:absolute;top:0;left:0;z-index:1000;} 
 .secondaryNews .newsTitle{display:inline-block;box-sizing:border-box;width:83vw;padding:10px 5px;vertical-align:middle;color:black;font-size:9pt}
 
 .grigliaContainer{margin:auto;width:90vw;text-align:center;z-index:1;padding:10px 0;}

public/style/admin.css

@@ -102,10 +102,13 @@ div.notiziaStat >div > div {text-align:center;}
 |_|  |_|\___|\__,_|_|\__,_|
 
 */
-.mediaElement.mainElement{background-color:yellow;}
+.mediaElement.mainElement{background-color:yellow;margin:15px;}
 .mediaElement{display:inline-block; padding:15px; max-width:160px;}    
 .mediaElement.selected {opacity:0.4;background-color:orange;}
 
+.notiziaContainer video.localVideo{max-width:100%;}
+.notiziaContainer .videoContainerForImageAppend img.poster{max-width:100%;max-height:100%;background-color:black;position:absolute;top:0;left:0;z-index:1000;} 
+
 /*
   ____                                     _   _ 
  / ___|___  _ __ ___  _ __ ___   ___ _ __ | |_(_)
@@ -165,4 +168,19 @@ div.bannerStat > div > div{text-align:center;}
     padding: 5px;
     text-transform: capitalize;
 }
-.sondaggioContainer .rmOption:hover, .sondaggioContainer #addOption:hover{background-color:rgb(204, 217, 255);}
+.sondaggioContainer .rmOption:hover, .sondaggioContainer #addOption:hover{background-color:rgb(204, 217, 255);}
+
+/**
+	DISABILITAZIONE TASTO DOWNLOAD DAL PLAYER VIDEO
+*/
+
+video::-internal-media-controls-download-button {
+    display:none;
+}
+
+video::-webkit-media-controls-enclosure {
+    overflow:hidden;
+}
+
+video.loading{background:black url(../images/loading.gif) center center no-repeat;}
+

public/style/public.css

@@ -182,7 +182,7 @@ display: inline-block;
 .mediaContent *{max-height:100%;max-width:100%;}
 .mediaContent > a{height:100%; width:100%;display:inline-block;}
 
-.ansaImage{display:inline-block;margin:5px 7px;width:260px; height:133px; overflow:hidden;text-align:center;}
+.ansaImage{display:inline-block;margin:5px 7px;width:260px; max-height:150px;overflow:hidden;text-align:center;}
 .ansaNews{margin-top:2px;width:280px;cursor:pointer;display:block;text-decoration:none;color:black;}
 .ansaTitolo{font-weight:bold;font-size:15pt;text-align:left;}
 .ansaSottotitolo{font-size:12pt;color:#767676;text-align:left;}
@@ -281,6 +281,9 @@ display: inline-block;
 .ristorantiBlock .ristorantiLink > a, .culturaNews .culturaLink > a{color:#3498d4;font-size:13px;}
 .middleBanner{height:142px; width:190px;}
 .middleBanner  img{height:100%;width:100%;}
+.middleLongBanner img{height:100%;width:100%;}
+.middleLongBanner{height:284px; width:190px;}
+
 
 .salute,.ristorantiCol{margin-top:10px;text-align:center;}
 .saluteTitle, .ristorantiTitle{margin-top:10px;font-size:12px;}