diff --git a/private/lib/dao/mediaModels/MediaModel.php b/private/lib/dao/mediaModels/MediaModel.php index d976af4..cc3446a 100644 --- a/private/lib/dao/mediaModels/MediaModel.php +++ b/private/lib/dao/mediaModels/MediaModel.php @@ -59,13 +59,13 @@ class MediaModel extends Model implements MediaInterface{ } } - public function asText(){ - return $this->mediaRenderer->asText(); + public function asText(array $opts = array()){ + return $this->mediaRenderer->asText($opts); } - public function renderMedia(){ + public function renderMedia(array $opts = array()){ // var_dump($this->mediaRenderer); - $this->mediaRenderer->render(); + $this->mediaRenderer->render($opts); } public function getType(){ diff --git a/private/lib/gui/FDN2Components.php b/private/lib/gui/FDN2Components.php index cbd9827..9b66701 100644 --- a/private/lib/gui/FDN2Components.php +++ b/private/lib/gui/FDN2Components.php @@ -15,7 +15,7 @@ class NotiziaBlock { $mainMedia = DaoMediaHandler::getMainMediaFromModel($this->notizia); $mediaText = ""; if (!is_null($mainMedia)){ - $mediaText = $mainMedia->asText(); + $mediaText = $mainMedia->asText(array("clickable"=>true)); } $rval = '
';
+ }
+ else {
+ return '
';
+ }
+
+// return GlobalVariables::get("config")->paths->media."/".$this->id.".pdf";
}
public function render(array $opt = array()){
diff --git a/private/lib/media/mediaRenderers/MediaRenderer.php b/private/lib/media/mediaRenderers/MediaRenderer.php
new file mode 100644
index 0000000..897fe5a
--- /dev/null
+++ b/private/lib/media/mediaRenderers/MediaRenderer.php
@@ -0,0 +1,16 @@
+ array("width"=>MediaRendererInterface::SIZE_SMALL_W,"height"=>MediaRendererInterface::SIZE_SMALL_H),
+ MediaRendererInterface::SIZE_MEDIUM => array("width"=>MediaRendererInterface::SIZE_MEDIUM_W,"height"=>MediaRendererInterface::SIZE_MEDIUM_H),
+ MediaRendererInterface::SIZE_BIG => array("width"=>MediaRendererInterface::SIZE_BIG_W,"height"=>MediaRendererInterface::SIZE_BIG_H),
+ MediaRendererInterface::SIZE_ORIGINAL => array("width"=>MediaRendererInterface::SIZE_ORIGINAL_W,"height"=>MediaRendererInterface::SIZE_ORIGINAL_H)
+ );
+}
+
+?>
\ No newline at end of file
diff --git a/private/lib/media/mediaRenderers/MediaYoutube.php b/private/lib/media/mediaRenderers/MediaYoutube.php
index 4434e99..1343afd 100644
--- a/private/lib/media/mediaRenderers/MediaYoutube.php
+++ b/private/lib/media/mediaRenderers/MediaYoutube.php
@@ -1,6 +1,6 @@
Tipo