mirror of
https://gitlab.aliens-lyon.fr/savrillo/gpens.git
synced 2026-03-18 00:31:03 +01:00
Merge branch 'master' of https://gitlab.aliens-lyon.fr/savrillo/gpens
This commit is contained in:
commit
b9590c1ed4
@ -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"
|
||||
|
||||
|
Before Width: | Height: | Size: 295 KiB After Width: | Height: | Size: 295 KiB |
@ -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();
|
||||
|
||||
@ -14,5 +14,5 @@
|
||||
}
|
||||
|
||||
.current-room {
|
||||
fill: blue;
|
||||
fill: rgb(100, 150, 250);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user