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-03-01 12:21:41 +01:00
parent e4c8f77d64 36b1cef29e
commit 1dcc41b848
5 changed files with 64 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
private/common/.gitignore
+1
View File
@@ -0,0 +1 @@
/config.local.php
private/common/config.local.php
+3 -2
View File
@@ -12,7 +12,8 @@ Creation Date: 07/gen/2016
// $dbconn->password = "root";
$database = new stdClass();
$database->dbName = "fdn2";
$database->connectionString = "mongodb://10.0.0.2:27017";
// $database->connectionString = "mongodb://10.0.0.2:27017";
$database->connectionString = "mongodb://127.0.0.1:27017";
$currentSystem = new stdClass();
$currentSystem->storageBaseDir = "/home/asdynamics/storage"; // Il path con storage ecc in cui mettere i contenuti dell'applicazione (immagini, dump db ecc)
@@ -40,4 +41,4 @@ $backupSystem->passphrase = "a54af48c2ec44bba903666b6d12290750178154a6965c9165d3
// $config->application->systemTmp = "/tmp";
?>
?>
private/lib/dao/models/NotiziaModel.php
+7 -7
View File
@@ -27,12 +27,12 @@ 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),
@@ -56,4 +56,4 @@ class NotiziaModel extends HasMediaModel{
}
?>
?>
public/index.php
+31 -23
View File
@@ -82,13 +82,15 @@ catch (Exception $ex){
<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>
<div class="newsContainer">
<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>
</div>
<a class="continue" href="#"><div style="color:#3498d4;">Continua</div></a>
</div>
<?php }?>
@@ -100,15 +102,17 @@ catch (Exception $ex){
<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 class="newsContainer">
<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>
</div>
<a class="continue" href="#"><div style="color:#3498d4;">Continua</div></a>
<?php }?>
</div>
@@ -118,16 +122,20 @@ catch (Exception $ex){
<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 class="newsContainer">
<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" style="color:#3498d4"><?php echo $sport->sottotitolo;?></div>
</div>
<a class="continue" href="#"><div style="color:black;">Continua</div></a>
</div>
<?php }?>
</div>
</div>
<div class="middleBarNews">
</div>
</div>
public/style/public.css
+22 -4
View File
@@ -28,13 +28,18 @@ a{text-decoration:none;}
.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;}
.rightBarNews{width:500px;margin-top:23px;border:solid #d6d6d6 1px;border-left:0px;border-right:0px;display:inline-block;}
.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;}
.ansaTitolo{font-weight:bold;font-size:23px;}
.ansaSottotitolo{font-size:17px;color:#767676;}
.ansaTesto{color:#5aa8d8;font-weight:bold;}
.ansaTesto > p{margin:0px;}
.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;}
@@ -64,9 +69,22 @@ a{text-decoration:none;}
width: 390px;
margin-left: -5px;
}
.newsSummary{width:145px;margin:10px 3px;display:inline-block;vertical-align:top;height:262px;}
.newsContainer{position:relative;margin:10px 3px;display:inline-block;vertical-align:top;height:262px;}
.newsSummary{width:145px;display:inline-block;}
.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;}
.continue{vertical-align:bottom;position:absolute;bottom:0; left:0;}
.sportSummary{width:230px;margin:10px 3px;display:inline-block;vertical-align:top;height:262px;}
.middleBarNews{
display:inline-block;
width:220px;
border:solid #d1d1d1 1px;
background-color:#f4f4f4;
border-top:0px;
border-bottom:0px;
vertical-align:top;
text-align:center;
}