Work/fdn2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Riccardo Di Dato
2016-02-26 12:07:49 +01:00
parent 5ec979d6eb 7398f2613a
commit befe54fa0d
19 changed files with 285 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
private/lib/dao/mediaModels/DaoMediaHandler.php
+2 -1
View File
@@ -150,7 +150,8 @@ class DaoMediaHandler implements MediaHandlerInterface{
$mainMedia = $model->getMainMediaReference();
$tmp = null;
if(!is_null($mainMedia)){
$tmp = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$mainMedia));
$mainMediaId = new MongoId($mainMedia);
$tmp = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$mainMediaId));
}
// var_dump($tmp);
return $tmp;
private/lib/dao/models/NotiziaModel.php
+7 -7
View File
@@ -27,18 +27,18 @@ class NotiziaModel extends HasMediaModel{
self::STATUS_REJECTED=>array("label"=>"Respinta")
);
const CATEGORY_POLITICA = 1;
const CATEGORY_CRONACA = 2;
const CATEGORY_SPORT = 3;
const CATEGORY_CULTURA = 4;
const CATEGORY_GOSSIP = 5;
const CATEGORY_ANIMALI = 6;
const CATEGORY_POLITICA = "1";
const CATEGORY_CRONACA = "2";
const CATEGORY_SPORT = "3";
const CATEGORY_CULTURA = "4";
const CATEGORY_GOSSIP = "5";
const CATEGORY_ANIMALI = "6";
public static $NOTIZIE_CATEGORY = array(
self::CATEGORY_POLITICA=>array("label"=>"Politica","mainMenu"=>true),
self::CATEGORY_CRONACA=>array("label"=>"Cronaca","mainMenu"=>true),
self::CATEGORY_SPORT=>array("label"=>"Sport","mainMenu"=>true),
self::CATEGORY_CULTURA=>array("label"=>"Cultura","mainMenu"=>true),
self::CATEGORY_CULTURA=>array("label"=>"Cultura&Spettacolo","mainMenu"=>true),
self::CATEGORY_GOSSIP=>array("label"=>"Gossip","mainMenu"=>true),
self::CATEGORY_ANIMALI=>array("label"=>"Mondo Animale","mainMenu"=>false)
);
private/lib/gui/GUIHandler.php
+75
View File
@@ -141,6 +141,81 @@ class GUIHandler {
public static function addOnLoadJsEvent($script){
self::$onLoadEvents[] = $script;
}
public static function generateHeadPublic(){
$mesi = array(1=>'Gennaio', 'Febbraio', 'Marzo', 'Aprile',
'Maggio', 'Giugno', 'Luglio', 'Agosto',
'Settembre', 'Ottobre', 'Novembre','Dicembre');
$day = date("d");
/*
*
<div class="upperBar" style="position:relative; border:solid #d6d6d6 1px; border-left:0px;border-right:0px;height:30px;font-size:12px;">
<div class="dateBar" style="text-align:center;margin:7px 0px;color:#999999;font-weight:bold;">'.$day." ".$mesi[date("n")]." ".date("Y").' - Aggiornato alle <span style="color:#f68235;"><'.date("H:i").'</span></div>
<div class="loginReg" style="position:absolute;right:0;top:7px;margin-right:210px;color:#3397d3;"><a href="#" style="text-decoration:none;color:#3397d3;">LOGIN</a> | <a href="#" style="text-decoration:none;color:#3397d3;">REGISTER</a></div>
<div class="socialBar" style="position:absolute;right:50px;top:3px;">
<a class="socialLink" style="margin-right:3px;display:inline-block;" href="www.facebook.com/"><div style="display:inline-block;width:22px;height:22px;background-image:url(images/fb.png);"></div></a>
<a class="socialLink" style="margin-right:3px;display:inline-block;" href="www.tritter.com/"><div style="display:inline-block;width:22px;height:22px;background-image:url(images/twitter.png);"></div></a>
<a class="socialLink" style="margin-right:3px;display:inline-block;" href="www.plus.google.com/"><div style="display:inline-block;width:22px;height:22px;background-image:url(images/google.png);"></div></a>
<a class="socialLink" style="margin-right:3px;display:inline-block;" href="www.linkedin.com/"><div style="display:inline-block;width:22px;height:22px;background-image:url(images/linkedin.png);"></div></a>
<a class="socialLink" style="margin-right:3px;display:inline-block;" href="www.youtube.com/"><div style="display:inline-block;width:22px;height:22px;background-image:url(images/youtube.png);"></div></a>
</div>
</div>
<div class="middleBar" style="position:relative;height:138px;border:solid #d6d6d6 1px;border-top:0px;border-left:0px;border-right:0px;">
<div class="leftBanner topBanner" style="position:absolute;top:45px;left:10px;"><img src="images/ads.png" alt=""></div>
<div class="logo" style="display:inline-block;width:50%;text-align:center;margin:12px 250px;"><img src="images/logo_uff.png"></div>
<div class="rightBanner topBanner" style="position:absolute;top:45px;right:10px;"><img src="images/ads.png" alt=""></div>
</div>
<div class="bottomBar" style="height:40px;width:1000px;"></div>
*/
$head = '<div class="headContainer">
<div class="upperBar">
<div class="dateBar">'.$day." ".$mesi[date("n")]." ".date("Y").' - Aggiornato alle <span style="color:#f68235;">'.date("H:i").'</span></div>
<div class="loginReg"><a href="#">LOGIN</a> | <a href="#">REGISTER</a></div>
<div class="socialBar">
<a class="socialLink" href="www.facebook.com/"><div style="background-image:url(images/fb.png);"></div></a>
<a class="socialLink" href="www.tritter.com/"><div style="background-image:url(images/twitter.png);"></div></a>
<a class="socialLink" href="www.plus.google.com/"><div style="background-image:url(images/google.png);"></div></a>
<a class="socialLink" href="www.linkedin.com/"><div style="background-image:url(images/linkedin.png);"></div></a>
<a class="socialLink" href="www.youtube.com/"><div style="background-image:url(images/youtube.png);"></div></a>
</div>
</div>
<div class="middleBar">
<div class="leftBanner topBanner"><img src="images/ads.png" alt=""></div>
<div class="logo"><img src="images/logo_uff.png"></div>
<div class="rightBanner topBanner"><img src="images/ads.png" alt=""></div>
</div>
<div class="bottomBar" style="height:40px;width:1000px;"></div>
</div>';
echo $head;
}
public static function generateMenu($pageSelected = "home"){
$html = "";
$homeSelected = "";
if(strcasecmp($pageSelected, "home")==0){
$homeSelected ="selected";
}
foreach (NotiziaModel::$NOTIZIE_CATEGORY as $category=>$data){
if($data["mainMenu"]){
if(strcmp($data["label"],$pageSelected)==0){
$html .= '<div class="menuTab selected"><a href="#">'.strtoupper($data["label"]).'</a></div>';
}
else{
$html .= '<div class="menuTab"><a href="#">'.strtoupper($data["label"]).'</a></div>';
}
}
}
$menu = '<div class="menuBar"><div class="menuTab '.$homeSelected.'"><a href="#">HOME</a></div>'.$html.
'<div class="menuTab" ><a href="#">TUTTE LE SEZIONI</a></div>
<div class="searchBar" style="display:inline-block;"><input class="inputBar" name="search" placeholder="cerca nel sito" /></div>
</div>';
echo $menu;
}
}
?>
private/lib/gui/html.inclusion.php
+13 -1
View File
@@ -40,4 +40,16 @@ GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"datetimepicker-master
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"highcharts.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"functions.js");
?>
/*
____ _ _ ____ _ ___ ____
| _ \| | | | __ )| | |_ _/ ___|
| |_) | | | | _ \| | | | |
| __/| |_| | |_) | |___ | | |___
|_| \___/|____/|_____|___\____|
*/
GUIHandler::addStylesheet(GUIHandler::STYLESHEET_USER, "public.css?rev=".time());
?>
oth/img/minoImg/ads.png → public/images/ads.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

oth/img/minoImg/fb.png → public/images/fb.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 461 B

After

Width:  |  Height:  |  Size: 461 B

oth/img/minoImg/fb_round.png → public/images/fb_round.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 496 B

After

Width:  |  Height:  |  Size: 496 B

oth/img/minoImg/google.png → public/images/google.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 399 B

oth/img/minoImg/youtube_round.png → public/images/google_round.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 784 B

After

Width:  |  Height:  |  Size: 784 B

oth/img/minoImg/icon.png → public/images/icon.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 448 B

After

Width:  |  Height:  |  Size: 448 B

oth/img/minoImg/linkedin.png → public/images/linkedin.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 290 B

oth/img/minoImg/linkedin_round.png → public/images/linkedin_round.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 796 B

After

Width:  |  Height:  |  Size: 796 B

oth/img/minoImg/logo_uff.png → public/images/logo_uff.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

oth/img/minoImg/title_small.png → public/images/title_small.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 233 B

oth/img/minoImg/twitter.png → public/images/twitter.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 335 B

After

Width:  |  Height:  |  Size: 335 B

oth/img/minoImg/twitter_round.png → public/images/twitter_round.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 701 B

After

Width:  |  Height:  |  Size: 701 B

oth/img/minoImg/youtube.png → public/images/youtube.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 646 B

After

Width:  |  Height:  |  Size: 646 B

public/index.php
+116 -2
View File
@@ -10,10 +10,124 @@ try {
AnalyticsHelper::logPageImpression();
GUIHandler::generateHtmlHeaders();
echo "OK";
// echo "OK";
// var_dump(date("n"));
$mesi = array(1=>'Gennaio', 'Febbraio', 'Marzo', 'Aprile',
'Maggio', 'Giugno', 'Luglio', 'Agosto',
'Settembre', 'Ottobre', 'Novembre','Dicembre');
$day = date("d");
$pageSelected="home";
$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)
);
$politicaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_POLITICA))),
array("sort"=>array("about.data"=>-1),"limit"=>3)
);
$cronacaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_CRONACA))),
array("sort"=>array("about.data"=>-1),"limit"=>3)
);
$sportNews = GlobalVariables::get("dao")->query("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_SPORT))),
array("sort"=>array("about.data"=>-1),"limit"=>2)
);
// var_dump($politicaNews);
if(sizeof($politicaNews)<=0){
echo "non trovateee!!!!";
}
}
catch (Exception $ex){
echo $ex->getMessage();
}
?>
?>
<div style="width:1000px;margin-left:auto;margin-right:auto;">
<?php
GUIHandler::generateHeadPublic();
GUIHandler::generateMenu($pageSelected);?>
<div class="rightBarNews">
<div class="ansaContainer" >
<?php foreach($ansaNews as $ansa){?>
<div class="ansa"><?php
$media = DaoMediaHandler::getMainMediaFromModel($ansa);
if(!is_null($media)){?>
<div class="ansaImage">
<?php $media->renderMedia();?>
</div>
<?php }?>
<div class="ansaNews">
<div class="ansaTitolo"><?php echo $ansa->titolo;?></div>
<div class="ansaSottotitolo"> <?php echo $ansa->sottotitolo;?></div>
<div class="ansaTesto"><?php echo $ansa->testo;?></div>
</div>
</div>
<div class="socialBarAnsa">
<a class="socialLink" href="www.facebook.com/"><div style="background-image:url(images/fb_round.png);"></div></a>
<a class="socialLink" href="www.tritter.com/"><div style="background-image:url(images/twitter_round.png);"></div></a>
<a class="socialLink" href="www.linkedin.com/"><div style="background-image:url(images/linkedin_round.png);"></div></a>
<a class="socialLink" href="www.plus.google.com/"><div style="background-image:url(images/google_round.png);"></div></a>
</div>
<?php } ?>
</div>
<div class="categoryNews">
<div class="categoryBar">
<div class="categoryTag"><span>POLITICA</span></div>
<div class="categoryLine"></div>
</div>
<?php foreach ($politicaNews as $politica){?>
<div class="newsSummary"><?php
$media = DaoMediaHandler::getMainMediaFromModel($politica);
if(!is_null($media)){?>
<div class="newsMainMedia"><?php $media->renderMedia();?></div>
<?php }?>
<div class="newsTitle"><?php echo $politica->titolo;?></div>
<div class="newsSubTitle"><?php echo $politica->sottotitolo;?></div>
<a class="continue" href="#"><div style="color:#3498d4;">Continua</div></a>
</div>
<?php }?>
</div>
<div class="categoryNews">
<div class="categoryBar">
<div class="categoryTag"><span>CRONACA</span></div>
<div class="categoryLine"></div>
</div>
<?php foreach ($cronacaNews as $cronaca){?>
<div class="newsSummary"><?php
$media = DaoMediaHandler::getMainMediaFromModel($cronaca);
if(!is_null($media)){?>
<div class="newsMainMedia"><?php $media->renderMedia();?></div>
<?php }?>
<div class="newsTitle"><?php echo $cronaca->titolo;?></div>
<div class="newsSubTitle"><?php echo $cronaca->sottotitolo;?></div>
</div>
<a class="continue" href="#"><div style="color:#3498d4;">Continua</div></a>
<?php }?>
</div>
<div class="categoryNews">
<div class="categoryBar">
<div class="categoryTag"><span>SPORT</span></div>
<div class="categoryLine"></div>
</div>
<?php foreach ($sportNews as $sport){?>
<div class="sportSummary"><?php
$media = DaoMediaHandler::getMainMediaFromModel($sport);
if(!is_null($media)){?>
<div class="newsMainMedia"><?php $media->renderMedia();?></div>
<?php }?>
<div class="newsTitle"><?php echo $sport->titolo;?></div>
<div class="newsSubTitle"><?php echo $sport->sottotitolo;?></div>
<a class="continue" href="#"><div style="color:#3498d4;">Continua</div></a>
</div>
<?php }?>
</div>
</div>
</div>
public/style/public.css
+72
View File
@@ -0,0 +1,72 @@
@CHARSET "UTF-8";
a{text-decoration:none;}
/* TOP HEAD BAR (GUIHandler)*/
.upperBar{position:relative; border:solid #d6d6d6 1px; border-left:0px;border-right:0px;height:30px;font-size:12px;}
.dateBar{text-align:center;margin:7px 0px;color:#999999;font-weight:bold;}
.loginReg{position:absolute;right:0;top:7px;margin-right:210px;color:#3397d3}
.loginReg > a{text-decoration:none;color:#3397d3;}
.socialBar{position:absolute;right:50px;top:3px;}
.socialBar > a{margin-right:3px;display:inline-block;}
.socialBar > a > div{display:inline-block;width:22px;height:22px;}
.middleBar{position:relative;height:138px;border:solid #d6d6d6 1px;border-top:0px;border-left:0px;border-right:0px;}
.leftBanner{position:absolute;top:45px;left:10px;}
.logo{display:inline-block;width:50%;text-align:center;margin:12px 250px;}
.rightBanner{position:absolute;top:45px;right:10px;}
.menuBar{background-color:#139be5;font-weight:bold;height:45px;margin-top:2px;color:white;overflow:hidden;}
.menuTab{display:inline-block;padding:15px 17px 15px 16px;font-size:12px;}
.menuTab.selected{display:inline-block;padding:15px 17px 15px 16px;font-size:12px;background-color:#0069a3;}
.menuTab > a {text-decoration:none;color:white;}
.searchBar{display:inline-block;margin:10px;}
.searchBar > input{border-radius:6px;border:none;padding:5px;}
.rightBarNews{width:500px;margin-top:23px;border:solid #d6d6d6 1px;border-left:0px;border-right:0px;}
.ansaContainer{margin-bottom:25px; border:none;}
.ansa{border:solid #d6d6d6 1px;border-left:0px;border-right:0px;border-top:0px;}
.ansa> div {display:inline-block;vertical-align:top;}
.ansaImage{display:inline-block;margin:15px 7px;width:150px;overflow:hidden;text-align:center;}
.ansaNews{margin-top:2px;width:330px;}
.socialBarAnsa{margin-top:3px;border:solid #d6d6d6 1px;border-left:0px;border-right:0px;border-top:0px;}
.socialBarAnsa > a{margin-right:3px;display:inline-block;}
.socialBarAnsa > a > div{display:inline-block;width:22px;height:22px;background-repeat:no-repeat;background-position:center;}
.categoryNews{width:500px;height:284px;margin-bottom:29px;position:relative;}
.categoryBar{height:22px;}
.categoryTag{
display: inline-block;
text-align: center;
color:white;
font-weight:bold;
font-size:20px;
background-color: #339cd5;
vertical-align: middle;
height: 22px;
width: 100px;
margin: 0px;
}
.categoryTag > span{margin-top: 2px;}
.categoryLine{height: 3px;
display: inline-block;
background-color: #339cd5;
margin-top: 10px;
width: 390px;
margin-left: -5px;
}
.newsSummary{width:145px;margin:10px 3px;display:inline-block;vertical-align:top;height:262px;}
.newsMainMedia{width:140px;height:100px;overflow:hidden;margin-bottom:25px;text-align:center;}
.newsTitle{font-weight:bold;margin-bottom:20px;}
.newsSubTitle{margin-bottom:10px;}
.continue{vertical-align:bottom;position:absolute;bottom:0;}