From 994f566a55fb3e763952b6505d03a3b9b32ceb56 Mon Sep 17 00:00:00 2001
From: Lorenzo Giacomelli <l.giacomelli@asdynamics.it>
Date: Thu, 17 Mar 2016 12:46:52 +0100
Subject: [PATCH] fix

---
 public/articolo.php     | 46 +++++++++++++++++++++--------------------
 public/style/public.css | 21 ++++++++++++++-----
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/public/articolo.php b/public/articolo.php
index d4a9279..8412f8b 100644
--- a/public/articolo.php
+++ b/public/articolo.php
@@ -190,40 +190,42 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
 					</div>
 			<?php }?>
 			<div class="commentiContainer">
-				<div id="sentMessage"></div>
-			<?php if(UserLoginManager::isLogged()){?>
-					<div id="commentoArea" class="newCommento">
-						<form method="POST" id="commentoForm">
-							<div>Titolo commento:</div>
-							<textarea name="titolo" rows="2" cols="30"></textarea>
-							<div>Commento:</div>
-							<textarea name="commento"rows="5" cols="80"></textarea>
-							<input type="hidden" name="id" value="<?php echo $articolo->id;?>" />
-							<input type="submit" name="sendCommento" value="Send" />
-						</form>
-					</div>
-			<?php }
-				  else{
-			?>
-					<div class="noLogin">Effettua il <a href="#loginLink">login</a> per commentare o se non hai ancora un account <a href="#regButton">registrati</a></div>
-			<?php }
-				  
-				  if(sizeof($commenti)>0){
+			<?php if(sizeof($commenti)>0){
 			?>
 				  	<div class="oldCommentiContainer">
 			<?php	foreach ($commenti as $oldCommento){
 						$utonto = GlobalVariables::get("dao")->getFirst("UserModel",array("_id"=>$oldCommento->user));
 			?>
 						<div class="commento">
-							<div><?php echo $utonto->username;?></div>
-							<div><?php echo $oldCommento->titolo;?></div>
-							<div><?php echo $oldCommento->testo;?></div>
+							<div class="commentoTitle"><?php echo $oldCommento->titolo;?></div>
+							<div class="commentoTesto"><?php echo $oldCommento->testo;?></div>
+							<div class="userInfo">	
+								<div class="userCommento"><span ><?php echo $utonto->nome." ".$utonto->cognome;?></span></div>
+								<div class="dataCommento"><?php echo date("d/m/Y",$oldCommento->date->sec)?></div>
+							</div>
 						</div>
 			<?php 	}
 			?>
 					</div>
 			<?php 
 				  }
+				  if(UserLoginManager::isLogged()){?>
+  					<div id="commentoArea" class="newCommento">
+  						<form method="POST" id="commentoForm">
+  							<div class="newTitle">Titolo commento:</div>
+  							<textarea name="titolo" rows="2" cols="30"></textarea>
+  							<div>Commento:</div>
+  							<textarea name="commento"rows="5" cols="80"></textarea>
+  							<input type="hidden" name="id" value="<?php echo $articolo->id;?>" />
+  							<input type="submit" name="sendCommento" value="Send" />
+  						</form>
+  					</div>
+  			<?php }
+  				  else{
+  			?>
+  					<div class="noLogin">Effettua il <a href="#loginLink">login</a> per commentare o se non hai ancora un account <a href="#regButton">registrati</a></div>
+  			<?php }
+  				  
 			?>
 			</div>
 		</div>
diff --git a/public/style/public.css b/public/style/public.css
index e063f23..7e202f0 100644
--- a/public/style/public.css
+++ b/public/style/public.css
@@ -9,9 +9,9 @@ body{font-family:lato, arial;}
 .loginReg{position:absolute;right:0;top:7px;margin-right:210px;color:#3397d3}
 .loginReg > a{text-decoration:none;color:#3397d3;}
 
-.socialBar{position:absolute;right:50px;top:3px;}
+.socialBar{position:absolute;right:50px;top:5px;}
 .socialBar > a{margin-right:3px;display:inline-block;}
-.socialBar > a > div{display:inline-block;width:22px;height:22px;}
+.socialBar > a > div{display:inline-block;width:22px;height:22px;background-repeat:no-repeat;}
 
 .middleBar{position:relative;height:138px;border:solid #d6d6d6 1px;border-top:0px;border-left:0px;border-right:0px;}
 .leftBanner{position:absolute;top:45px;left:10px;}
@@ -349,10 +349,21 @@ display: inline-block;
 .carosImage > .helper{height:100%;display:inline-block;vertical-align:middle;}
 .carosImage > img {vertical-align:middle; }
 
+.commentiContainer{padding:5px;}
+.oldCommentiContainer{border-radius:10px;margin:5px 0px;}
+.commento{border:solid #ddd 1px;border-radius:10px;padding:5px;}
+.userCommento{/* display:inline-block; */}
+.userCommento span {color:#5847c1;}
+.userInfo{text-align:right;padding:5px;}
+.dataCommento{font-size:14px;}
+.commentoTitle{font-weight:bold;}
+.commentoTesto{padding:2px 5px;}
 
-.commentiContainer{}
-
-
+.newCommento{padding:10px 5px;}
+.newCommento div{padding:5px 0px;}
+.newCommento textarea{}
+.newCommento input{padding:5px 10px;}
+.newTitle{/* display:inline-block;vertical-align:top; */}
 .articoloRightBar{vertical-align:top;}