diff --git a/public/image_alea.php b/public/image_alea.php index a60cc1235db68dcaba946894e2c73de45489306c..71472ff61ef3a44b45a5966aee069d5979dff2f7 100644 --- a/public/image_alea.php +++ b/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> diff --git a/public/index.php b/public/index.php index 03ddd45408f0ff39d6d889fc2dabb9443e75098a..0f9fc4240668ecf7e71a50a7739e29b8cd947e3e 100644 --- a/public/index.php +++ b/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;"> diff --git a/public/js/ajax.js b/public/js/ajax.js index 2b696270009c99022a4057dc35f3f4693084c0ed..3d3e6061b8817d44eb25e6556c6e8ea0149a397f 100644 --- a/public/js/ajax.js +++ b/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"}) } diff --git a/public/utils/content.php b/public/utils/content.php index fd3bb3874b12bfc483ef5c948993119a72996246..268b1e73b277a4989ce7d2fc051c9ff4bb8f255a 100644 --- a/public/utils/content.php +++ b/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>"; } }