From 0dcafb2d94883e252f132141776f7e7df915623c Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Fri, 18 Mar 2016 14:19:55 +0100 Subject: [PATCH] Aggiunto size mini per le immagini; fix limit in articolo e searchResults; inizio styling per immagini clickable; inizio funzione immagini clickable --- private/lib/media/MediaRendererInterface.php | 5 ++ .../lib/media/mediaRenderers/MediaImage.php | 7 +++ .../media/mediaRenderers/MediaRenderer.php | 3 +- public/archivio.php | 2 +- public/articolo.php | 59 +------------------ public/searchResults.php | 2 +- public/style/public.css | 23 +++++++- 7 files changed, 40 insertions(+), 61 deletions(-) diff --git a/private/lib/media/MediaRendererInterface.php b/private/lib/media/MediaRendererInterface.php index f1a74b9..11d31ba 100644 --- a/private/lib/media/MediaRendererInterface.php +++ b/private/lib/media/MediaRendererInterface.php @@ -19,6 +19,11 @@ interface MediaRendererInterface{ const SIZE_ORIGINAL_H = null; const SIZE_ORIGINAL_W = null; + const SIZE_MINI = 5; + const SIZE_MINI_W = 80; + const SIZE_MINI_H = 60; + + public function asText(array $opt = array()) ; diff --git a/private/lib/media/mediaRenderers/MediaImage.php b/private/lib/media/mediaRenderers/MediaImage.php index b7f59ce..3c997b9 100644 --- a/private/lib/media/mediaRenderers/MediaImage.php +++ b/private/lib/media/mediaRenderers/MediaImage.php @@ -13,6 +13,13 @@ class MediaImage extends MediaRenderer{ if(array_key_exists("size", $opt) && array_key_exists($opt["size"], self::$SIZES)){ $size = $opt["size"]; } + if (array_key_exists("clickable", $opt)){ + $clickable = $opt["clickable"]; + if($clickable){ + + } + } + return ''; } diff --git a/private/lib/media/mediaRenderers/MediaRenderer.php b/private/lib/media/mediaRenderers/MediaRenderer.php index 897fe5a..24e9963 100644 --- a/private/lib/media/mediaRenderers/MediaRenderer.php +++ b/private/lib/media/mediaRenderers/MediaRenderer.php @@ -9,7 +9,8 @@ abstract class MediaRenderer implements MediaRendererInterface{ MediaRendererInterface::SIZE_SMALL => 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) + MediaRendererInterface::SIZE_ORIGINAL => array("width"=>MediaRendererInterface::SIZE_ORIGINAL_W,"height"=>MediaRendererInterface::SIZE_ORIGINAL_H), + MediaRendererInterface::SIZE_MINI => array("width"=>MediaRendererInterface::SIZE_MINI_W,"height"=>MediaRendererInterface::SIZE_MINI_H) ); } diff --git a/public/archivio.php b/public/archivio.php index c6407ba..327be53 100644 --- a/public/archivio.php +++ b/public/archivio.php @@ -28,7 +28,7 @@ try { $month= $_POST["month"]; $year = $_POST["year"]; - $limit=2; + $limit=10; $page = 1; $numPages = 1; diff --git a/public/articolo.php b/public/articolo.php index 168e871..85c8bff 100644 --- a/public/articolo.php +++ b/public/articolo.php @@ -178,37 +178,9 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
4){ - ?> -
- - - -
-
- -
renderMedia(array("size"=>MediaRenderer::SIZE_SMALL));?>
- -
-
- 4){ - ?> -
- - - + foreach($medias as $mediaImage){?> +
renderMedia(array("size"=>MediaRenderer::SIZE_MINI,"clickable"=>true));?>
+
@@ -280,31 +252,6 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));