Merge branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

private/lib/dao/models/NotiziaModel.php

@@ -48,12 +48,12 @@ class NotiziaModel extends HasMediaModel{
 			self::CATEGORY_CULTURA=>array("label"=>"Cultura&Spettacolo","mainMenu"=>true, "hidden"=>false,"pages"=>array("list"=>"cultura.php")),
 			self::CATEGORY_GOSSIP=>array("label"=>"Gossip","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"gossip.php")),
 			self::CATEGORY_ANIMALI=>array("label"=>"Mondo Animale","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"animali.php")),
-			self::CATEGORY_VIAGGI=>array("label"=>"Viaggi","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"viaggi.php")),
-			self::CATEGORY_RISTORANTI=>array("label"=>"Ristoranti","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"ristoranti.php")),
+			self::CATEGORY_VIAGGI=>array("label"=>"Viaggi","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"viaggi.php")),
+			self::CATEGORY_RISTORANTI=>array("label"=>"Ristoranti","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"ristoranti.php")),
 			self::CATEGORY_MESTIERI=>array("label"=>"Mestieri","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"mestieri.php")),
-			self::CATEGORY_CASA=>array("label"=>"Casa","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"casa.php")),
-			self::CATEGORY_SALUTE=>array("label"=>"Salute","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"salute.php")),
-			self::CATEGORY_ANNUNCI=>array("label"=>"Annunci","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"annunci.php")),
+			self::CATEGORY_CASA=>array("label"=>"Casa","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"casa.php")),
+			self::CATEGORY_SALUTE=>array("label"=>"Salute","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"salute.php")),
+			self::CATEGORY_ANNUNCI=>array("label"=>"Annunci","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"annunci.php")),
 			self::CATEGORY_FISCOELAVORO=>array("label"=>"Fisco e Lavoro","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"fiscoelavoro.php"))
 	);
 	

private/lib/gui/GUIHandler.php

@@ -210,7 +210,12 @@ class GUIHandler {
 						</ul>
 					</div>
 				</div>
-				<div class="searchBar"><input class="inputBar" name="search" placeholder="cerca nel sito" /><img alt="" src="images/magnifyingGlass.png"/></div>
+				<div class="searchBar">
+					<form id="searchForm" method="POST" action="searchResults.php">
+						<input class="inputBar" name="search" placeholder="cerca nel sito" />
+					</form>
+					<img id="sendFormGlass" alt="" src="images/magnifyingGlass.png"/>
+				</div>
 			</div>
 		</div>
 	  	<script type="text/javascript">
@@ -231,6 +236,16 @@ class GUIHandler {
 	  					
 	  				}
 	  			});
+
+	  			$("#sendFormGlass").click(function (){
+					$("#searchForm").submit();
+			  	});
+
+			  	$(".inputBar").keypress(function(e){
+					if(e.which == 13){
+						$("#sendFormGlass").click();
+					}
+				});
 	  			
 	  		});
 	  	</script>
@@ -246,7 +261,7 @@ class GUIHandler {
 		foreach(NotiziaModel::$NOTIZIE_CATEGORY as $category=>$data){
 			if($data["mainMenu"] && !$data["hidden"]){
 				?>
-									| <a href="<?php echo $data["pages"]["list"];?>"><?php echo $data["label"];?></a>
+									| <a href="categorySummary.php?category=<?php echo $category;?>"><?php echo $data["label"];?></a>
 								<?php 
 							}
 						}
@@ -255,7 +270,7 @@ class GUIHandler {
 				</div>
 				<div style="text-align:center;color:white;margin-top:25px;">TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</div>
 				<div style="text-align:center;color:white;margin-top:20px;">COPYRIGHT &copy 2016 <a href="www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</div>
-				<div style="text-align:center;color:white;margin-top:20px;"><a href="redazione.php" style="color:white;">REDAZIONE</a> | <a href="contatti.php" style="color:white;">CONTATTACI</a> | <a href="archivio.php" style="color:white;">ARCHIVIO STORICO</a></div>
+				<div style="text-align:center;color:white;margin-top:20px;"><a href="redazione.php" style="color:white;">REDAZIONE</a> | <a href="archivio.php" style="color:white;">ARCHIVIO STORICO</a></div>
 				
 			</div>
 	<?php 
@@ -281,6 +296,7 @@ class GUIHandler {
 		return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
 	}
 	
+	
 	public static function generateRightBannerBlock(){
 		$lastsNews = GlobalVariables::get("dao")->query("NotiziaModel",
 				array("status"=>NotiziaModel::STATUS_ACCEPTED),
@@ -296,37 +312,36 @@ class GUIHandler {
 		
 		?>
 		<div id="rightBarContainer" class="">
-		<div class="rotoBanner">
-		<div>Guarda anche</div>
-						<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
-						<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
+			<div class="rotoBanner">
+			<div>Guarda anche</div>
+				<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
+				<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
+			</div>
+			<div class="reader">
+				<div class="lastNews">
+					<div class="categoryBar" style="text-align:left;">
+						<div class="categoryTag"><span>Pi&ugrave Letti</span></div>
+						<div class="categoryLine"></div>
 					</div>
-					<div class="reader">
-						<div class="lastNews">
-							<div class="categoryBar" style="text-align:left;">
-							<div class="categoryTag"><span>Pi&ugrave Letti</span></div>
-							<div class="categoryLine"></div>
+			<?php if(sizeof($lastsNews)>0){
+					foreach($lastsNews as $last){
+						$data = $mesi[date("n",$last->about->data->sec)]." ".date("Y",$last->about->data->sec);
+						$string = (strlen($last->titolo) > 103) ? substr($last->titolo,0,100).'...' : $last->titolo;?>
+						<div class="lastContainer">
+							<div class="lastData"><?php echo $data;?></div>
+							<div class="lastTitle"><?php echo $string;?></div>
+							<div class="lastContinua" style="text-align:right;"><a href="articolo.php?id=<?php echo $last->id;?>">Leggi</a></div>
 						</div>
-					<?php if(sizeof($lastsNews)>0){
-							foreach($lastsNews as $last){
-								$data = $mesi[date("n",$last->about->data->sec)]." ".date("Y",$last->about->data->sec);
-								$string = (strlen($last->titolo) > 103) ? substr($last->titolo,0,100).'...' : $last->titolo;?>
-								<div class="lastContainer">
-									<div class="lastData"><?php echo $data;?></div>
-									<div class="lastTitle"><?php echo $string;?></div>
-									<div class="lastContinua" style="text-align:right;"><a href="articolo.php?id=<?php echo $last->id;?>">Leggi</a></div>
-								</div>
-					<?php 	}
-					}?>
-				</div>
-					</div>
-					<div class="rotoBanner not">
-						<div>Guarda anche</div>
-						<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
-						<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
-					</div>
-					</div>
+			<?php 	}
+			}?>
 				</div>
+			</div>
+			<div class="rotoBanner not">
+				<div>Guarda anche</div>
+				<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
+				<div class="bannerContainer mediaContent"><img alt="" src="images/ads_big.png" /><span style="color:red;">BANNER</span></div> <?php //TODO: Bannerizzare?>
+			</div>
+		</div>
 	<?php 
 	}
 }

public/archivio.php

@@ -141,7 +141,7 @@ try {
 				?>
 						<div style="color:red;">Nessun articolo trovato nella data selezionata.</div>		
 				<?php 
-					}	
+					}
 				
 				}
 		?>	

public/redazione.php

@@ -0,0 +1,40 @@
+<?php
+
+require_once(dirname(__FILE__)."/load.php");
+
+try {
+
+	AnalyticsHelper::logNotiziaImpression($articolo->id);
+	AnalyticsHelper::logPageImpression();
+
+	GUIHandler::generateHtmlHeaders();
+
+	}catch(GUIException $ex){
+		$error = $ex->getMessage();
+	}catch (Exception $exec){
+		$msg = LogModel::fromException($exec);
+		GlobalVariables::get("dao")->save($msg);
+	
+		GUIHandler::redirect("index.php");
+	}
+?>
+
+<div style="width:1000px;margin-left:auto;margin-right:auto;">
+<?php 
+	GUIHandler::generateHeadPublic();
+	GUIHandler::generateMenu();?>
+	<div class="contattiRedazione">
+		<div style="color:#199fe6;">GERENZA</div>
+		<img alt="" src="images/blueBalls.png">
+		<div><a style="color:black;" href="www.ifattidinapoli.it">www.ifattidinapoli.it</a></div>
+		<img alt="" src="images/blueBalls.png">
+		<div style="color:#199fe6;">Direttore Responsabile</div>
+		<div style="font-weight:bold;">Antonio Pianelli</div>
+		<div style="font-weight:bold;color:red;font-size:18px;">337848292</div>
+		<img alt="" src="images/blueBalls.png">
+		<div style="color:#199fe6;">info@ifattidinapoli.it</div>
+		<div style="font-weight:bold;padding:5px;">TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</div>
+		
+	</div>
+<?php GUIHandler::generateFooter();?>
+</div>

public/registration.php

@@ -4,7 +4,7 @@ require_once(dirname(__FILE__)."/load.php");
 
 try {
 	?>
-	<div class="topReg"><span></span><div><a class="close" href="javascript:$('#floating').hide();">x</a></div></div>
+	<div class="topReg"><span></span><div><a class="close" href="javascript:void(0);" onClick="$('#floating').hide();">x</a></div></div>
 	<div class="modalBody">
 		<div class="modalResponse"></div>
 		<form id="regForm">		

public/searchResults.php

@@ -0,0 +1,88 @@
+<?php
+
+require_once(dirname(__FILE__)."/load.php");
+
+try {
+
+	AnalyticsHelper::logNotiziaImpression($articolo->id);
+	AnalyticsHelper::logPageImpression();
+	
+	GUIHandler::generateHtmlHeaders();
+	
+	$found = false;
+	if(array_key_exists("search", $_POST) && strcmp($_POST["search"], "")!=0){
+		$searchParameters = strip_tags(PostHandler::get("search"));
+		
+		$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
+				array("status"=>NotiziaModel::STATUS_ACCEPTED),
+				array("sort"=>array("about.data"=>-1),"limit"=>10)
+		);
+		
+		if (sizeof($notizie)>0){
+			$found=true;
+			$notizie = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $notizie);
+		}
+	}
+	else{
+		GUIHandler::redirect("index.php");
+	}
+	
+
+}catch(GUIException $ex){
+	$error = $ex->getMessage();
+}catch (Exception $exec){
+	$msg = LogModel::fromException($exec);
+	GlobalVariables::get("dao")->save($msg);
+	
+	GUIHandler::redirect("index.php");
+}
+?>
+
+<div style="width:1000px;margin-left:auto;margin-right:auto;">
+<?php 
+	GUIHandler::generateHeadPublic();
+	GUIHandler::generateMenu();?>
+	<div class="searchResultsContainer">
+	<?php
+		if ($found){
+			$i=0;
+			foreach ($notizie as $notizia){
+				$i++;
+				$stringTitolo = (strlen($notizia->titolo) > 103) ? substr($notizia->titolo,0,100).'...' : $notizia->titolo;
+				$stringSottotitolo = (strlen($notizia->sottotitolo) > 73) ? substr($notizia->sottotitolo,0,70).'...' : $notizia->sottotitolo;
+				$stringTesto = (strlen($notizia->testo) > 33) ? substr($notizia->testo,0,30).'...' : $notizia->testo;
+				$media = DaoMediaHandler::getMainMediaFromModel($notizia);
+	?>
+				<div class="notiziaContainer">		
+					<div class="notiziaImage mediaContent"><?php (!is_null($media))?$media->renderMedia(array("size"=>MediaRenderer::SIZE_SMALL)):"" ;?></div>
+					<div id="notizia_<?php echo $i;?>" class="notiziaInfo">
+						<div class="notiziaTitolo"><?php echo $stringTitolo;?></div>
+						<div class="notiziaSottotitolo"><?php echo$stringSottotitolo;?></div>
+						<div class="notiziaTesto"><?php echo $stringTesto;?></div>
+					</div>
+				</div>
+				<script type="text/javascript">
+					$(document).ready(function(event){
+						$("#notizia_<?php echo $i;?>").click(function(event){
+							window.location.href="articolo.php?id=<?php echo $notizia->id;?>";
+						});							
+					});
+				</script>
+	<?php
+			}
+		}
+		else{
+	?>
+			<div style="color:red;">Nessun articolo trovato con questi parametri di ricerca.</div>		
+	<?php 
+		}
+	?>
+	</div>
+	<div class="summaryRightBar">
+		<?php GUIHandler::generateRightBannerBlock();?>
+	</div>
+	
+	<?php 
+		GUIHandler::generateFooter();
+	?>
+</div>

public/style/public.css

@@ -23,9 +23,9 @@ body{font-family:lato, arial;}
 
 .menuContainer{position:relative;}
 .menuBar{background-image:url("../images/menuBackground.png");background-repeat:repeat-x;font-weight:bold;height:45px;margin-top:2px;color:white;}
-.menuTab{display:inline-block;padding:15px 17px 15px 16px;font-size:12px;vertical-align:top;}
+.menuTab{display:inline-block;font-size:12px;vertical-align:top;}
 .menuTab:hover{background-color:#0069a3;}
-.menuTab > a {text-decoration:none;color:white;}
+.menuTab > a {text-decoration:none;color:white;padding:15px 17px 15px 16px;display:inline-block;}
 
 .searchBar{
     float: right;
@@ -33,18 +33,20 @@ body{font-family:lato, arial;}
     margin:10px 10px 0px;
 }
 
-.searchBar > input{
+.searchBar input{
     border-radius: 6px;
     border: none;
     padding: 5px 25px 5px 5px;
 }
-.searchBar > img{
+.searchBar  img{
     width: 17px;
     right: 5px;
     z-index: 2;
     position: absolute;
     top: 5px;
 }
+#sendFormGlass{cursor:pointer;}
+
 
 .hiddenMenu{
 	background-color: #139be5;
@@ -53,9 +55,9 @@ body{font-family:lato, arial;}
     z-index:5;
 }
 .hiddenMenu > ul{list-style:none;padding:0px;margin:0px;}
-.categoryVoice{padding:10px 9px;font-size:12px;}
+.categoryVoice{font-size:12px;}
 .categoryVoice:hover{background-color:#0069a3;}
-.categoryVoice > a {color:white;font-weight:bold;}
+.categoryVoice > a {padding:10px 9px;display:block;color:white;font-weight:bold;}
 
 
 .footer{background-color:#14477c;height:177px;margin-top:10px;}
@@ -97,7 +99,7 @@ body{font-family:lato, arial;}
 .topReg{text-align:right;}
 .topReg > div{display:inline-block;}
 .topReg > span,a{vertical-align:top;}
-.close{vertical-align:top;color:white;}
+.close{vertical-align:top;color:black;}
 
 .modalBody{text-align:right;}
 .regMe{text-align:left;}
@@ -322,8 +324,8 @@ body{font-family:lato, arial;}
 .articoloRightBar{vertical-align:top;}
 
 
-.archivioResults, .categorySummaryContainer{width:600px;padding:5px 10px 5px 0px;vertical-align:top;display:inline-block;} 
-.archivioResults > .notiziaContainer, .categorySummaryContainer > .notiziaContainer{border:solid #d6d6d6 1px;margin-bottom:5px;padding:5px;}
+.searchResultsContainer, .archivioResults, .categorySummaryContainer{width:600px;padding:5px 10px 5px 0px;vertical-align:top;display:inline-block;} 
+.searchResultsContainer > .notiziaContainer, .archivioResults > .notiziaContainer, .categorySummaryContainer > .notiziaContainer{border:solid #d6d6d6 1px;margin-bottom:5px;padding:5px;}
 .notiziaContainer > .notiziaImage{display:inline-block;vertical-align:middle;text-align:center;width:160px;}
 .notiziaContainer > .notiziaInfo{display:inline-block;width:400px;padding:10px;vertical-align:middle;cursor:pointer;}
 .notiziaInfo > .notiziaTitolo{font-weight:bold;padding:5px;}
@@ -357,4 +359,7 @@ body{font-family:lato, arial;}
 
 
 .archivioDate{padding:5px 30px;}
-.archivioDate select, .archivioDate input{padding:2px 10px; margin:5px 5px 0px; border:solid #1a9ee9 1px;}
+.archivioDate select, .archivioDate input{padding:2px 10px; margin:5px 5px 0px; border:solid #1a9ee9 1px;}
+
+
+.contattiRedazione{text-align:center;font-size:23px;padding:10px 5px;}