Merge branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

This commit is contained in:
Riccardo Di Dato
2016-03-05 15:50:25 +01:00
4 changed files with 64 additions and 9 deletions
+53 -7
View File
@@ -21,13 +21,13 @@ try {
$media = DaoMediaHandler::getMainMediaFromModel($articolo);
$medias = DaoMediaHandler::getMedias($articolo);
echo $articolo->titolo;
// echo $articolo->titolo;
var_dump($medias);
$mesi = array(1=>'Gennaio', 'Febbraio', 'Marzo', 'Aprile',
'Maggio', 'Giugno', 'Luglio', 'Agosto',
'Settembre', 'Ottobre', 'Novembre','Dicembre');
$data = date("d",$articolo->about->data->sec)." ".$mesi[date("n",$articolo->data->sec)]." ".date("Y",$articolo->about->data->sec);
$data = date("d",$articolo->about->data->sec)." ".$mesi[date("n",$articolo->about->data->sec)]." ".date("Y",$articolo->about->data->sec);
}catch(GUIException $ex){
$error = $ex->getMessage();
@@ -78,13 +78,31 @@ try {
<?php if(sizeof($medias)>1){?>
<div class="mediasConatiner">
<div class="headMedias">
<div class="moreMedia">Altr media bellissimi</div>
<div class="empty"></div>
<div class="moreMedia"><span>Altri media bellissimi</span></div>
</div>
<div class="caroselContainer">
<div class="caroselArrow left"><img alt="" src="images/leftArrow.png"></div>
<div class="imagesContainer_carosel">
<div id="carosel" class="insideCarosel">
<?php
foreach($medias as $mediaImage){?>
<div class="carosImage mediaContent"><span class="helper"></span><?php $mediaImage->renderMedia(array("size"=>MediaRenderer::SIZE_SMALL));?></div>
<?php }?>
</div>
</div>
<div class="caroselArrow right"><img alt="" src="images/rightArrow.png"></div>
</div>
</div>
<?php }?>
<div class="commentiContainer">
<div>New COMMENTO</div>
<?php if(UserLoginManager::isLogged()){?>
<div class="newCommento">
<form method="POST">
<textarea name="commento"rows="10" cols="10"></textarea>
<input type="hidden" name="user">
</form>
</div>
<?php }?>
<div>TUTTI I COMMENTI</div>
</div>
</div>
@@ -97,4 +115,32 @@ try {
<?php
GUIHandler::generateFooter();
?>
</div>
</div>
<script type="text/javascript">
$(document).ready(function(event){
var size = $("#carosel").children().length;
var childrenWidth = $(".carosImage").outerWidth();
$("#carosel").width((size+1 )* childrenWidth);
var minLeft = (size - 4)*childrenWidth;
var actualLeft = $("#carosel").position().left;
$(".left").click(function(){
if(actualLeft > -minLeft){
$("#carosel").animate({left:"-=" + childrenWidth});
actualLeft = $("#carosel").position().left;
// alert(actualLeft);
}
});
$(".right").click(function(){
if(actualLeft < minLeft){
$("#carosel").animate({left:"+=" + childrenWidth});
actualLeft = $("#carosel").position().left;
// alert(actualLeft);
}
});
});
</script>
Binary file not shown.

After

Width:  |  Height:  |  Size: 947 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 970 B

+11 -2
View File
@@ -260,8 +260,17 @@ body{font-family:lato, arial;}
.articoloTesto{text-align:justify;padding:5px 10px;}
.mediasConatiner{border:solid #d6d6d6 1px;}
.headMedias{height:25px;}
.moreMedia{background-color:#94d3f6;padding:10xp;}
.headMedias{height:25px;overflow:hidden;border-bottom:solid #d6d6d6 1px;}
.moreMedia{background-color:#94d3f6;padding:3px 30px;float:left;}
.caroselContainer{position:relative;height:100px;}
.caroselArrow{height:100px;width:49px;display:inline-block;cursor:pointer;}
.imagesContainer_carosel{position:relative;display:inline-block;height:100%;width:592px;overflow:hidden;}
.insideCarosel{position:absolute;display:inline-block;top:0px;left:0px;height:100%;}
.carosImage{width:148px;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; }
.commentiContainer{}