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:
Lorenzo Giacomelli
2016-03-04 18:42:05 +01:00
parent 1550cab881 6be194f833
commit 05c6d290e0
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/images/pdf.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

public/index.php
+13 -13
View File
@@ -86,7 +86,7 @@ catch (Exception $ex){
<div class="ansa"><?php
$media = DaoMediaHandler::getMainMediaFromModel($ansa);
if(!is_null($media)){?>
<div class="ansaImage">
<div class="ansaImage mediaContent">
<?php $media->renderMedia();?>
</div>
<?php }?>
@@ -119,13 +119,13 @@ catch (Exception $ex){
<div class="newsContainer">
<?php if(sizeof($politicaNews)>0){
foreach ($politicaNews as $politica){
$stringTitolo = (strlen($politica->titolo) > 103) ? substr($politica->titolo,0,100).'...' : $politica->titolo;
$string = (strlen($politica->sottotitolo) > 53) ? substr($politica->sottotitolo,0,50).'...' : $politica->sottotitolo;?>
$stringTitolo = (strlen($politica->titolo) > 53) ? substr($politica->titolo,0,50).'...' : $politica->titolo;
$string = (strlen($politica->sottotitolo) > 33) ? substr($politica->sottotitolo,0,30).'...' : $politica->sottotitolo;?>
<div class="news">
<div class="newsSummary"><?php
$media = DaoMediaHandler::getMainMediaFromModel($politica);
if(!is_null($media)){?>
<div class="newsMainMedia"><?php $media->renderMedia();?></div>
<div class="newsMainMedia mediaContent"><?php $media->renderMedia();?></div>
<?php }?>
<div class="newsTitle"><?php echo $stringTitolo;?></div>
<div class="newsSubTitle"><?php echo $string;?></div>
@@ -145,13 +145,13 @@ catch (Exception $ex){
<div class="newsContainer">
<?php if(sizeof($cronacaNews)>0){
foreach ($cronacaNews as $cronaca){
$stringTitolo = (strlen($cronaca->titolo) > 103) ? substr($cronaca->titolo,0,100).'...' : $cronaca->titolo;
$string = (strlen($cronaca->sottotitolo) > 53) ? substr($cronaca->sottotitolo,0,50).'...' : $cronaca->sottotitolo;?>
$stringTitolo = (strlen($cronaca->titolo) > 53) ? substr($cronaca->titolo,0, 50).'...' : $cronaca->titolo;
$string = (strlen($cronaca->sottotitolo) > 33) ? substr($cronaca->sottotitolo,0,30).'...' : $cronaca->sottotitolo;?>
<div class="news">
<div class="newsSummary"><?php
$media = DaoMediaHandler::getMainMediaFromModel($cronaca);
if(!is_null($media)){?>
<div class="newsMainMedia"><?php $media->renderMedia();?></div>
<div class="newsMainMedia mediaContent"><?php $media->renderMedia();?></div>
<?php }?>
<div class="newsTitle"><?php echo $stringTitolo;?></div>
<div class="newsSubTitle"><?php echo $string;?></div>
@@ -170,13 +170,13 @@ catch (Exception $ex){
<div class="newsContainer">
<?php if(sizeof($sportNews)>0){
foreach ($sportNews as $sport){
$stringTitolo = (strlen($sport->titolo) > 103) ? substr($sport->titolo,0,100).'...' : $sport->titolo;
$string = (strlen($sport->sottotitolo) > 53) ? substr($sport->sottotitolo,0,50).'...' : $sport->sottotitolo;?>
$stringTitolo = (strlen($sport->titolo) > 53) ? substr($sport->titolo,0,50).'...' : $sport->titolo;
$string = (strlen($sport->sottotitolo) > 33) ? substr($sport->sottotitolo,0,30).'...' : $sport->sottotitolo;?>
<div class="newsSport">
<div class="sportSummary"><?php
$media = DaoMediaHandler::getMainMediaFromModel($sport);
if(!is_null($media)){?>
<div class="newsMainMedia"><?php $media->renderMedia();?></div>
<div class="newsMainMedia mediaContent"><?php $media->renderMedia();?></div>
<?php }?>
<div class="newsTitle"><?php echo $stringTitolo;?></div>
<div class="newsSubTitle"><?php echo $string;?></div>
@@ -199,7 +199,7 @@ catch (Exception $ex){
<div class="culturaNews"><?php
$media = DaoMediaHandler::getMainMediaFromModel($cultura);
if(!is_null($media)){?>
<div class="culturaMainMedia"><?php $media->renderMedia();?></div>
<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
<?php }?>
<div class="newsTitle"><?php echo $string;?></div>
<a href="articolo.php?id=<?php echo $cultura->id;?>" style="color:#3498d4;font-size:13px;"><div style="margin-bottom:5px;">Leggi</div></a>
@@ -220,7 +220,7 @@ catch (Exception $ex){
<div class="culturaNews"><?php
$media = DaoMediaHandler::getMainMediaFromModel($ristoranti);
if(!is_null($media)){?>
<div class="culturaMainMedia"><?php $media->renderMedia();?></div>
<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
<?php }?>
<div class="newsTitle"><?php echo $string;?></div>
<a href="articolo.php?id=<?php echo $ristoranti->id;?>" style="color:#3498d4;font-size:13px;"><div style="margin-bottom:5px;">Leggi</div></a>
@@ -286,7 +286,7 @@ catch (Exception $ex){
<div class="viaggiContainer">
<?php $media = DaoMediaHandler::getMainMediaFromModel($lastViaggi);
if(!is_null($media)){?>
<div class="culturaMainMedia"><?php $media->renderMedia();?></div>
<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
<?php }?>
<div class="viaggiTitle"><?php echo $stringTitle;?></div>
</div>
public/style/public.css
+3 -2
View File
@@ -89,8 +89,9 @@ body{font-family:lato, arial;}
.ansa{border:solid #d6d6d6 1px;border-left:0px;border-right:0px;border-top:0px;height:180px;}
.ansa> div {display:inline-block;vertical-align:top;}
.mediaContent > *{max-height:100%;max-width:100%;}
.ansaImage{display:inline-block;margin:15px 7px;width:150px; height:113px; overflow:hidden;text-align:center;}
.ansaImage > * {max-height:100%;max-width:100%;}
.ansaNews{margin-top:2px;width:330px;cursor:pointer;}
.ansaTitolo{font-weight:bold;font-size:20px;text-align:justify;}
.ansaSottotitolo{font-size:17px;color:#767676;text-align:justify;}
@@ -245,4 +246,4 @@ body{font-family:lato, arial;}
.rotoBanner{}
.reader{}
.notRotoBanner{}
.notRotoBanner{}