Merge origin/master

Conflicts: web/WEB-INF/feuilleGardes.jsp web/css/mycss.css
2021-12-16 16:50:32 +01:00
parent 623728d3e3
commit 5287b5ff74
5 changed files with 141 additions and 38 deletions
--- a/web/WEB-INF/jspf/header.jspf
+++ b/web/WEB-INF/jspf/header.jspf
@@ -14,7 +14,10 @@
                    <c:otherwise>
                        <h4>Bienvenue   ${sessionScope.lePompierConnecte.getPrenom()} 
                            ${sessionScope.lePompierConnecte.getNom()} (
-                            ${sessionScope.lePompierConnecte.getLeStatut().getValeur()})
+                            <span id="statut">
+                                ${sessionScope.lePompierConnecte.getLeStatut().getValeur()}
+                            </span>
+                            )
                        </h4>

                        <button type="button" class="btn btn-warning fs-4" title="Déconnexion">