From 4d7f0c9c5e3c724faec06107c3b88c36f98adeb0 Mon Sep 17 00:00:00 2001
From: Mysaa <samy.avrillon@ens-lyon.fr>
Date: Tue, 12 Oct 2021 21:31:35 +0200
Subject: [PATCH] =?UTF-8?q?Quelques=20modification=20de=20couleur,=20les?=
 =?UTF-8?q?=20scripts=20sont=20valides=20=C3=A0=20la=20fin.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html          |  2 +-
 maps/M-MGN1-3.svg   |  4 ++--
 resources/script.js | 10 +++++++++-
 resources/svg.css   |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 430e4d4..a1249a4 100644
--- a/index.html
+++ b/index.html
@@ -35,7 +35,7 @@
 
   <br/>
 
-  <object type="image/svg+xml" data="maps/M-MGN1-3.svg" id="plan" onload="initSvgSupport()">
+  <object type="image/svg+xml" data="maps/M-MGN1-3.svg" id="plan">
     Votre navigateur ne sait pas charger les objets HTML.... Je vais voir ce que je peux faire.
   </object>
 
diff --git a/maps/M-MGN1-3.svg b/maps/M-MGN1-3.svg
index 795e190..07f2188 100644
--- a/maps/M-MGN1-3.svg
+++ b/maps/M-MGN1-3.svg
@@ -676,10 +676,10 @@
          inkscape:label="salle-M-GN1-3-af" />
       <path
          d="m 28,285.375 33.888,1.602 1.112,7.648 h 34 l 1,-131.75 -89.5,1.25 0.188,121.777 z"
-         id="path-salle-M-GN1-34-ae"
+         id="path-salle-M-GN1-3-ae"
          inkscape:connector-curvature="0"
          class="svg-salle"
-         inkscape:label="salle-M-GN1-34-ae" />
+         inkscape:label="salle-M-GN1-3-ae" />
       <path
          d="m 322.87934,948.60483 v -10.08959 h 10.39951 v 2.06717 h 10.52548 v 8.36265 z"
          id="path-salle-M-GN1-3-de"
diff --git a/resources/script.js b/resources/script.js
index 7f8757a..e85050f 100644
--- a/resources/script.js
+++ b/resources/script.js
@@ -17,7 +17,7 @@ function putWaitNetworkScreen()
 
 function salleInfosToHtml(salle)
 {
-  titres = "<h2>"+salle.nom+"</h2>"+((salle.aliaz.length!=0)?(" ou <h2>"+salle.aliaz.join("</h2> ou <h2>")+"</h2>"):"");
+  titres = ((salle.aliaz.length!=0)?("<h2>"+salle.aliaz.join("</h2> ou <h2>")+"</h2>"):"Aucun alias connu.");
   locataires = salle.locataires.join(", ");
   return titres + ((salle.description!=null)?("\n<br/>\n" + salle.description):"") + ((salle.locataires.length!=0)?("\n<br/>\n<b>Locataires</b>: " + locataires):"");
 }
@@ -68,3 +68,11 @@ function initSvgSupport()
     salles[i].addEventListener('click', selectSalle);
   }
 }
+
+
+// Initialisation du svg.
+var plan = document.getElementById('plan');
+if(plan.contentDocument==null)
+	plan.addEventListener('load', initSvgSupport);
+else
+	initSvgSupport();
diff --git a/resources/svg.css b/resources/svg.css
index 4ecfade..49dc38e 100644
--- a/resources/svg.css
+++ b/resources/svg.css
@@ -14,5 +14,5 @@
 }
 
 .current-room {
-  fill: blue;
+  fill: rgb(100, 150, 250);
 }