Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
	web/WEB-INF/ProfilJSP.jsp
This commit is contained in:
elliass.chelloug
2021-10-20 11:34:47 +02:00
parent 05e4eb1b4c
commit 1e8257677c
2 changed files with 11 additions and 106 deletions

View File

@@ -5,15 +5,15 @@
<td style='border :0px;'>
<fieldset><legend>Coordonn<6E>es Pompier</legend>
<table>
<tr><th><label>Nom :<input type="text" name="ztNom" size="20" maxlength="30"></label></th></tr>
<tr><th><label>Pr<EFBFBD>nom :<input type="text" name="ztPrenom" size="20" maxlength="30"></label></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>
<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>
@@ -24,3 +24,6 @@
<tr><th>Mail employeur : <input type="text" name="ztMailEmp" size="20" maxlength="30"></th></tr>
</table>
</fieldset>
</td>
</tr>
</table>