Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
thomas.millot
2021-10-20 11:11:29 +02:00
parent 2d81cde4a8
commit e5fa228860
6 changed files with 55 additions and 33 deletions

View File

@@ -10,7 +10,7 @@
<!-- Affichage du formulaire si l'utilisateur ne s'est pas encore authentifi<66> -->
<div id="contenu">
<h2>Merci de vous identifier pour acceder aux dossiers</h2>
<form name="frmIdentification" method="POST" action="Profil">
<form name="frmIdentification" method="POST" action="Authentif">
<c:choose>
<c:when test="${empty param.ztPseudo}">
<fieldset><legend>Identification utilisateur</legend>
@@ -28,8 +28,6 @@
</fieldset>
</c:when>
<c:otherwise>
<!-- Si l'utilisateur s'est authentifi<66>,
Affichage du message contenu dans l'objet controlForm de type AuthentifForm -->
<p>${controlForm.getResultat()}</p>
</c:otherwise>

View File

@@ -5,15 +5,15 @@
<td style='border :0px;'>
<fieldset><legend>Coordonn<6E>es Pompier</legend>
<table>
<tr><th>Nom :<input type="text" name="ztNom" size="20" maxlength="30"></th></tr>
<tr><th>Pr<50>nom :<input type="text" name="ztPrenom" size="20" maxlength="30"></th></tr>
<tr><th>Adresse :<input type="text" name="ztAdr" size="20" maxlength="30"></th></tr>
<tr><th>Ville :<input type="text"name="ztVille" size="20" maxlength="30"></th></tr>
<tr><th>Code postal :<input type="text" name="ztCp" size="20" maxlength="30"></th></tr>
<tr><th>T<>l<EFBFBD>phone :<input type="text" name="ztTel" size="20" maxlength="30"></th></tr>
<tr><th>Mail :<input type="text" name="ztMail" size="20" maxlength="30"></th></tr>
<tr><th>Statut :<input type="text" name="ztStatut" size="20" maxlength="30"></th></tr>
<tr><th>Grade :<input type="text" name="ztGrade" size="20" maxlength="30"></th></tr>
<tr><th>Nom : <input type="text" name="ztNom" size="20" maxlength="30"></th></tr>
<tr><th>Pr<50>nom : <input type="text" name="ztPrenom" size="20" maxlength="30"></th></tr>
<tr><th>Adresse : <input type="text" name="ztAdr" size="20" maxlength="30"></th></tr>
<tr><th>Ville : <input type="text"name="ztVille" size="20" maxlength="30"></th></tr>
<tr><th>Code postal : <input type="text" name="ztCp" size="20" maxlength="30"></th></tr>
<tr><th>T<>l<EFBFBD>phone : <input type="text" name="ztTel" size="20" maxlength="30"></th></tr>
<tr><th>Mail : <input type="text" name="ztMail" size="20" maxlength="30"></th></tr>
<tr><th>Statut : <input type="text" name="ztStatut" size="20" maxlength="30"></th></tr>
<tr><th>Grade : <input type="text" name="ztGrade" size="20" maxlength="30"></th></tr>
</table>
</fieldset>
<fieldset><legend>Coordonn<6E>es Employeur</legend>