From d3490cbe2b9ac0d5b9b02af0b3bff2dccbc630eb Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Thu, 16 Feb 2017 17:03:28 +0100 Subject: [PATCH 01/10] aggiunto metodo di render per i video locali --- .../lib/media/mediaRenderers/MediaLocalVideo.php | 14 +++++++++++++- public/style/public.css | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/private/lib/media/mediaRenderers/MediaLocalVideo.php b/private/lib/media/mediaRenderers/MediaLocalVideo.php index e3185aa..a20f1f1 100644 --- a/private/lib/media/mediaRenderers/MediaLocalVideo.php +++ b/private/lib/media/mediaRenderers/MediaLocalVideo.php @@ -8,11 +8,23 @@ class MediaLocalVideo extends MediaRenderer{ } public function asText(array $opt = array()){ - return $this->id; + $size = MediaRendererInterface::SIZE_ORIGINAL; + if(array_key_exists("size", $opt) && array_key_exists($opt["size"], self::$SIZES)){ + $size = $opt["size"]; + } + + return ''; } public function render(array $opt = array()){ echo $this->asText($opt); } + + public function getPath(){ + $basepath = GlobalVariables::get("config")->paths->media; + return $basepath."/".$this->id.".".$this->extension; + } } ?> \ No newline at end of file diff --git a/public/style/public.css b/public/style/public.css index 4e7f899..73999f5 100644 --- a/public/style/public.css +++ b/public/style/public.css @@ -6,6 +6,7 @@ font-weight: normal; src: local('Bebas Neue'), url('BebasNeue.woff') format('woff'); } + a{text-decoration:none;} body{font-family:lato, arial;} @@ -609,4 +610,15 @@ Password Recovery color:white; text-decoration:none; cursor:pointer; +} +/** + DISABILITAZIONE TASTO DOWNLOAD DAL PLAYER VIDEO +*/ + +video::-internal-media-controls-download-button { + display:none; +} + +video::-webkit-media-controls-enclosure { + overflow:hidden; } \ No newline at end of file From c78a9288b4cfd61a8fcbe64aa25e6e00dd386164 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Thu, 16 Feb 2017 17:25:51 +0100 Subject: [PATCH 02/10] aggiunta opzione cancellazione sondaggi --- public/admin/homeNotizie.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/public/admin/homeNotizie.php b/public/admin/homeNotizie.php index 0123fe6..effd9ef 100644 --- a/public/admin/homeNotizie.php +++ b/public/admin/homeNotizie.php @@ -38,6 +38,7 @@ try{ } if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_EDITORE_SUPERVISOR)){ + $postAnsa = PostHandler::get("ansa"); if(!is_null($postAnsa)){ if(strcmp($postAnsa, "true")==0){ @@ -50,6 +51,12 @@ try{ GlobalVariables::get("dao")->save($notizia); } $ansa = $notizia->isAnsa; + + $delSondaggio = PostHandler::get("deleteSondaggio"); + if(!is_null($delSondaggio) && strcmp($delSondaggio, "true")){ + $notizia->sondaggio = null; + GlobalVariables::get("dao")->save($notizia); + } } } @@ -171,6 +178,7 @@ try{ sondaggio->votanti)==0){ if($notizia->hasProperty("sondaggio") && !is_null($notizia->sondaggio)){?>
  • Modifica Sondaggio
    • +
  • Cancella Sondaggio
  • Crea Sondaggio
    • +
    hasProperty("sondaggio") && !is_null($notizia->sondaggio)){?> @@ -208,6 +217,13 @@ try{ $("form#notiziaForm").submit(); }); + $("#notiziaMenu_deleteSondaggi").click(function(event){ + $("form#notiziaForm").attr("action","homeSondaggi.php"); + + $("form#notiziaForm input[type=hidden][name=deleteSondaggio]").val("true"); + $("form#notiziaForm").submit(); + }); + $("#notiziaMenu_ansa").click(function(event){ $("form#notiziaForm").attr("action","homeNotizie.php"); From a62e0102add28864f64ebc419e2b33214d4d4096 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Thu, 16 Feb 2017 21:50:53 +0100 Subject: [PATCH 03/10] aggiunto supporto per local video --- private/common/config.local.php | 2 +- .../media/mediaRenderers/MediaLocalVideo.php | 20 ++++++++++++++-- public/admin/addMultimedia.php | 16 ++++++------- public/admin/homeNotizie.php | 5 ++-- public/getLocalVideo.php | 23 +++++++++++++++++++ 5 files changed, 53 insertions(+), 13 deletions(-) create mode 100644 public/getLocalVideo.php diff --git a/private/common/config.local.php b/private/common/config.local.php index 75406c5..58e1f71 100644 --- a/private/common/config.local.php +++ b/private/common/config.local.php @@ -29,7 +29,7 @@ $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://10.0.0.249/fdn2/"; +$currentSystem->remoteLocationPath = "http://localhost/fdn2/"; $backupSystem = new stdClass(); $backupSystem->account = "40a911e14db8ad6faf0a0e7385e7c267"; diff --git a/private/lib/media/mediaRenderers/MediaLocalVideo.php b/private/lib/media/mediaRenderers/MediaLocalVideo.php index a20f1f1..9b1e94b 100644 --- a/private/lib/media/mediaRenderers/MediaLocalVideo.php +++ b/private/lib/media/mediaRenderers/MediaLocalVideo.php @@ -13,8 +13,9 @@ class MediaLocalVideo extends MediaRenderer{ $size = $opt["size"]; } - return '