From 50854054c0e668bb6bc0dd6219df605e9e807f3c Mon Sep 17 00:00:00 2001
From: gauthier2018 <louis.gauthier@ensiie.fr>
Date: Sat, 7 Dec 2019 17:16:40 +0100
Subject: [PATCH] commit
---
public/bibliotheque.php | 3 +-
public/css/customCss.css | 6 +++
public/image_alea.php | 38 +++++++++-----
public/js/connexion.js | 7 ++-
public/js/picture_browser.js | 35 +++++++++++--
public/js/picture_displayer.js | 59 ++++++++++++++++++++++
public/leaderboard.php | 6 +--
public/ressources/icons/croix_blanche.png | Bin 0 -> 3370 bytes
public/ressources/icons/croix_rouge.png | Bin 0 -> 3372 bytes
public/utils/content.php | 4 +-
10 files changed, 132 insertions(+), 26 deletions(-)
create mode 100644 public/ressources/icons/croix_blanche.png
create mode 100644 public/ressources/icons/croix_rouge.png
diff --git a/public/bibliotheque.php b/public/bibliotheque.php
index 32f0441..8b373c2 100644
--- a/public/bibliotheque.php
+++ b/public/bibliotheque.php
@@ -42,8 +42,7 @@ urlHasArgument();
<html>
-<?php generateHeader('Bibliothèque');
- generateUserBanner();?>
+<?php generateHeader('Bibliothèque');?>
<body onload="startviewer()">
<!-- génération des bannières -->
<?php
diff --git a/public/css/customCss.css b/public/css/customCss.css
index 933cac8..ffdd235 100644
--- a/public/css/customCss.css
+++ b/public/css/customCss.css
@@ -115,6 +115,12 @@
color: yellow;
}
+.etoile_remove {
+ width: 1vw;
+ height: 1vw;
+ margin-bottom: 0.75vw;
+ margin-right: 0.5vw;
+}
@keyframes appearcontent {
diff --git a/public/image_alea.php b/public/image_alea.php
index c01339f..be33faf 100644
--- a/public/image_alea.php
+++ b/public/image_alea.php
@@ -30,6 +30,13 @@ urlHasArgument();
?>
+<?php
+ $url_alea = 'https://images-api.nasa.gov/search?year_start=2007&page='.random_int(0,99);
+ $resJSON = retrieveJsonFromUrl($url_alea);
+
+ $image = $resJSON->{'collection'}->{'items'}[random_int(0, 99)];
+ // var_dump($image);
+ ?>
<html>
@@ -37,37 +44,40 @@ urlHasArgument();
generateHeader('Image Alea');
generateUserbanner();
?>
-<body style="background-image:url('./ressources/background/test2.jpeg'); text-align: center">
+<body style="background-image:url('./ressources/background/test2.jpeg'); text-align: center" onload="initiateCDC(<?php echo "'".$_SESSION['id_user']."'"; ?>, <?php echo "'".$image->{'data'}[0]->{'nasa_id'}."'"; ?>)">
<!-- génération des bonnières -->
<?php
generateNavBar('image_alea');
?>
<h1 class="titre" style="text-align: center"> Image Aleatoire de la bibliotheque : </h1>
- <?php
- $url_alea = 'https://images-api.nasa.gov/search?year_start=2007&page='.random_int(0,99);
- $resJSON = retrieveJsonFromUrl($url_alea);
-
- $image = $resJSON->{'collection'}->{'items'}[random_int(0, 99)];
-
- // var_dump($image);
- ?>
<div class="view container-fluid">
- <div class="hover-container" style="margin: 3px">
+ <div class="hover-container">
<img class="img-fluid" style="margin: 4px" src=<?php echo $image->{'links'}[0]->{'href'} ?>>
<div class="content">
- <div class="text scrollbar">
+ <div class="text scrollbar" style="height: calc(100% - 80px);">
<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;">
+ <div class="actionrow">
<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'} ?>>
<input type="hidden" name="title" value=<?php echo $image->{'data'}[0]->{'title'} ?>>
<input type="hidden" name="preview" value=<?php echo $image->{'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'">
+ <table style="margin-right:5%"><tbody><tr><td align="left" width="10%">
+ <input type="image" name="submit" alt="Submit" class="download" width="100%" src="./ressources/icons/dwnld.png" onmouseover="this.src='./ressources/icons/dwnldVert.png'" onmouseout="this.src='./ressources/icons/dwnld.png'"></td>
+ <td width="61%"></td>
+ <td width="19%"></td>
+ <td align="right" width="10%">
+ <?php if (isset($_SESSION["id_user"])): ?>
+ <div id="emplacementCDC"></div>
+ <?php endif; ?>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</form>
</div>
</div>
@@ -81,4 +91,4 @@ urlHasArgument();
<?php generateFooter(); ?>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/public/js/connexion.js b/public/js/connexion.js
index 6d0916c..f2f6f37 100644
--- a/public/js/connexion.js
+++ b/public/js/connexion.js
@@ -28,8 +28,13 @@ function fenetreModalFermee(fenetreModal)
console.log("modal = connexion");
}
+
+ document.getElementById('logoPhp').setAttribute('href', 'index.php?modal=' + modal);
document.getElementById('indexPhp').setAttribute('href', 'index.php?modal=' + modal);
document.getElementById('imageRandomPhp').setAttribute('href', 'image_alea.php?modal=' + modal);
document.getElementById('bibliothequePhp').setAttribute('href', 'bibliotheque.php?modal=' + modal);
-};
\ No newline at end of file
+
+
+};
+
diff --git a/public/js/picture_browser.js b/public/js/picture_browser.js
index bcd7742..e972990 100644
--- a/public/js/picture_browser.js
+++ b/public/js/picture_browser.js
@@ -372,6 +372,15 @@ function switchCDCbutton(user, encodedId, ancienEtat) {
}
}
+
+// fonction appelée au chargement de image_alea.php pour démarrer les infos des coups de coeur
+function initiateCDC(user, Id) {
+ console.log("COUCOU");
+ var encodedId = stringToIntList(Id);
+ console.log(encodedId);
+ document.getElementById('emplacementCDC').innerHTML = '<div id="emplacementCDC_'+encodedId+'"><img alt="Coup de coeur" width="105%" style="cursor: pointer;" onclick="switchCDCbutton(' + user + ',\'' + encodedId + '\',\'blanc\')" src="./ressources/icons/coeurBlanc.png"></img></div>';
+}
+
function isInReviewlist(id) {
var liste = $('#' + 'Reviewlist' + " li");
var encoded_id = stringToIntList(id);
@@ -390,6 +399,7 @@ function isInReviewlist(id) {
function updateEtoile(user, encoded_id, nbEtoile, option) {
+ icon_etoile = '<img class="etoile_remove" style="cursor: pointer;" onclick="remove_etoile(\'' + user + '\',\'' + encoded_id + '\')" src="./ressources/icons/croix_blanche.png" onmouseout="this.src=\'./ressources/icons/croix_blanche.png\'" onmouseover="this.src=\'./ressources/icons/croix_rouge.png\'">';
if (nbEtoile >= 5) {
console.log(nbEtoile);
@@ -398,7 +408,8 @@ function updateEtoile(user, encoded_id, nbEtoile, option) {
'<span class="etoile" title="4 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 4, \'update\')">★</span>' +
'<span class="etoile" title="3 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 3, \'update\')">★</span>' +
'<span class="etoile" title="2 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 2, \'update\')">★</span>' +
- '<span class="etoile" title="1 étoile" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 1, \'update\')">★</span>';
+ '<span class="etoile" title="1 étoile" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 1, \'update\')">★</span>' +
+ icon_etoile;
if (option == 'update') {
ajaxRemoveReview(user, encoded_id);
@@ -411,7 +422,8 @@ function updateEtoile(user, encoded_id, nbEtoile, option) {
'<span class="etoile" title="4 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 4, \'update\')">★</span>' +
'<span class="etoile" title="3 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 3, \'update\')">★</span>' +
'<span class="etoile" title="2 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 2, \'update\')">★</span>' +
- '<span class="etoile" title="1 étoile" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 1, \'update\')">★</span>';
+ '<span class="etoile" title="1 étoile" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 1, \'update\')">★</span>' +
+ icon_etoile;
if (option == 'update') {
ajaxRemoveReview(user, encoded_id);
@@ -424,7 +436,8 @@ function updateEtoile(user, encoded_id, nbEtoile, option) {
'<span title="4 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 4, \'update\')">★</span>' +
'<span class="etoile" title="3 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 3, \'update\')">★</span>' +
'<span class="etoile" title="2 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 2, \'update\')">★</span>' +
- '<span class="etoile" title="1 étoile" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 1, \'update\')">★</span>';
+ '<span class="etoile" title="1 étoile" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 1, \'update\')">★</span>' +
+ icon_etoile;
if (option == 'update') {
ajaxRemoveReview(user, encoded_id);
@@ -437,7 +450,8 @@ function updateEtoile(user, encoded_id, nbEtoile, option) {
'<span title="4 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 4, \'update\')">★</span>' +
'<span title="3 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 3, \'update\')">★</span>' +
'<span class="etoile" title="2 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 2, \'update\')">★</span>' +
- '<span class="etoile" title="1 étoile" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 1, \'update\')">★</span>';
+ '<span class="etoile" title="1 étoile" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 1, \'update\')">★</span>' +
+ icon_etoile;
if (option == 'update') {
ajaxRemoveReview(user, encoded_id);
@@ -450,7 +464,8 @@ function updateEtoile(user, encoded_id, nbEtoile, option) {
'<span title="4 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 4, \'update\')">★</span>' +
'<span title="3 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 3, \'update\')">★</span>' +
'<span title="2 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 2, \'update\')">★</span>' +
- '<span class="etoile" title="1 étoile" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 1, \'update\')">★</span>';
+ '<span class="etoile" title="1 étoile" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 1, \'update\')">★</span>' +
+ icon_etoile
if (option == 'update') {
ajaxRemoveReview(user, encoded_id);
@@ -472,3 +487,13 @@ function updateEtoile(user, encoded_id, nbEtoile, option) {
}
}
+function remove_etoile(user, encoded_id) {
+ document.getElementById('emplacementEtoile_' + encoded_id).innerHTML =
+ '<span title="5 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 5, \'update\')">★</span>' +
+ '<span title="4 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 4, \'update\')">★</span>' +
+ '<span title="3 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 3, \'update\')">★</span>' +
+ '<span title="2 étoiles" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 2, \'update\')">★</span>' +
+ '<span title="1 étoile" onclick="updateEtoile(\'' + user + '\',\'' + encoded_id + '\', 1, \'update\')">★</span>';
+ ajaxRemoveReview(user, encoded_id);
+}
+
diff --git a/public/js/picture_displayer.js b/public/js/picture_displayer.js
index 5c7158d..680b6da 100644
--- a/public/js/picture_displayer.js
+++ b/public/js/picture_displayer.js
@@ -50,6 +50,54 @@ var displayer = {
+var displayerMoyReview = {
+
+ startdisplay: function(idToDat, whereToDisplay) {
+ var liste = $('#'+idToDat+" li");
+
+ $('#'+whereToDisplay).html('<div id="'+whereToDisplay+'row" class="row"></div>');
+ liste.each(function() {
+ var currentID = intListToString(this. getElementsByClassName('idPhoto')[0].innerHTML);
+ var moyenne = this.getElementsByClassName('moyenne')[0].innerHTML;
+ console.log("id : "+currentID+" ; moyenne : "+moyenne);
+ 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>Cette photo à été notée avec une moyenne de '+displayerMoyReview.troncate(moyenne)+' étoiles</p></div>')
+ });
+ });
+
+ },
+
+ troncate: function(moy) {
+ var length = 3;
+ return moy.substring(0, length)
+ }
+}
+
+
+
+
+
+var displayerNbCDC = {
+
+ startdisplay: function(idToDat, whereToDisplay) {
+ var liste = $('#'+idToDat+" li");
+
+ $('#'+whereToDisplay).html('<div id="'+whereToDisplay+'row" class="row"></div>');
+ liste.each(function() {
+ console.log("coucou");
+ var currentID = intListToString(this.getElementsByClassName('idPhoto')[0].innerHTML);
+ var nbCDC = this.getElementsByClassName('nbCDC')[0].innerHTML;
+ console.log("id : "+currentID+" ; nbCDC : "+nbCDC);
+ 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>Cette photo a '+nbCDC+' coups de coeur</p></div>');
+ });
+ });
+
+ }
+}
+
+
+
@@ -105,4 +153,15 @@ var requestHandler = {
function startDisplayer(IDsource, IDdestination) {
console.log("démarrage");
displayer.startdisplay(IDsource, IDdestination);
+}
+
+
+function startDisplayerNbCDC(IDsource, IDdestination) {
+ console.log("démarrage displayer CDC");
+ displayerNbCDC.startdisplay(IDsource, IDdestination);
+}
+
+function startDisplayerMoyReview(IDsource, IDdestination) {
+ console.log("démarrage du displayer Moyenne des reviews");
+ displayerMoyReview.startdisplay(IDsource, IDdestination);
}
\ No newline at end of file
diff --git a/public/leaderboard.php b/public/leaderboard.php
index b7164c0..04127bc 100644
--- a/public/leaderboard.php
+++ b/public/leaderboard.php
@@ -45,7 +45,7 @@ urlHasArgument();
<!DOCTYPE html>
<html>
<?php generateHeader('leaderboard'); ?>
-<body onload="startDisplayer('NoteLeaderboard', 'NoteLeaderboardDisplayArea'); startDisplayer('CDCLeaderboard', 'CDCLeaderboardDisplayArea')" style="text-align: center;
+<body onload="startDisplayerMoyReview('NoteLeaderboard', 'NoteLeaderboardDisplayArea'); startDisplayerNbCDC('CDCLeaderboard', 'CDCLeaderboardDisplayArea')" style="text-align: center;
background-image:url('./ressources/background/test2.jpeg');
background-repeat: no-repeat;
background-attachment: fixed;">
@@ -59,7 +59,7 @@ urlHasArgument();
$test = $orderRepository->fetchAvgNoteOrder();
foreach ($test as $elem): ?>
- <li><?php echo $elem->getIdPhoto(); ?></li>
+ <li><div class="idPhoto"><?php echo $elem->getIdPhoto(); ?></div><div class="moyenne"><?php echo $elem->getNote(); ?></div></li>
<?php endforeach; ?>
</div>
@@ -68,7 +68,7 @@ urlHasArgument();
$test = $orderRepository->fetchCDCOrder();
foreach ($test as $elem): ?>
- <li><?php echo $elem->getIdPhoto(); ?></li>
+ <li><div class="idPhoto"><?php echo $elem->getIdPhoto(); ?></div><div class="nbCDC"><?php echo $elem->getNbCDC(); ?></div></li>
<?php endforeach; ?>
</div>
diff --git a/public/ressources/icons/croix_blanche.png b/public/ressources/icons/croix_blanche.png
new file mode 100644
index 0000000000000000000000000000000000000000..a44f249214649c707f9c24750d64d278bbd2c0c5
GIT binary patch
literal 3370
zcmeAS@N?(olHy`uVBq!ia0y~yVC-RFVC>~!V_;xlN_BhBz`($k<n8Xl00uvuch@s8
zFmM)lL>4nJa0`PlBg3pY5)2Fs>?NMQuI!I_*!fiyH~m}ik%56{yQhm|NX4zUcLVdH
z-Feyq|3*#zzMtu>XKg3r@s$rZ>fE(fInT%>;t{_}@#n$bhcS9!OW=fm(cjP92mUfJ
z$W8uUzvFJ+_uFsF{_nrfTwuTNN5A}+8{fYl|Mx>WKR^HHpZ5$q<c*s@K27dsdr-%5
z>=O!ohWA*%e6$I}_vAPOxw@Q-3>ypVpRqi?-mfdAAokAve}c{1jjqf`4*h*0-Lu?&
zTSh~~4*9=LA2%Hr;}zikzS!R&?%$0?j7f%n>y9LMvvsuoHdK^o2dnehEB_HB^{}pl
z@7PPQd6(b0+dzzvZQgh{xtnc=d@x*SZqvrUV4=J3;i{Sf-)(edzSF<%yRuxgiG$9a
z{!<4v{@+-{_|AR%Z$Yq`@7#|jY^lz<$nbsf>AxLNX9XGD0=eOLAlzAjiV~0IqD>C`
zT~THK2;!p~mJ*NU!9rzlAwvnUA`OHhO{hp6T#X_`B%=r>VqpvwftzEY3>AT!V_^gp
zftzEY1QC&dn^Tc$01h6W-LQ~bbEm%o5+`BMaM}P>-82>I|222|Uq5QDe&b}f=jz|0
zKlg9*C0%@6_ovu;ot@l8hK&hFy$s&X-{<3K;-E9@SHWxfU&cJl7t$I2%w$VCczFAv
z?N_B(1i0t@%H7K5WO5)^qE7lxhCnl8(nB?!yDauK7aA(;j~vpixXCYXqOpiE@4x}+
z2l@d<28$Z+ZvTC{Kd*qNFC*dk+dqm24ICCVMi?YqPo5ya`(}r%y_E#pDF;O{lY4I^
zbX=INbC;jzYGX7`=wRh7w`AkJc!2Nr!_Cc!4|rsf92ej1J?Lz*VRKp8^aKe9=8lL9
z3E{~Cg1m25$lleJV7ug?Bqnn2tb~t?v(B3(bMKf+uw7|T5)-*|R3Zc<v_STbtpwY(
z14-XCwp1JL=xB>bc)p6|FoSf$8!6T@T{g*!0^DyRwkAkqF!$a~dVII*pqt4NChJgB
z3AQ^8$<uEXOi#KX$h+|XUnqZDqxpv$vb#55e0Su5vQ$#z+?PT;+zE^uw98x#bedcb
z^aZ54Cn;_aNNT+MLV~9|(Qt!snUjG|2kSw-8>|O6Xmqs6F8ITD<WNH58N0N4Cj*_n
zqk`OL_9R3oaJNL7zivvLD8Or+cg&k_LF*x>nYm}a?MR5w=~fk+k$G@Kf|!qvPkW>o
zPj_3!j6`D{2{AtI^s=*g^A~QZh_Es4o+--1oxylkD=pMOXOXMP;u(PlH%#b>_Sl?h
z#(Fp@$?)uwnIb&gU96_vX@wp-YV3y>MTHo5NQ&@qXD6POOY=9-(X$o1erBfSK>=Q!
z4Uxv#O^Q+xDaL8X*p53H=xk{<i|%Mmh{);QdogLYrm?ETqDEG8?=(+?4KKv*^2}7+
zD8R#=|L`ndlA?szd|9#kXJ$wq6yRk)z-XYI=4w#DA;V;x<aWf#K!%0Sf+Ov44hI`w
z^Wg-wGb~LH9V`U)+Y6)})Zt*`YjsX!JHybVDD~%GLPhmP0Unpb4?jG+Cv#AMx31n{
z&(;VIwnYyo)Kq)y*$84D+|GXVc2_I&b7cYEeYQIHLUaUpE<U);T>NobQe#2~n|AxN
zN4!Uw4hry2<Llcl%+2C#;s8>@uu*{fpa8Ff4vVu11IQNUBTfbayaL<@9bgI^3|yFx
zfOHCQZxrCkSCmo^Yii7B0NKizq$ttB*1_5Y669#hXoygdSj3prn4lol(Tb#?H9<j2
zK@3d+Yg1!}f*1$eBB&`SiaOXJroa_7Mks)+f-AzI0HF)y76OVG7b%J%G=SX#u?8-9
zQ;>IK!i3fR3=Hv!4_0&6Ol?e15bI!TYK%~j;$TZ^%utZ%U|j?fOj4ABv#}}w3pOA$
zfcfaAbhKq~uq81rYE0;0#jXHkcLRzdMKN?!6r`FOBd{oHi-6j%h@?PK0&Er76o`T(
z#zl%!O^RY58YJ14pdbb{Qb7XYI7P9B434%4hDC}JcIg`#E(-7*VRCUc5a4b<e!G*c
zNl{Ekc22js2rrAXPK2e2c)q3-M_a^(s)Ri&GZZ9}4t`4fxNXtH13x*AG(By8)awe?
zneuZ&MK;K!LyVDj3io16SeQ2!SnS!m-QD0w({p(q;{-Mq=JrDi4Y<=74+?OzKl;gj
z$Y%!U!2^i}5@*_OIvB{XupjJEkZO7;Q1D0*oa2rhVk}@d(=)S>XX6jC`)?Gani3!C
z{^{h-Z#y#~p@UWIuFg!=g9n<T3yfPcINFYGyOG9yQGka#ccHe<7D?meCPlG`l+9_^
zSe$h>97yB4D8SR5U3gY*k)njywL`NU&n!rY2<g6+6?k@0B&1ZCoEBuDqb7Da$H+ix
za#NzB?h?tPJzQ<BTRPH2H)~0VU0^!b**ep7b5r8S4HaqE-*C0H9zHZPvF%KOj+EG0
zo#biD*$y{F8W{J^6yxbm-RN>SXLjzv4FO_aI%jrBit}{0M9e6Cb-qeRK<vbs<Y($E
zhaW}ATr~Kd7H^=_(|VBa2IIjE8e*<GZ<wBzDT=XhD@onx>^rzYLX3HLqB+Z9rwEQW
z9kMqo-ID}2a4c$!g_hgKWo`yM`wkv|7m!+>^gxjN;sL%;zBWhm7dKRQZ@H;=v_V;H
zQRCcI5<Jbh8#YGg?20zL(9xQaa9oS^u!3~T8>!jvqj(IG6s2zL<T_}ugH3$5`^3B5
zjjlQ_hxu+DoZFljz^k>$abs)`BS^^a)=AmsL<3&6MUEHm_B6WaY*<`YvOGb;rMV*`
zpe8(-L6G~+nz?rsCD_hCP?R#cc~`>X2$OYA`+1%=N8^kRwzFlHY&;te_}zYK+?2S1
zM{JSf<-2{2PC6SNm;E`BAfd9+!6akfYeNS%51kF4%l>sFNXTq-FgbH>!rlHxLxZG7
z=?83kj3n4xbq?rClyN6H@Njgr&E8NXoMgbm*3ou*Ly>fn0uM_Eo3^<U+d+kfj15KF
zNeoArT$-oOE{v_I;nx@2@akWkx!oBB*P0z)|L?hb^|-Q_g4CKFdUku<#kmD~Bfmdh
zXn**}>kmKTgOeETpVXP`l;5{DOvk~b;??%6RV5o4E=ttd|H%;8$Z)a1e%iZsc{>d;
z1*vz(PuKle05+lV`{DQnDqyis&6OYx1@?TLZSLaS1@>%r`YRwJeS8oRsrxXIb6il7
zdvFn$n!7NOGN?IHaC6GIA-cHW=9KY5Md0R?@gI8uwtf}dpj9l%R~C1(?vM|C?{2dz
zq9J34{MDw5zb+nSy3_yayRuxYj)Tda{#6GvzP?CeeCIy>w_v{>$V={D6Q<OaY-ISp
z`1aopkau~%FZMR@vfUNY@cZJ|x+9CbSv%T(U(}U|wg(ISg$tQVM1xfsK7|X}N-Vbn
z+3mAi{^N@z#zhb7d^nFS1X~mgb{50C<69E;e7Sg($tC$0*uDdQXGrxxbnTGe+x&3~
z#0|-A26Z5pE_zsZhU=Jfzn)mbZ$o1Vdr*Ac>A!g}0?gn)_~YBfqf7<%Ka3`Azy0>#
u%ZHC2Gv486c#wGAem}z<esIU5q3Iv9x0T}L@Ke51K?0txelF{r5}E*Ie@~SF
literal 0
HcmV?d00001
diff --git a/public/ressources/icons/croix_rouge.png b/public/ressources/icons/croix_rouge.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3fb0c6ad0f0a1aa4bd3a211baa2f2f23495a40c
GIT binary patch
literal 3372
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
literal 0
HcmV?d00001
diff --git a/public/utils/content.php b/public/utils/content.php
index 0dc18bf..268b1e7 100644
--- a/public/utils/content.php
+++ b/public/utils/content.php
@@ -199,7 +199,9 @@ function generateNavBar($page){
// pour mettre en surbrillance l'onglet sélectionné
echo
'<nav class="navbar navbar-expand-lg bg-dark navbar-dark sticky-top" style="margin-top:0px;font-family:Abang">
- <a class="navbar-brand" href="index.php"><img src="./ressources/logo/logo_transparent_recadre.png" height="36" width="67"></a>
+ <a class="navbar-brand" id=logoPhp href="index.php">
+ <img src="./ressources/logo/logo_transparent_recadre.png" height="36" width="67">
+ </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
--
GitLab