From 179b4cc5bb3ca7ffca7ed6f14726196889e0063f Mon Sep 17 00:00:00 2001
From: Lorenzo Giacomelli <l.giacomelli@asdynamics.it>
Date: Fri, 27 May 2016 15:26:37 +0200
Subject: [PATCH] =?UTF-8?q?aggiunta=20possibilit=C3=A0=20di=20sottovoci=20?=
 =?UTF-8?q?nel=20menu.=20Aggiunte=20sottocategorie=20del=20menu=20mondo=20?=
 =?UTF-8?q?animale.=20Fix=20grafici?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 private/lib/dao/models/NotiziaModel.php | 34 ++++++++++++++-----------
 private/lib/gui/GUIHandler.php          | 10 +++++---
 private/lib/gui/GUIHandlerMobile.php    | 10 +++++---
 public/categorySummary.php              |  5 ++++
 public/mobile/categorySummary.php       |  5 ++++
 public/mobile/style/public.css          |  8 ++++--
 public/style/public.css                 |  4 ++-
 7 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/private/lib/dao/models/NotiziaModel.php b/private/lib/dao/models/NotiziaModel.php
index 8e03d7b..9811fc9 100644
--- a/private/lib/dao/models/NotiziaModel.php
+++ b/private/lib/dao/models/NotiziaModel.php
@@ -42,23 +42,27 @@ class NotiziaModel extends HasMediaModel{
 	const CATEGORY_FISCOELAVORO = 13;
 	const CATEGORY_RUBRICHE = 14;
 	const CATEGORY_SPECIALE_ELEZIONI = 15;
+	const CATEGORY_SMARRITI = 16;
+	const CATEGORY_RITROVATI = 17;
 	
 	public static $NOTIZIE_CATEGORY = array(
-			self::CATEGORY_POLITICA=>array("label"=>"Politica","mainMenu"=>true,"hidden"=>false,"pages"=>array("list"=>"politica.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_CRONACA=>array("label"=>"Cronaca","mainMenu"=>true, "hidden"=>false,"pages"=>array("list"=>"cronaca.php"),"color"=>"red"),
-			self::CATEGORY_SPORT=>array("label"=>"Sport","mainMenu"=>true, "hidden"=>false,"pages"=>array("list"=>"sport.php"),"color"=>"#4f8f2f"),
-			self::CATEGORY_CULTURA=>array("label"=>"Cultura&Spettacolo","mainMenu"=>true, "hidden"=>false,"pages"=>array("list"=>"cultura.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_GOSSIP=>array("label"=>"Gossip","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"gossip.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_ANIMALI=>array("label"=>"Mondo Animale","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"animali.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_VIAGGI=>array("label"=>"Viaggi","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"viaggi.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_RISTORANTI=>array("label"=>"Food&Drink","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"ristoranti.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_MESTIERI=>array("label"=>"Professioni e Mestieri","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"mestieri.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_CASA=>array("label"=>"Casa","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"casa.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_SALUTE=>array("label"=>"Salute","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"salute.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_ANNUNCI=>array("label"=>"Annunci","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"annunci.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_FISCOELAVORO=>array("label"=>"Fisco e Lavoro","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"fiscoelavoro.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_RUBRICHE=>array("label"=>"Rubriche","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"rubriche.php"),"color"=>"#3e3e3e"),
-			self::CATEGORY_SPECIALE_ELEZIONI=>array("label"=>"Speciale Elezioni","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"specialeElezioni.php"),"color"=>"#3e3e3e")
+			self::CATEGORY_POLITICA=>array("label"=>"Politica","mainMenu"=>true,"hidden"=>false,"pages"=>array("list"=>"politica.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_CRONACA=>array("label"=>"Cronaca","mainMenu"=>true, "hidden"=>false,"pages"=>array("list"=>"cronaca.php"),"color"=>"red","isSubmenu"=>null),
+			self::CATEGORY_SPORT=>array("label"=>"Sport","mainMenu"=>true, "hidden"=>false,"pages"=>array("list"=>"sport.php"),"color"=>"#4f8f2f","isSubmenu"=>null),
+			self::CATEGORY_CULTURA=>array("label"=>"Cultura&Spettacolo","mainMenu"=>true, "hidden"=>false,"pages"=>array("list"=>"cultura.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_GOSSIP=>array("label"=>"Gossip","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"gossip.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_ANIMALI=>array("label"=>"Mondo Animale","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"animali.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_VIAGGI=>array("label"=>"Viaggi","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"viaggi.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_RISTORANTI=>array("label"=>"Food&Drink","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"ristoranti.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_MESTIERI=>array("label"=>"Professioni e Mestieri","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"mestieri.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_CASA=>array("label"=>"Casa","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"casa.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_SALUTE=>array("label"=>"Salute","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"salute.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_ANNUNCI=>array("label"=>"Annunci","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"annunci.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_FISCOELAVORO=>array("label"=>"Fisco e Lavoro","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"fiscoelavoro.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_RUBRICHE=>array("label"=>"Rubriche","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"rubriche.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_SPECIALE_ELEZIONI=>array("label"=>"Speciale Elezioni","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"specialeElezioni.php"),"color"=>"#3e3e3e","isSubmenu"=>null),
+			self::CATEGORY_SMARRITI=>array("label"=>"Smarriti","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"animaliSmarriti.php"),"color"=>"#3e3e3e","isSubmenu"=>self::CATEGORY_ANIMALI),
+			self::CATEGORY_RITROVATI=>array("label"=>"Ritrovati","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"animaliRitrovati.php"),"color"=>"#3e3e3e","isSubmenu"=>self::CATEGORY_ANIMALI)
 	);
 	
 	public static function getCollectionName(){
diff --git a/private/lib/gui/GUIHandler.php b/private/lib/gui/GUIHandler.php
index 4aaf9d0..2df1fb0 100644
--- a/private/lib/gui/GUIHandler.php
+++ b/private/lib/gui/GUIHandler.php
@@ -255,10 +255,14 @@ class GUIHandler {
 						<ul class="categoryList">
 							<?php 
 							foreach(NotiziaModel::$NOTIZIE_CATEGORY as $category=>$data){
-								if(!$data["mainMenu"] && !$data["hidden"]){
-									?>
+								if(!$data["mainMenu"] && !$data["hidden"] && is_null($data["isSubmenu"])){
+									if(strcasecmp($data["label"],NotiziaModel::$NOTIZIE_CATEGORY[NotiziaModel::CATEGORY_ANIMALI]["label"])==0){?>
+							 			<li class="categoryVoice"><a href="categorySummary.php?category=<?php echo $category;?>"><?php echo strtoupper($data["label"]);?></a></li>
+						 				<li class="categoryVoice subVoice"><a href="categorySummary.php?category=<?php echo NotiziaModel::CATEGORY_SMARRITI;?>"><span>></span><?php echo strtoupper(NotiziaModel::$NOTIZIE_CATEGORY[NotiziaModel::CATEGORY_SMARRITI]["label"]);?></a></li>
+							 			<li class="categoryVoice subVoice"><a href="categorySummary.php?category=<?php echo NotiziaModel::CATEGORY_RITROVATI;?>"><span>></span><?php echo strtoupper(NotiziaModel::$NOTIZIE_CATEGORY[NotiziaModel::CATEGORY_RITROVATI]["label"]);?></a></li>
+							 <?php }else {?>	
 									<li class="categoryVoice"><a href="categorySummary.php?category=<?php echo $category;?>"><?php echo strtoupper($data["label"]);?></a></li>
-									<?php 
+							 <?php }
 								}
 							}
 							?>
diff --git a/private/lib/gui/GUIHandlerMobile.php b/private/lib/gui/GUIHandlerMobile.php
index 07bb686..b6767d9 100644
--- a/private/lib/gui/GUIHandlerMobile.php
+++ b/private/lib/gui/GUIHandlerMobile.php
@@ -243,10 +243,14 @@ class GUIHandlerMobile {
 	  		 		}
 	  			}
 	  					foreach(NotiziaModel::$NOTIZIE_CATEGORY as $category=>$data){
-							if(!$data["mainMenu"] && !$data["hidden"]){
-								?>
+	  						if(!$data["mainMenu"] && !$data["hidden"] && is_null($data["isSubmenu"])){
+				  				if(strcasecmp($data["label"],NotiziaModel::$NOTIZIE_CATEGORY[NotiziaModel::CATEGORY_ANIMALI]["label"])==0){?>
+						 			<div class="menuTab"><a href="categorySummary.php?category=<?php echo $category;?>"><?php echo strtoupper($data["label"]);?></a></div>
+					 				<div class="menuTab subVoice"><a href="categorySummary.php?category=<?php echo NotiziaModel::CATEGORY_SMARRITI;?>"><span>></span><?php echo strtoupper(NotiziaModel::$NOTIZIE_CATEGORY[NotiziaModel::CATEGORY_SMARRITI]["label"]);?></a></div>
+						 			<div class="menuTab subVoice"><a href="categorySummary.php?category=<?php echo NotiziaModel::CATEGORY_RITROVATI;?>"><span>></span><?php echo strtoupper(NotiziaModel::$NOTIZIE_CATEGORY[NotiziaModel::CATEGORY_RITROVATI]["label"]);?></a></div>
+						 <?php  }else {?>	
 								<div class="menuTab"><a href="categorySummary.php?category=<?php echo $category;?>"><?php echo strtoupper($data["label"]);?></a></div>
-								<?php 
+						 <?php  }
 							}
 						}
 						?>
diff --git a/public/categorySummary.php b/public/categorySummary.php
index a91b060..3696d9e 100644
--- a/public/categorySummary.php
+++ b/public/categorySummary.php
@@ -50,6 +50,7 @@ try{
 	GUIHandler::generateMenu();?>
 	<div class="categorySummaryContainer">
 		<?php $i=0;
+		if(sizeof($notizie)>0){
 			foreach ($notizie as $notizia){
 				$i++;
 				$stringTitolo = (strlen($notizia->titolo) > 103) ? substr($notizia->titolo,0,100).'...' : $notizia->titolo;
@@ -70,7 +71,11 @@ try{
 				</script>	
 		<?php 
 			}
+		}
+		else{
 		?>
+			<div style="padding:20px 10px;">Al momento non è presente nessuna notizia in questa categoria</div>
+  <?php }?>
 	</div>
 	<div class="summaryRightBar">
 		<?php GUIHandler::generateRightBannerBlock($category);?>
diff --git a/public/mobile/categorySummary.php b/public/mobile/categorySummary.php
index 0b38d4f..5d4686f 100644
--- a/public/mobile/categorySummary.php
+++ b/public/mobile/categorySummary.php
@@ -50,6 +50,7 @@ try{
 	GUIHandlerMobile::generateMenu();?>
 	<div class="categorySummaryContainer">
 		<?php $i=0;
+		if(sizeof($notizie)>0){
 			foreach ($notizie as $notizia){
 				$i++;
 				$stringTitolo = (strlen($notizia->titolo) > 103) ? substr($notizia->titolo,0,100).'...' : $notizia->titolo;
@@ -67,7 +68,11 @@ try{
 				</div>
 		<?php 
 			}
+		}
+		else{
 		?>
+			<div style="padding:20px 10px;">Al momento non è presente nessuna notizia in questa categoria</div>
+  <?php }?>
 	</div>
 
 	<?php 
diff --git a/public/mobile/style/public.css b/public/mobile/style/public.css
index 85920ed..f72d08f 100644
--- a/public/mobile/style/public.css
+++ b/public/mobile/style/public.css
@@ -22,7 +22,7 @@ body{font-family:lato, arial;}
 .bottomBar #loginMobile{border:0px;margin-left:1vw;}
 .bottomBar img{width:2.2em;display:inline-block;}
 
-.menuContainer{width:100vw;height:115vh;position:fixed;margin-left:-100vw;background-color:#333;z-index:100;overflow:scroll;top:0;}
+.menuContainer{width:100vw;height:150vh;position:fixed;margin-left:-100vw;background-color:#333;z-index:100;overflow:scroll;top:0;}
 .loginContainer{width:100vw;height:100vh;position:fixed;margin-left:100vw;background-color:#333;z-index:100;overflow:auto;top:0;}
 
 .menuHead{text-align:right;overflow:auto;}
@@ -50,7 +50,7 @@ body{font-family:lato, arial;}
 }
 
 .loginReg,.menuBar{font-weight:bold;color:white;/* background-color:#0069a3 */;}
-.menuBar{height:100%;}
+.menuBar{height:100%;padding-bottom:20px;}
 .menuTab{
 	font-size: 14pt;
 	font-family: "Bebas Neue";
@@ -64,6 +64,10 @@ body{font-family:lato, arial;}
 .menuTab > ul{margin:0;}
 .menuTab > ul > li{width:60%;}
 
+.menuTab.subVoice{font-size:12pt;}
+.menuTab.subVoice a{padding:3px 17px;}
+.menuTab.subVoice span{padding-right:10px;}
+
 .loginData{
 	font-size: 14pt;
 	font-family: "Bebas Neue";
diff --git a/public/style/public.css b/public/style/public.css
index 6c73603..4e7f899 100644
--- a/public/style/public.css
+++ b/public/style/public.css
@@ -66,7 +66,9 @@ body{font-family:lato, arial;}
 .categoryVoice{font-size:14pt;font-family:"Bebas Neue";}
 .categoryVoice:hover{background-color:#0069a3;}
 .categoryVoice > a {padding:10px 9px;display:block;color:white;font-weight:bold;}
-
+.categoryVoice.subVoice{padding-left:10px;font-size:12pt;}
+.categoryVoice.subVoice a {padding:5px 9px;}
+.categoryVoice.subVoice span{padding-right: 10px;}
 
 .footer{background-color:#14477c;padding-bottom: 15px;margin-top:10px;font-size:10pt;}
 .footerCategory{text-align:center;color:#2e91d4;padding:10px;}