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

ennesimi fix GRAFICI in home

Browse Source
This commit is contained in:
Lorenzo Giacomelli
2016-04-06 17:49:30 +02:00
parent 8e23212fe9
commit 5d92e58544
3 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/index.php
+33 -1
View File
@@ -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"=>3)
array("sort"=>array("about.data"=>-1),"limit"=>5)
);
$ansaIds = array();
@@ -119,6 +119,15 @@ try {
$animalNews->testo = strip_tags($animalNews->testo);
$animalNews->sottotitolo = strip_tags($animalNews->sottotitolo);
}
$saluteNews = GlobalVariables::get("dao")->getFirst("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_SALUTE),array('_id'=>array('$nin'=>$ansaIds)))),
array("sort"=>array("about.data"=>-1))
);
if (!is_null($saluteNews)){
$saluteNews->testo = strip_tags($saluteNews->testo);
$saluteNews->sottotitolo = strip_tags($saluteNews->sottotitolo);
}
// var_dump($politicaNews);
// if(sizeof($politicaNews)<=0){
// echo "non trovateee!!!!";
@@ -325,6 +334,29 @@ catch (Exception $ex){
}?>
</div>
<div class="middleBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY);?></div>
<div class="salute">
<div class="categoryBar" style="text-align:left;">
<div class="categoryTag"><span>SALUTE</span></div>
<div class="categoryLine"></div>
</div>
<?php if(!is_null($saluteNews)){
$stringTitle = (strlen($saluteNews->titolo) > 53) ? substr($saluteNews->titolo,0,50).'...' : $saluteNews->titolo;?>
<div class="saluteContainer">
<?php $media = DaoMediaHandler::getMainMediaFromModel($saluteNews);
if(!is_null($media)){?>
<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
<?php }?>
<div class="saluteTitle"><?php echo $stringTitle;?></div>
</div>
<script type="text/javascript">
$(document).ready(function(event){
$(".saluteTitle").click(function(event){
window.location.href="articolo.php?id=<?php echo $saluteNews->id;?>";
});
});
</script>
<?php }?>
</div>
</div>
<div class="rightBarNews">
<?php HTMLHelper::getMeteoBlock(); ?>
public/style/admin.css
+1 -1
View File
@@ -18,7 +18,7 @@ body > div {overflow:hidden;}
.admin_head{margin-left:300px; text-align:center;}
.admin_head + div{padding: 20px; position:relative;min-height:50px;}
.admin_head + div{padding: 20px; position:relative;min-height:500px;}
public/style/public.css
+4 -4
View File
@@ -249,7 +249,7 @@ display: inline-block;
.titleContainer > .categoryTitle{font-weight:bold; font-size:10pt;}
.titleContainer > .culturaLine{height: 3px;background-color: #339cd5;}
.ristorantiBlock, .culturaNews{
.saluteContainer, .ristorantiBlock, .culturaNews{
text-align:left;
margin-top: 5px;
margin-bottom:10px;
@@ -275,8 +275,8 @@ display: inline-block;
.middleBanner{height:142px; width:190px;}
.middleBanner img{height:100%;width:100%;}
.ristorantiCol{margin-top:10px;text-align:center;}
.ristorantiTitle{margin-top:10px;font-size:12px;}
.salute,.ristorantiCol{margin-top:10px;text-align:center;}
.saluteTitle, .ristorantiTitle{margin-top:10px;font-size:12px;}
.rightBarNews{
display:inline-block;
width:210px;
@@ -298,7 +298,7 @@ display: inline-block;
.meteo .day{font-size:11pt;text-align:center; font-weight:bold;}
.meteo div span{font-weight:bold;}
.middleRightBanner{width:190px;overflow: hidden;height: 142px;margin: 5px 0;}
.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;}