diff --git a/public/articolo.php b/public/articolo.php index ce381f0..13bb8d2 100644 --- a/public/articolo.php +++ b/public/articolo.php @@ -150,6 +150,9 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
+
+
+
diff --git a/public/index.php b/public/index.php index 473c197..d08f53d 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){
+
@@ -382,7 +393,7 @@ catch (Exception $ex){
titolo) > 53) ? substr($lastViaggi->titolo,0,50).'...' : $lastViaggi->titolo;?> -
+
renderMedia();?>
@@ -398,6 +409,29 @@ catch (Exception $ex){
+
+
+
ANIMALI
+
+
+ titolo) > 53) ? substr($animalNews->titolo,0,50).'...' : $animalNews->titolo;?> +
+ +
renderMedia();?>
+ +
+
+ + +
getFirst("NotiziaModel",array("id"=>$_POST["id"],"status"=>NotiziaModel::STATUS_ACCEPTED)); + } + + if (is_null($articolo)){ + GUIHandler::redirect("index.php"); + } + + $media = DaoMediaHandler::getMainMediaFromModel($articolo); + + $mesi = array(1=>'Gennaio', 'Febbraio', 'Marzo', 'Aprile', + 'Maggio', 'Giugno', 'Luglio', 'Agosto', + 'Settembre', 'Ottobre', 'Novembre','Dicembre'); + + $data = date("d",$articolo->about->data->sec)." ".$mesi[date("n",$articolo->about->data->sec)]." ".date("Y",$articolo->about->data->sec); + + $mediaMetaInfo = ''; + if ($media->mediaType == MediaModel::TYPE_LOCALVIDEO || $media->mediaType == MediaModel::TYPE_YOUTUBE){ + $mediaMetaInfo = 'itemprop="video"'; + if ($media->mediaType == MediaModel::TYPE_YOUTUBE){ + $additionalHeaders[] = ''; + + $additionalHeaders[] = ''; + $additionalHeaders[] = ''; + $additionalHeaders[] = ''; + $additionalHeaders[] = ''; + } + } + else if ($media->mediaType == MediaModel::TYPE_IMAGE){ + $mediaMetaInfo = 'itemprop="image"'; + $additionalHeaders[] = ''; + } + +}catch(GUIException $ex){ + $error = $ex->getMessage(); +}catch (Exception $exec){ + $msg = LogModel::fromException($exec); + GlobalVariables::get("dao")->save($msg); + + GUIHandler::redirect("index.php"); +} +GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders)); + +?> + +
+
+
category]["label"]?>
+
titolo;?>
+
sottotitolo;?>
+
+
+ renderMedia(array("size"=>MediaRenderer::SIZE_MEDIUM))?> +
+ testo;?> +
+
+ \ No newline at end of file diff --git a/public/style/public.css b/public/style/public.css index 99fe2eb..cbb91bf 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;} @@ -197,6 +197,7 @@ display: inline-block; margin: 0px; z-index: 2; position: relative; + letter-spacing:-1px; } @@ -224,18 +225,19 @@ display: inline-block; .sportSummary .newsMainMedia{width:300px;height:168px;} .middleBarNews{ display:inline-block; - width:150px; + width:110px; /* max-height:1380px; */ /* height:1380px; */ /* background-color:#f4f4f4; */ border-top:0px; border-bottom:0px; + border-right:solid #b3b3b3 1px; vertical-align:top; text-align:center; - padding:10px 15px; + padding:10px 10px; } -.titleContainer > .categoryTitle{font-weight:bold; font-size:15px;} +.titleContainer > .categoryTitle{font-weight:bold; font-size:10pt;} .titleContainer > .culturaLine{height: 3px;background-color: #339cd5;} .ristorantiBlock, .culturaNews{ text-align:center; @@ -259,14 +261,14 @@ display: inline-block; .culturaMainMedia.mediaContent > iframe{min-height:150px;max-height:180px;} .ristorantiTitle, .culturaTitle{font-weight: bold;text-align: left;font-size: 12px;} .ristorantiBlock .ristorantiLink > a, .culturaNews .culturaLink > a{color:#3498d4;font-size:13px;} -.middleBanner{height:115px; width:150px;} +.middleBanner{height:115px; width:110px;} .middleBanner > img{max-height:100px;max-width:220px;} .ristorantiTitle{margin-top:10px;} - +.ristorantiTitle .categoryTag{min-width:110px;} .rightBarNews{ display:inline-block; - width:160px; + width:200px; /*max-height:1380px;*/ /* height:1380px; */ vertical-align:top; @@ -298,9 +300,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;} /* _ _ _ _ @@ -352,8 +354,15 @@ display: inline-block; vertical-align:top; } -.socialBarArticolo > a{margin-right:3px;display:inline-block;} -.socialBarArticolo > a > div{display:inline-block;width:22px;height:22px;background-repeat:no-repeat;background-position:center;} +.utilityBar > .stamp{ + height:22px; + padding: 4px 10px; + float:left; + vertical-align:top; +} + +.stamp > a, .socialBarArticolo > a{margin-right:3px;display:inline-block;} +.stamp > a > div,.socialBarArticolo > a > div{display:inline-block;width:22px;height:22px;background-repeat:no-repeat;background-position:center;} .articoloLeftBar{width:700px;display:inline-block;vertical-align:top;} @@ -546,3 +555,13 @@ Password Recovery z-index: 11; display:none; } + +/* + ____ _ _ ____ +| _ \ _ __(_)_ __ | |_| _ \ __ _ __ _ ___ +| |_) | '__| | '_ \| __| |_) / _` |/ _` |/ _ \ +| __/| | | | | | | |_| __/ (_| | (_| | __/ +|_| |_| |_|_| |_|\__|_| \__,_|\__, |\___| + |___/ +*/ +