diff --git a/public/js/picture_displayer.js b/public/js/picture_displayer.js index e4b28b2d7b97b5383c432ea295f67c9b50448a61..c43763fdcb5889e6694f12dc5bf8d14b46d942b5 100644 --- a/public/js/picture_displayer.js +++ b/public/js/picture_displayer.js @@ -110,7 +110,7 @@ var displayerMoyReview = { '<div class="actionrow" style="color:'+color+';left:15px;margin-bottom:15px;right:15px;font-size:35px;font-family: abang">'+ tab[1]+ '</div>'+ - '<div class="actionrow" style="color:'+color+';margin-left: 350px;;margin-bottom:15px;right:15px;font-size:35px;font-family: abang">'+ + '<div class="actionrow" style="color:'+color+';margin-left: 45%;margin-bottom:15px;right:15px;font-size:35px;font-family: abang">'+ tab[2]+ '</div>'+ '</div>'+ @@ -166,52 +166,52 @@ var displayerNbCDC = { function affiche_dans_lordre(whereToDisplay, tab, currentID, nbCDC ) { if( nbCDC >= 25 ) - var color = "yellow" - else - { - if( nbCDC >= 10 ) - var color = "blue"; - else - var color = "white"; - } - - var place = parseInt( tab[2] ); - if( place > 1 ) - tab[2] += "eme" - else - tab[2] += "er" - // console.log("decode:" +currentID); - // console.log(currentID); - - requestHandler.retrieveJsonFromUrl('https://images-api.nasa.gov/search?nasa_id='+currentID, function(json) { - var real_im = json.collection.items[0]; - $('#'+whereToDisplay+'row').append('<div class="view container">'+ - '<div class="hover-container" style="margin: 3px">'+ - '<img class="img-fluid" style="margin: 4px" src='+real_im.links[0].href+'>'+ - '<div class="content">'+ - '<div class="text scrollbar">'+ - '<h4>'+real_im.data[0].title+'</h4>'+ - '<p style="font-size: 15px">'+real_im.data[0].description+'</p>'+ - '</div>'+ - '<div class="actionrow" style="left: -120px;margin-bottom:15px;">'+ - '<form method="POST" action="download.php" target="_blank">'+ - '<input type="hidden" name="urlget" value="'+correctionURLLink(real_im.href)+'">'+ - '<input type="hidden" name="nasa_id" value="'+currentID+'">'+ - '<input type="hidden" name="title" value="'+real_im.data[0].title+'">'+ - '<input type="hidden" name="preview" value="'+real_im.links[0].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 class="actionrow" style="color:'+color+';left:15px;margin-bottom:15px;right:15px;font-size:35px;font-family: abang">'+ - tab[1]+ - '</div>'+ - '<div class="actionrow" style="color:'+color+';margin-left: 350px;;margin-bottom:15px;right:15px;font-size:35px;font-family: abang">'+ - tab[2]+ - '</div>'+ - '</div>'+ + var color = "yellow" + else + { + if( nbCDC >= 10 ) + var color = "blue"; + else + var color = "white"; + } + + var place = parseInt( tab[2] ); + if( place > 1 ) + tab[2] += "eme" + else + tab[2] += "er" + // console.log("decode:" +currentID); + // console.log(currentID); + + requestHandler.retrieveJsonFromUrl('https://images-api.nasa.gov/search?nasa_id='+currentID, function(json) { + var real_im = json.collection.items[0]; + $('#'+whereToDisplay+'row').append('<div class="view container">'+ + '<div class="hover-container" style="margin: 3px">'+ + '<img class="img-fluid" style="margin: 4px" src='+real_im.links[0].href+'>'+ + '<div class="content">'+ + '<div class="text scrollbar">'+ + '<h4>'+real_im.data[0].title+'</h4>'+ + '<p style="font-size: 15px">'+real_im.data[0].description+'</p>'+ '</div>'+ - '</div>'); - }); + '<div class="actionrow" style="left: -120px;margin-bottom:15px;">'+ + '<form method="POST" action="download.php" target="_blank">'+ + '<input type="hidden" name="urlget" value="'+correctionURLLink(real_im.href)+'">'+ + '<input type="hidden" name="nasa_id" value="'+currentID+'">'+ + '<input type="hidden" name="title" value="'+real_im.data[0].title+'">'+ + '<input type="hidden" name="preview" value="'+real_im.links[0].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 class="actionrow" style="color:'+color+';left:15px;margin-bottom:15px;right:15px;font-size:35px;font-family: abang">'+ + tab[1]+ + '</div>'+ + '<div class="actionrow" style="color:'+color+';margin-left: 45%;margin-bottom:15px;right:15px;font-size:35px;font-family: abang">'+ + tab[2]+ + '</div>'+ + '</div>'+ + '</div>'+ + '</div>'); + }); }