From 0118c3ac14d0e554e390800b669e9f21f1b1f6c1 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Thu, 24 Mar 2016 18:54:12 +0100 Subject: [PATCH] implementazione photoswipe; modifica path immagini all'interno di default-skin.css; la funzione clickable dalle immagini non fa nulla; --- .../lib/media/mediaRenderers/MediaImage.php | 2 +- public/articolo.php | 145 +++++++++++++++--- public/js/functions.js | 2 +- public/style/default-skin.css | 4 +- public/style/public.css | 2 +- 5 files changed, 127 insertions(+), 28 deletions(-) diff --git a/private/lib/media/mediaRenderers/MediaImage.php b/private/lib/media/mediaRenderers/MediaImage.php index 31cf8ee..5df7170 100644 --- a/private/lib/media/mediaRenderers/MediaImage.php +++ b/private/lib/media/mediaRenderers/MediaImage.php @@ -17,7 +17,7 @@ class MediaImage extends MediaRenderer{ if (array_key_exists("clickable", $opt)){ $clickable = $opt["clickable"]; if($clickable){ - $click='onclick="javascript:previewImage(\''.GUIHandler::getBaseUrl().'getImage.php?id='.$this->id.'&size='.MediaRendererInterface::SIZE_BIG.'\')"'; +// $click='onclick="javascript:loadFoto(\''.$this->id.'\')"'; } } diff --git a/public/articolo.php b/public/articolo.php index 22a219b..b8331af 100644 --- a/public/articolo.php +++ b/public/articolo.php @@ -107,11 +107,11 @@ try { } GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders)); ?> -
- +
$additionalHeaders));
renderMedia(array("size"=>MediaRenderer::SIZE_BIG,"clickable"=>true)); + ?> +
+ renderMedia(array("size"=>MediaRenderer::SIZE_BIG,"clickable"=>true));?> +
+
@@ -185,14 +189,26 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
Altri contenuti
+
- renderMedia(array("size"=>MediaRenderer::SIZE_MINI,"clickable"=>true));?> -
- ')">renderMedia(array("size"=>MediaRenderer::SIZE_MINI,"clickable"=>true));?>
+
+ +
@@ -261,8 +277,98 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders)); GUIHandler::generateFooter(); ?> + + diff --git a/public/js/functions.js b/public/js/functions.js index 61c0d0c..d8c8e08 100644 --- a/public/js/functions.js +++ b/public/js/functions.js @@ -74,4 +74,4 @@ function hidePreview(){ $('.imageOverlay').css("display","none"); $('.clickableImageContainer').css("display","none"); $('#clickImage').remove(); -} \ No newline at end of file +} diff --git a/public/style/default-skin.css b/public/style/default-skin.css index f99db1b..c8a9d6d 100644 --- a/public/style/default-skin.css +++ b/public/style/default-skin.css @@ -52,7 +52,7 @@ .pswp__button, .pswp__button--arrow--left:before, .pswp__button--arrow--right:before { - background: url(default-skin.png) 0 0 no-repeat; + background: url(../images/default-skin.png) 0 0 no-repeat; background-size: 264px 88px; width: 44px; height: 44px; } @@ -62,7 +62,7 @@ .pswp--svg .pswp__button, .pswp--svg .pswp__button--arrow--left:before, .pswp--svg .pswp__button--arrow--right:before { - background-image: url(default-skin.svg); } + background-image: url(../images/default-skin.svg); } .pswp--svg .pswp__button--arrow--left, .pswp--svg .pswp__button--arrow--right { background: none; } } diff --git a/public/style/public.css b/public/style/public.css index 38cc819..7ce147f 100644 --- a/public/style/public.css +++ b/public/style/public.css @@ -369,7 +369,7 @@ display: inline-block; .carosImage{width:85px;height:100%;display:inline-block;vertical-align:middle;text-align:center;} .carosImage > .helper{height:100%;display:inline-block;vertical-align:middle;} .carosImage > img {vertical-align:middle; cursor:pointer;} - +.carosImage > div {vertical-align:middle; cursor:pointer;} .commentiContainer{padding:5px;} .oldCommentiContainer{margin:5px 0px; padding-left: 30px;}