diff --git a/private/common/config.local.php b/private/common/config.local.php
index d6b15a1..d9bacbb 100644
--- a/private/common/config.local.php
+++ b/private/common/config.local.php
@@ -31,7 +31,8 @@ $currentSystem->apache->user = "var-www";
$currentSystem->apache->group = "var-www";
$currentSystem->apache->workdir = "/var/www"; // Il path in cui inserire la cartella con le pagine html
-$currentSystem->remoteLocationPath = "http://localhost/fdn2/";
+// $currentSystem->remoteLocationPath = "http://10.0.0.64/fdn2/";
+ $currentSystem->remoteLocationPath = "http://192.168.1.129/fdn2/";
$backupSystem = new stdClass();
$backupSystem->account = "40a911e14db8ad6faf0a0e7385e7c267";
diff --git a/private/lib/dao/models/BannerModel.php b/private/lib/dao/models/BannerModel.php
index b67eed2..359bda5 100644
--- a/private/lib/dao/models/BannerModel.php
+++ b/private/lib/dao/models/BannerModel.php
@@ -12,12 +12,14 @@ class BannerModel extends HasMediaModel{
const POSITION_HEAD = 1;
const POSITION_BODY = 2;
+ const POSITION_LONG = 3;
const GENERAL_CATEGORY = 0;
public static $BANNER_POSITIONS = array(
self::POSITION_HEAD=>array("label"=>"Testata"),
- self::POSITION_BODY=>array("label"=>"Corpo")
+ self::POSITION_BODY=>array("label"=>"Corpo"),
+ self::POSITION_LONG=>array("label"=>"Corpo Lungo")
);
public function __construct($saveableObject = null){
diff --git a/public/admin/editBanner.php b/public/admin/editBanner.php
index 0ff7e01..5733c92 100644
--- a/public/admin/editBanner.php
+++ b/public/admin/editBanner.php
@@ -93,6 +93,7 @@ try{
+
diff --git a/public/admin/homeMultimedia.php b/public/admin/homeMultimedia.php
index ceba9de..e6a9a99 100644
--- a/public/admin/homeMultimedia.php
+++ b/public/admin/homeMultimedia.php
@@ -117,6 +117,8 @@ HTMLHelper::generateAdminHead();
diff --git a/public/index.php b/public/index.php
index 1dbd840..eed75b4 100644
--- a/public/index.php
+++ b/public/index.php
@@ -29,7 +29,7 @@ try {
$ansaNews = GlobalVariables::get("dao")->query("NotiziaModel",
// array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.data"=>array('$lte'=>new MongoDate())),
array("isAnsa"=>true,"status"=>NotiziaModel::STATUS_ACCEPTED,"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.lastEdit"=>-1),"limit"=>5));
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>8));
$ansaIds = array();
if (sizeof($ansaNews)>0){
@@ -52,7 +52,7 @@ try {
$cronacaNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_CRONACA,'_id'=>array('$nin'=>$ansaIds),
"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.lastEdit"=>-1),"limit"=>3)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>6)
);
if (sizeof($cronacaNews)>0){
$cronacaNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $cronacaNews);
@@ -79,7 +79,7 @@ try {
$ristorantiNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_RISTORANTI,'_id'=>array('$nin'=>$ansaIds),
"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.lastEdit"=>-1),"limit"=>3)
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>4)
);
if (sizeof($ristorantiNews)>0){
$ristorantiNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $ristorantiNews);
@@ -92,8 +92,8 @@ try {
array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$in'=>$idArray),"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ),'$gte'=>new MongoDB\BSON\UTCDateTime(strtotime('-2 months') * 1000 ))),
array("sort"=>array("about.lastEdit"=>-1))
);
- if (sizeof($lastsNews)<4){
- $missing = 5-sizeof($lastsNews);
+ if (sizeof($lastsNews)<5){
+ $missing = 6-sizeof($lastsNews);
$add = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"_id"=>array('$nin'=>$idArray),"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
array("sort"=>array("about.lastEdit"=>-1),"limit"=>$missing)
@@ -136,16 +136,20 @@ try {
// }
$elezioni = array();
- $lastViaggi = GlobalVariables::get("dao")->getFirst("NotiziaModel",
+ $lastViaggi = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_VIAGGI,'_id'=>array('$nin'=>$ansaIds),
"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.lastEdit"=>-1))
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>2)
);
- if (!is_null($lastViaggi)){
- $lastViaggi->testo = strip_tags($lastViaggi->testo);
- $lastViaggi->sottotitolo = strip_tags($lastViaggi->sottotitolo);
+ if (sizeof($lastViaggi)>0){
+ $lastViaggi = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $lastViaggi);
}
+// if (!is_null($lastViaggi)){
+// $lastViaggi->testo = strip_tags($lastViaggi->testo);
+// $lastViaggi->sottotitolo = strip_tags($lastViaggi->sottotitolo);
+// }
+
$animalNews = GlobalVariables::get("dao")->getFirst("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_ANIMALI,'_id'=>array('$nin'=>$ansaIds),
@@ -157,15 +161,19 @@ try {
$animalNews->sottotitolo = strip_tags($animalNews->sottotitolo);
}
- $saluteNews = GlobalVariables::get("dao")->getFirst("NotiziaModel",
+ $saluteNews = GlobalVariables::get("dao")->query("NotiziaModel",
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>NotiziaModel::CATEGORY_SALUTE,'_id'=>array('$nin'=>$ansaIds),
"about.lastEdit"=>array('$lte'=>new MongoDB\BSON\UTCDateTime( time() * 1000 ))),
- array("sort"=>array("about.lastEdit"=>-1))
+ array("sort"=>array("about.lastEdit"=>-1),"limit"=>2)
);
- if (!is_null($saluteNews)){
- $saluteNews->testo = strip_tags($saluteNews->testo);
- $saluteNews->sottotitolo = strip_tags($saluteNews->sottotitolo);
+ if (sizeof($saluteNews)>0){
+ $saluteNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $saluteNews);
}
+
+// 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!!!!";
@@ -307,6 +315,7 @@ catch (Exception $ex){
+
CULTURA&SPETTACOLO
@@ -358,19 +367,24 @@ catch (Exception $ex){
SALUTE
- 0){
+ $i=0;
// $stringTitle = (strlen($saluteNews->titolo) > 53) ? htmlentities( substr( html_entity_decode( $saluteNews->titolo ) ,0,50) ) .'...' : $saluteNews->titolo;
- $stringTitle = $saluteNews->cutTextHtmlSafe("titolo",50);
+ foreach ($saluteNews as $salute){
+ $i++;
+ $stringTitle = $salute->cutTextHtmlSafe("titolo",50);
?>
-
- getAbsoluteUrl();?>" id="salute_" class="saluteContainer">
+
renderMedia();?>
-
+
+
@@ -445,6 +459,7 @@ catch (Exception $ex){
}?>
+
0){
?>
@@ -475,18 +490,21 @@ catch (Exception $ex){
VIAGGI
- 0){
+ $i=0;
// $stringTitle = (strlen($lastViaggi->titolo) > 53) ? htmlentities( substr( html_entity_decode( $lastViaggi->titolo ) ,0,50) ) .'...' : $lastViaggi->titolo;
- $stringTitle = $lastViaggi->cutTextHtmlSafe("titolo",50);
+ foreach ($lastViaggi as $viaggi){
+ $stringTitle = $viaggi->cutTextHtmlSafe("titolo",50);
?>
-
- getAbsoluteUrl();?>" id="viaggi_"class="animaliContainer">
+
renderMedia();?>
-
+
+
$additionalHea
getType() == MediaModel::TYPE_LOCALVIDEO){
+ ?>
+
+ renderMedia(array("size"=>MediaRenderer::SIZE_BIG,"clickable"=>true));?>
+
+
@@ -374,6 +381,24 @@ function loadImage(pos){
// });
});
+
+ $("img.poster").hide();
+ $("video.localVideo").attr("style","");
+
+// $("video.localVideo").on('canplay',function(event){
+// $("img.poster").hide();
+// $("video.localVideo").attr("style","");
+// });
+
+// $("video").on('loadstart',function (event){
+// alert("asd");
+// $(this).addClass("loading");
+// });
+
+// $("video").on('canplay',function (event){
+// $(this).removeClass("loading");
+// $(this).attr('poster','');
+// });
diff --git a/public/mobile/index.php b/public/mobile/index.php
index cf4d687..8e5d0d5 100644
--- a/public/mobile/index.php
+++ b/public/mobile/index.php
@@ -378,6 +378,10 @@ catch (Exception $ex){
div > div {text-align:center;}
|_| |_|\___|\__,_|_|\__,_|
*/
-.mediaElement.mainElement{background-color:yellow;}
+.mediaElement.mainElement{background-color:yellow;margin:15px;}
.mediaElement{display:inline-block; padding:15px; max-width:160px;}
.mediaElement.selected {opacity:0.4;background-color:orange;}
+.notiziaContainer video.localVideo{max-width:100%;}
+.notiziaContainer .videoContainerForImageAppend img.poster{max-width:100%;max-height:100%;background-color:black;position:absolute;top:0;left:0;z-index:1000;}
+
/*
____ _ _
/ ___|___ _ __ ___ _ __ ___ ___ _ __ | |_(_)
@@ -165,4 +168,19 @@ div.bannerStat > div > div{text-align:center;}
padding: 5px;
text-transform: capitalize;
}
-.sondaggioContainer .rmOption:hover, .sondaggioContainer #addOption:hover{background-color:rgb(204, 217, 255);}
\ No newline at end of file
+.sondaggioContainer .rmOption:hover, .sondaggioContainer #addOption:hover{background-color:rgb(204, 217, 255);}
+
+/**
+ DISABILITAZIONE TASTO DOWNLOAD DAL PLAYER VIDEO
+*/
+
+video::-internal-media-controls-download-button {
+ display:none;
+}
+
+video::-webkit-media-controls-enclosure {
+ overflow:hidden;
+}
+
+video.loading{background:black url(../images/loading.gif) center center no-repeat;}
+
diff --git a/public/style/public.css b/public/style/public.css
index 4773ba4..448faba 100644
--- a/public/style/public.css
+++ b/public/style/public.css
@@ -182,7 +182,7 @@ display: inline-block;
.mediaContent *{max-height:100%;max-width:100%;}
.mediaContent > a{height:100%; width:100%;display:inline-block;}
-.ansaImage{display:inline-block;margin:5px 7px;width:260px; height:133px; overflow:hidden;text-align:center;}
+.ansaImage{display:inline-block;margin:5px 7px;width:260px; max-height:150px;overflow:hidden;text-align:center;}
.ansaNews{margin-top:2px;width:280px;cursor:pointer;display:block;text-decoration:none;color:black;}
.ansaTitolo{font-weight:bold;font-size:15pt;text-align:left;}
.ansaSottotitolo{font-size:12pt;color:#767676;text-align:left;}
@@ -281,6 +281,9 @@ display: inline-block;
.ristorantiBlock .ristorantiLink > a, .culturaNews .culturaLink > a{color:#3498d4;font-size:13px;}
.middleBanner{height:142px; width:190px;}
.middleBanner img{height:100%;width:100%;}
+.middleLongBanner img{height:100%;width:100%;}
+.middleLongBanner{height:284px; width:190px;}
+
.salute,.ristorantiCol{margin-top:10px;text-align:center;}
.saluteTitle, .ristorantiTitle{margin-top:10px;font-size:12px;}