Merge origin/master
Conflicts: web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
		@@ -6,20 +6,4 @@
 | 
			
		||||
<%@include file="jspf/enteteJSPF.jspf" %>
 | 
			
		||||
<div id="contenu">
 | 
			
		||||
      <h2>Merci de vous identifier pour acceder aux dossiers</h2>
 | 
			
		||||
	<form name="frmIdentification" method="POST" action="Profil">    
 | 
			
		||||
        <fieldset><legend>Identification utilisateur</legend>
 | 
			
		||||
            <br /><br />
 | 
			
		||||
               <label for="nom">Nom du compte</label>
 | 
			
		||||
               <input id="login" 	type="text" 	name="login"  size="30" maxlength="45" 	placeholder="Entrez votre nom d'Utilisateur">
 | 
			
		||||
            </p>
 | 
			
		||||
            <p>
 | 
			
		||||
                <label for="mdp">Mot de passe</label>
 | 
			
		||||
                <input id="mdp" 	type="password"  name="mdp" size="30" 	maxlength="45" 	placeholder="Entrez votre Mot de Passe">
 | 
			
		||||
            </p><br /><br />
 | 
			
		||||
                <input type="submit" 	name="valider"		value="Valider">
 | 
			
		||||
                <input type="reset" 	name="annuler" 		value="Annuler">
 | 
			
		||||
            </p>
 | 
			
		||||
        </fieldset>
 | 
			
		||||
	</form>
 | 
			
		||||
    <br /><br />
 | 
			
		||||
</div>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user