From 3cfc1f99e4f4087e5b6af9b9309d0974841c66e5 Mon Sep 17 00:00:00 2001
From: "elliass.chelloug" <elliass.chelloug@sio211-08.sio.lan>
Date: Thu, 21 Oct 2021 14:33:44 +0200
Subject: [PATCH] Merge origin/master

Conflicts:
	src/java/bdd/PompierMysql.java
---
 web/WEB-INF/AuthentificationJSP.jsp | 2 +-
 web/WEB-INF/ProfilJSP.jsp           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/WEB-INF/AuthentificationJSP.jsp b/web/WEB-INF/AuthentificationJSP.jsp
index b155d7b..3ad1284 100644
--- a/web/WEB-INF/AuthentificationJSP.jsp
+++ b/web/WEB-INF/AuthentificationJSP.jsp
@@ -26,6 +26,6 @@
                     <p>${message}</p>
                 </fieldset>
     </form>
-    <br /><br/>
+    <br/><br/>
 </div>
 </html>
diff --git a/web/WEB-INF/ProfilJSP.jsp b/web/WEB-INF/ProfilJSP.jsp
index c5224f8..10440d6 100644
--- a/web/WEB-INF/ProfilJSP.jsp
+++ b/web/WEB-INF/ProfilJSP.jsp
@@ -1,5 +1,6 @@
 <%@include file="jspf/enteteJSPF.jspf" %>
 <br /><br />
+   <form name="frmModifProfil" method="POST" action="ModifProfilJSP.jsp">
 <table style='border: 0px solid white;'>
     <tr>
         <td style='border :0px;'>
@@ -24,6 +25,8 @@
                     <tr><th>Mail employeur : <input readonly type="text" name="ztMailEmp"  size="20" maxlength="30"></th></tr>
                 </table>
             </fieldset>
+             <input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Modif'" value="Modification du profil">
         </td>
     </tr>
 </table>
+ </form>
\ No newline at end of file