Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
thomas.millot
2021-10-19 08:51:43 +02:00
parent cc1a3760ef
commit caf65f4bfe
5 changed files with 11 additions and 33 deletions

View File

@@ -1,17 +1,16 @@
<%--
Document : authentificationJSP
Created on : 18 oct. 2021, 11:09:26
Author : Chelloug.Eliass
Author : Millot.Thomas
--%>
<%@include file="jspf/enteteJSPF.jspf" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@page import="com.test.forms.AuthentifForm" %>
<!-- 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">
<form name="frmIdentification" method="POST" action="Profil">
<c:choose>
<c:when test="${empty param.ztPseudo}">
<fieldset><legend>Identification utilisateur</legend>
@@ -38,4 +37,4 @@
</form>
<br /><br/>
</div>
</html>