From 26584f1b6457b3d7ceef3051a36dceca883a7da6 Mon Sep 17 00:00:00 2001
From: gauthier2018 <louis.gauthier@ensiie.fr>
Date: Sat, 7 Dec 2019 17:13:51 +0100
Subject: [PATCH] Ajout telechargement espace perso
---
public/image_alea.php | 1 +
public/js/picture_displayer.js | 28 +++++++++++++++++++++++-----
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/public/image_alea.php b/public/image_alea.php
index 71472ff..c01339f 100644
--- a/public/image_alea.php
+++ b/public/image_alea.php
@@ -49,6 +49,7 @@ urlHasArgument();
$resJSON = retrieveJsonFromUrl($url_alea);
$image = $resJSON->{'collection'}->{'items'}[random_int(0, 99)];
+
// var_dump($image);
?>
<div class="view container-fluid">
diff --git a/public/js/picture_displayer.js b/public/js/picture_displayer.js
index 8ea1a15..5c7158d 100644
--- a/public/js/picture_displayer.js
+++ b/public/js/picture_displayer.js
@@ -13,15 +13,33 @@ var displayer = {
startdisplay: function(idToDat, whereToDisplay) {
var liste = $('#'+idToDat+" li");
-
$('#'+whereToDisplay).html('<div id="'+whereToDisplay+'row" class="row"></div>');
liste.each(function() {
- console.log("__");
- console.log($(this).text());
+ // console.log("__");
+ // console.log($(this).text());
var currentID = intListToString($(this).text());
- console.log(currentID);
+ // console.log(currentID);
requestHandler.retrieveJsonFromUrl('https://images-api.nasa.gov/asset/'+currentID, function(json) {
- $('#'+whereToDisplay+'row').append('<div class="col"><img width=300 src="'+json.collection.items[2].href+'"><p>pas de description</p></div>');
+ console.log(json);
+ $('#'+whereToDisplay+'row').append('<div class="col"><div class="view container-fluid"><div class="hover-container" style="margin: 3px">'+
+ '<img class="img-fluid" style="margin: 4px" src='+json.collection.items[2].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" style="left: -120px;">'+
+ '<form method="POST" action="download.php" target="_blank">'+
+ '<input type="hidden" name="urlget" value="'+correctionURLLink(json.collection.items[5].href)+'">'+
+ '<input type="hidden" name="nasa_id" value="'+currentID+'">'+
+ '<input type="hidden" name="title" value="img-nasa">'+
+ '<input type="hidden" name="preview" value='+json.collection.items[2].href+'>'+
+ '<input type="image" name="submit" alt="Submit" class="download" width="13%" src="./ressources/icons/dwnld.png" onmouseover="this.src=\'./ressources/icons/dwnldVert.png\'" onmouseout="this.src=\'./ressources/icons/dwnld.png\'">'+
+ '</form>'+
+ '</div>'+
+ '</div>'+
+ '</div>'+
+ '</div></div>');
});
});
}
--
GitLab