Merge branch 'master' of git.iiens.net:NASAgile/pimaza

public/image_alea.php

@@ -54,13 +54,13 @@ urlHasArgument();
 	<div class="view container-fluid">
 
 		<div class="hover-container" style="margin: 3px">
-			<img class="img-fluid" src=<?php echo $image->{'links'}[0]->{'href'} ?>>
+			<img class="img-fluid" style="margin: 4px" src=<?php echo $image->{'links'}[0]->{'href'} ?>>
 			<div class="content">
 				<div class="text scrollbar">
 					<h4><?php echo $image->{'data'}[0]->{'title'} ?></h4>
 					<p style="font-size: 15px"><?php echo $image->{'data'}[0]->{'description'} ?></p>
 				</div>
-				<div class="actionrow">
+				<div class="actionrow" style="left: -120px;">
 					<form method="POST" action="download.php" target="_blank">
 						<input type="hidden" name="urlget" value=<?php echo $image->{'href'} ?>>
 						<input type="hidden" name="nasa_id" value=<?php echo $image->{'data'}[0]->{'nasa_id'} ?>>
@@ -73,6 +73,10 @@ urlHasArgument();
 		</div>
 	</div>
 
+	<div class="view container-fluid">
+		<a href="image_alea.php"><button class="btn btn-primary">Nouvelle Image</button></a>
+	</div>
+
 
 	<?php generateFooter(); ?>
 </body>

public/index.php

@@ -61,8 +61,8 @@ urlHasArgument();
             ?>
         </div>
 
-        <div class="hover-container" style="width:70%">
-            <img style="box-shadow: 2px 3px 4px rgba(0, 0, 0, .5);" class="img-fluid" src=<?php echo $imageDataArray->{'hdurl'} ?>>
+        <div class="hover-container" style="margin: 3px;">
+            <img style="margin: 4px;" class="img-fluid" src=<?php echo $imageDataArray->{'hdurl'} ?>>
             
             <div class="content">
                 <div class="text" style="font-size:large;">

public/js/ajax.js

@@ -16,12 +16,12 @@ function ajaxRemoveCDC(userP, photoP) {
 
 
 function ajaxNewReview(userP, photoP, noteP) {
-	console.log("reviewAjout");
+	console.log("reviewAjout "+noteP);
 	$.post("ReviewSubmitAction.php", {user: userP, photo: photoP, note: noteP, action: "new"})
 }
 
 function ajaxRemoveReview(userP, photoP) {
 	console.log("reviewRetrait");
-	$.post("ReviewSubmitAction.php", {user: userP, photo: photoP, action: "remove"})
+	$.post("ReviewSubmitAction.php", {user: userP, photo: photoP, note: "0", action: "remove"})
 }
 

public/utils/content.php

@@ -30,9 +30,7 @@ function generateHeader($titre) {
 
 function generateUserBanner() {
 	if (!isset($_SESSION["id_user"])) {//si l'utilisateur n'est pas connecté
-		echo '<div class="UserBanner" style="font-family:Abang;font-size:20px;text-align:center;margin-bottom:0px;background-color: #F3282A">
-				Vous n\'etes pas connecte
-			</div>';
+		
 	}
 	else {
 		$dbName = getenv('DB_NAME');
@@ -45,15 +43,10 @@ function generateUserBanner() {
 
 		$user_actuel = $userRepository->fetchId($_SESSION["id_user"]);
 
-		$nom = $user_actuel->getNom();
-		$prenom = $user_actuel->getPrenom();
-		$pseudo = $user_actuel->getPseudo();
 
 
-		echo "<div class=\"UserBanner\" style=\"font-size:20px;margin-bottom:0px;font-family:Abang;background-color: #554B9B\">
-				Vous etes connectes en tant que : $nom '$pseudo' $prenom
-			</div>
-			<div id=\"userInfo\" style=\"display: none;\">".$user_actuel->getId()."</div>";	
+		echo 
+			"<div id=\"userInfo\" style=\"display: none;\">".$user_actuel->getId()."</div>";	
 	}
 }