diff --git a/private/lib/dao/models/NotiziaModel.php b/private/lib/dao/models/NotiziaModel.php index 9a6b22c..8e03d7b 100644 --- a/private/lib/dao/models/NotiziaModel.php +++ b/private/lib/dao/models/NotiziaModel.php @@ -44,21 +44,21 @@ class NotiziaModel extends HasMediaModel{ const CATEGORY_SPECIALE_ELEZIONI = 15; public static $NOTIZIE_CATEGORY = array( - self::CATEGORY_POLITICA=>array("label"=>"Politica","mainMenu"=>true,"hidden"=>false,"pages"=>array("list"=>"politica.php")), - self::CATEGORY_CRONACA=>array("label"=>"Cronaca","mainMenu"=>true, "hidden"=>false,"pages"=>array("list"=>"cronaca.php")), - self::CATEGORY_SPORT=>array("label"=>"Sport","mainMenu"=>true, "hidden"=>false,"pages"=>array("list"=>"sport.php")), - 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"=>false,"pages"=>array("list"=>"viaggi.php")), - self::CATEGORY_RISTORANTI=>array("label"=>"Food&Drink","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"ristoranti.php")), - self::CATEGORY_MESTIERI=>array("label"=>"Professioni e Mestieri","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"mestieri.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"=>false,"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")), - self::CATEGORY_RUBRICHE=>array("label"=>"Rubriche","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"rubriche.php")), - self::CATEGORY_SPECIALE_ELEZIONI=>array("label"=>"Speciale Elezioni","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"specialeElezioni.php")) + 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") ); public static function getCollectionName(){ diff --git a/private/lib/gui/GUIHandler.php b/private/lib/gui/GUIHandler.php index 6f54620..afeaa76 100644 --- a/private/lib/gui/GUIHandler.php +++ b/private/lib/gui/GUIHandler.php @@ -420,17 +420,10 @@ class GUIHandler { $i++; $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;?> -
+
-
- + diff --git a/public/articolo.php b/public/articolo.php index 8582b19..de41e1c 100644 --- a/public/articolo.php +++ b/public/articolo.php @@ -126,7 +126,7 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders,"a
-
category]["label"]);?>
+
">category]["label"]);?>
diff --git a/public/categorySummary.php b/public/categorySummary.php index 6218b9b..a4d1e91 100644 --- a/public/categorySummary.php +++ b/public/categorySummary.php @@ -59,18 +59,14 @@ try{ ?>
renderMedia(array("size"=>MediaRenderer::SIZE_SMALL)):"" ;?>
-
+
-
+
renderMedia();?>
-
-
-
-
- -
+ +
+
+
+
@@ -206,7 +199,7 @@ catch (Exception $ex){ $i++; $stringTitolo = (strlen($politica->titolo) > 53) ? substr($politica->titolo,0,50).'...' : $politica->titolo; $string = (strlen($politica->sottotitolo) > 33) ? substr($politica->sottotitolo,0,30).'...' : $politica->sottotitolo;?> -
+
@@ -215,14 +208,7 @@ catch (Exception $ex){
-
- +
@@ -240,7 +226,7 @@ catch (Exception $ex){ $i++; $stringTitolo = (strlen($cronaca->titolo) > 53) ? substr($cronaca->titolo,0, 50).'...' : $cronaca->titolo; $string = (strlen($cronaca->sottotitolo) > 33) ? substr($cronaca->sottotitolo,0,30).'...' : $cronaca->sottotitolo;?> -
+
@@ -249,14 +235,7 @@ catch (Exception $ex){
-
- + @@ -273,7 +252,7 @@ catch (Exception $ex){ $i++; $stringTitolo = (strlen($sport->titolo) > 53) ? substr($sport->titolo,0,50).'...' : $sport->titolo; $string = (strlen($sport->sottotitolo) > 33) ? substr($sport->sottotitolo,0,30).'...' : $sport->sottotitolo;?> -
+
@@ -282,14 +261,7 @@ catch (Exception $ex){
-
- + @@ -305,20 +277,13 @@ catch (Exception $ex){ foreach ($culturaNews as $cultura){ $i++; $string = (strlen($cultura->titolo) > 53) ? substr($cultura->titolo,0,50).'...' : $cultura->titolo;?> -
id;?>" id="cultura_" class="culturaNews">
renderMedia();?>
-
- + @@ -334,20 +299,13 @@ catch (Exception $ex){ foreach ($ristorantiNews as $ristoranti){ $i++; $string = (strlen($ristoranti->titolo) > 53) ? substr($ristoranti->titolo,0,50).'...' : $ristoranti->titolo;?> -
id;?>" id="ristoranti_" class="ristorantiBlock">
renderMedia();?>
-
- + @@ -359,20 +317,13 @@ catch (Exception $ex){ titolo) > 53) ? substr($saluteNews->titolo,0,50).'...' : $saluteNews->titolo;?> -
+
renderMedia();?>
-
- + @@ -391,17 +342,10 @@ catch (Exception $ex){ $i++; $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;?> -
+
-
- + @@ -417,21 +361,13 @@ catch (Exception $ex){ $i++; $stringTitle = (strlen($gossip->titolo) > 53) ? substr($gossip->titolo,0,50).'...' : $gossip->titolo; $stringSubTitle = (strlen($last->sottotitolo) > 23) ? substr($last->sottotitolo,0,20).'...' : $last->sottotitolo;?> -
+
renderMedia();?>
- -
- + @@ -446,20 +382,13 @@ catch (Exception $ex){ titolo) > 53) ? substr($elezioni->titolo,0,50).'...' : $elezioni->titolo;?> -
+
renderMedia();?>
-
- + titolo) > 53) ? substr($lastViaggi->titolo,0,50).'...' : $lastViaggi->titolo;?> -
+
renderMedia();?>
-
- + titolo) > 53) ? substr($animalNews->titolo,0,50).'...' : $animalNews->titolo;?> -
+
renderMedia();?>
-
- + diff --git a/public/style/public.css b/public/style/public.css index 0c60d2f..6c73603 100644 --- a/public/style/public.css +++ b/public/style/public.css @@ -173,14 +173,14 @@ display: inline-block; .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;} +.ansa > a {display:inline-block;vertical-align:top;} .mediaContent{overflow:hidden;} .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;} -.ansaNews{margin-top:2px;width:280px;cursor:pointer;} +.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;} .ansaTesto{color:#5aa8d8;font-weight:bold;text-align:left;font-size:12pt;} @@ -220,8 +220,8 @@ display: inline-block; } -.news{position:relative;margin:10px 0px;display:inline-block;vertical-align:top;/* max-height:270px; *//* height:270px; */} -.newsSport{position:relative;margin:10px 0px;display:inline-block;vertical-align:top;/* max-height:262px; *//* height:262px; */} +.news{position:relative;margin:10px 0px;display:inline-block;vertical-align:top;text-decoration:none;color:black;/* max-height:270px; *//* height:270px; */} +.newsSport{position:relative;margin:10px 0px;display:inline-block;vertical-align:top;text-decoration:none;color:black;/* max-height:262px; *//* height:262px; */} .newsSummary{width:180px;display:inline-block;cursor:pointer;} .newsMainMedia{width:175px;height:102px;overflow:hidden;margin-bottom:25px;text-align:center;} .newsTitle{font-weight:bold;margin-bottom:5px;text-align:left;font-size:14px;} @@ -247,11 +247,13 @@ display: inline-block; margin-top:-1px; } +.titleContainer{margin-bottom:5px;} .titleContainer > .categoryTitle{font-weight:bold; font-size:10pt;} .titleContainer > .culturaLine{height: 3px;background-color: #339cd5;} .saluteContainer, .ristorantiBlock, .culturaNews{ + display:block; text-align:left; - margin-top: 5px; + /* margin-top: 5px; */ margin-bottom:10px; border:dashed #C1B4B4 1px; border-top:0px; @@ -260,6 +262,8 @@ display: inline-block; /* max-height:165px; */ cursor:pointer; font-weight:bold; + text-decoration:none; + color:black; } .ristorantiBlock:last-child{border-bottom:none;} .culturaMainMedia{ @@ -288,6 +292,9 @@ display: inline-block; margin-top:-1px; } +.ristorantiCol .categoryBar, .salute .categoryBar, .lastNews .categoryBar, .lastGossip .categoryBar, .lastViaggi .categoryBar, +.animali .categoryBar{margin-bottom:5px;} + .meteoTitle{font-size: 15px;font-weight: bold;border-bottom: 3px solid #339CD5;margin-bottom: 7px;text-align:center;} .meteo{max-height: 165px;max-width: 220px;text-align: center;border-bottom: 1px dotted #C1B4B4;padding-bottom: 10px;margin-bottom: 10px;} .meteo > div{display:inline-block; width:49%;} @@ -301,19 +308,19 @@ display: inline-block; .middleRightBanner{width:210px;overflow: hidden;height: 142px;margin: 5px 0;} .middleRightBanner img{width:100%; heigth:100%;} -.reader > .lastContainer, .lastContainer{/* max-height:120px */;padding:5px;;border-bottom:dotted #C1B4B4 1px;cursor:pointer;} +.reader > .lastContainer, .lastContainer{/* max-height:120px */;display:block;padding:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;text-decoration:none;color:black;} .reader > .lastContainer:last-child, .lastContainer:last-child {border-bottom: none;} .reader > .lastData, .lastData{font-size:12px;} .reader > .lastTitle, .lastTitle{font-size:12px;font-weight:bold;} .reader > .lastContinua, .lastContinua{text-align:right; font-size:12px;font-weight:bold;padding-bottom:5px;} .reader > .lastContinua a, .lastContinua a{color:#64bff0;} -.gossipContainer{/* max-height:165px */;margin-top:5px;margin-bottom:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;overflow:hidden;} +.gossipContainer{/* max-height:165px */;/* margin-top:5px */;margin-bottom:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;overflow:hidden;text-decoration:none;color:black;} .gossipContainer#gossip_2{border-bottom:none;} .gossipTitle{margin-bottom:5px;font-weight:bold;font-size:20px;} .gossipSubtitle{margin-bottom:5px;color:#64bff0;font-weight:bold;font-size:15px;} -.animaliContainer,.viaggiContainer{/* max-height:165px; */margin-top:5px;margin-bottom:5px;} +.animaliContainer,.viaggiContainer{/* max-height:165px; *//* margin-top:5px */;display:block;margin-bottom:5px;text-decoration:none;color:black;} .animaliContainer > .culturaMainMedia,.viaggiContainer > .culturaMainMedia{text-align:left;} .animaliTitle,.viaggiTitle{cursor:pointer;margin-bottom:5px;font-weight:bold;font-size:17px;} @@ -434,7 +441,7 @@ display: inline-block; .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;} +.notiziaContainer > .notiziaInfo{display:inline-block;width:400px;padding:10px;vertical-align:middle;cursor:pointer;text-decoration:none;color:black;} .notiziaInfo > .notiziaTitolo{font-weight:bold;padding:5px;} .notiziaInfo > .notiziaSottotitolo{padding:5px;} .notiziaInfo > .notiziaTesto{padding:5px;color:#1a9ee9;font-weight:bold;}