Ajout de l'UC ForgotPassword
Modification CSS Mise en place des blocs arondis (cbb) Clarification interface pages login avec les blocs cbb Correction articleController : validation
This commit is contained in:
@@ -19,11 +19,12 @@ login.label.login=Login
|
||||
login.label.password=Password
|
||||
login.label.rememberme=Remember me
|
||||
login.label.register=Register
|
||||
login.label.alreadyaccount:I have already an account
|
||||
login.label.alreadyaccount:I already have an account
|
||||
# New user
|
||||
login.label.createnewuser=Create an account
|
||||
login.label.createaccount="When creating an account on Yacos.com, you may post an article and follow the conference."
|
||||
login.label.continue=Continue
|
||||
login.label.forgotPasswordHeading=Forgot your password ?
|
||||
login.message.error=Your login attempt was not successful, try again.
|
||||
|
||||
###################
|
||||
@@ -87,6 +88,15 @@ form.register.error.passwordEmpty=The password can't be empty
|
||||
form.register.error.alreadyExists=A user with this login already exists. Please check you haven't already registered or change your login.
|
||||
|
||||
|
||||
###################
|
||||
# FORGOT USER
|
||||
form.forgotPassword.error.emailInvalid=This email is invalid
|
||||
form.forgotPassword.error.unknownEmail=This email is not registered in our system
|
||||
form.forgotPassword.email=E-Mail address for your account :
|
||||
form.forgotPassword.submit=Request new password
|
||||
form.forgotPassword.help=Please enter the email address you used for your YACOS account.\nA new password will be generated and sent into your mailbox.
|
||||
forgotPassword.title=Reset your password
|
||||
|
||||
###################
|
||||
# MESSAGE ERROR
|
||||
message.error.noconferenceforthisid=This conference doesn't exist. Pease try again
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<link rel="icon" type="image/png" href="./images/favicon.png" />
|
||||
<title><fmt:message key="title" /></title>
|
||||
<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
|
||||
<script type='text/javascript' src='./javascripts/rounded_boxes.js'></script>
|
||||
<decorator:head />
|
||||
</head>
|
||||
|
||||
|
||||
28
YACOSWeb/WebContent/WEB-INF/jsp/forgotPassword.jsp
Normal file
28
YACOSWeb/WebContent/WEB-INF/jsp/forgotPassword.jsp
Normal file
@@ -0,0 +1,28 @@
|
||||
<%@ include file="/WEB-INF/decorators/include.jsp"%>
|
||||
|
||||
<html>
|
||||
<head>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<h4 class="title"><fmt:message key="forgotPassword.title" /></h4>
|
||||
<p class="formHelp">
|
||||
<fmt:message key="form.forgotPassword.help"/>
|
||||
</p>
|
||||
<div class="cbb">
|
||||
<form:form commandName="forgotPassword">
|
||||
<h2>
|
||||
<form:label path="email">
|
||||
<fmt:message key="form.forgotPassword.email"/>
|
||||
</form:label>
|
||||
</h2>
|
||||
<form:input path="email"/>
|
||||
<div class="formError">
|
||||
<form:errors path="email"/>
|
||||
</div>
|
||||
<input type="submit" name="submit" value="<fmt:message key="form.forgotPassword.submit"/>"/>
|
||||
</form:form>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -5,22 +5,23 @@
|
||||
<body>
|
||||
<h4 class="title">NO NAME</h4>
|
||||
<c:forEach items="${listArticle}" var="article">
|
||||
<ul class="article">
|
||||
<li class="title"><b>${article.title}</b></li>
|
||||
<li class="author">Author: <b>${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</b></li>
|
||||
<li class="secondaryAuthors">Secondary Authors:
|
||||
<div class="article cbb">
|
||||
<h2>${article.title}</h2>
|
||||
<p class="author">Author: <b>${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</b></p>
|
||||
<p class="secondaryAuthors">
|
||||
Secondary Authors:
|
||||
<ul>
|
||||
<c:forEach items="${article.secondaryAuthors}" var="sAuthor">
|
||||
<li>${sAuthor}</li>
|
||||
</c:forEach>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="topic">Topic: <b>${article.topic}</b></li>
|
||||
<li class="article_url"><a href="
|
||||
<c:url value="/download.htm">
|
||||
<c:param name="articleId" value="${article.id}"/>
|
||||
</c:url>">Download the article</a></li>
|
||||
</ul>
|
||||
</ul>
|
||||
<p class="topic">Topic: <b>${article.topic}</b></p>
|
||||
<p class="article_url"><a href="
|
||||
<c:url value="/download.htm">
|
||||
<c:param name="articleId" value="${article.id}"/>
|
||||
</c:url>">Download the article</a>
|
||||
</p>
|
||||
</div>
|
||||
<br />
|
||||
<hr />
|
||||
<br />
|
||||
|
||||
@@ -32,7 +32,8 @@
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:forEach items="${listConference}" var="conference">
|
||||
<div class="conferenceBloc">
|
||||
<div class="conferenceBloc cbb">
|
||||
<h2>${conference.title}</h2>
|
||||
ID : ${conference.id}<br />
|
||||
Title : ${conference.title}<br />
|
||||
Description : ${conference.description}<br />
|
||||
|
||||
@@ -15,11 +15,14 @@
|
||||
|
||||
<table width="100%">
|
||||
<tr><td width="50%">
|
||||
<fmt:message key="login.label.createnewuser" /><br />
|
||||
<div class="cbb">
|
||||
<h2><fmt:message key="login.label.createnewuser" /></h2>
|
||||
<fmt:message key="login.label.createaccount" /><br />
|
||||
<a href="registerUser.htm"><fmt:message key="login.label.continue" /></a>
|
||||
<a href="registerUser.htm"><fmt:message key="login.label.register" /></a>
|
||||
</div>
|
||||
</td><td>
|
||||
<fmt:message key="login.label.alreadyaccount" /> :<br />
|
||||
<div class="cbb">
|
||||
<h2><fmt:message key="login.label.alreadyaccount" /> :</h2>
|
||||
<form action="<c:url value='j_acegi_security_check'/>" method="POST" id="formlogin">
|
||||
<fmt:message key="login.label.login" /> : <input type='text' name='j_username' /><br />
|
||||
<fmt:message key="login.label.password" /> : <input type='password' name='j_password' /><br />
|
||||
@@ -28,7 +31,12 @@
|
||||
<br /><br />
|
||||
<a href="javascript:document.getElementById('formlogin').submit();" id="submit_btn"><fmt:message key="login.btn.connexion" /></a>
|
||||
</form>
|
||||
|
||||
<div class="yacos_button">
|
||||
<a href="<c:url value="/forgotPassword.htm"/>">
|
||||
<fmt:message key="login.label.forgotPasswordHeading"/>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</td></tr>
|
||||
</table>
|
||||
</body>
|
||||
|
||||
@@ -75,8 +75,10 @@
|
||||
</prop>
|
||||
<prop key="/listReport.htm">
|
||||
ListReportController
|
||||
</prop>
|
||||
<prop key="/forgotPassword.htm">
|
||||
ForgotPasswordController
|
||||
</prop>
|
||||
|
||||
</props>
|
||||
</property>
|
||||
</bean>
|
||||
@@ -117,6 +119,17 @@
|
||||
|
||||
<bean id="UserValidator"
|
||||
class="org.yacos.web.system.validation.UserValidator">
|
||||
</bean>
|
||||
|
||||
<bean id="ForgotPasswordController"
|
||||
class="org.yacos.web.system.controller.ForgotPasswordController">
|
||||
<property name="sessionForm" value="false" />
|
||||
<property name="commandName" value="forgotPassword" />
|
||||
<property name="commandClass"
|
||||
value="org.yacos.web.system.form.FormForgotPassword" />
|
||||
<property name="formView" value="forgotPassword" />
|
||||
<property name="successView" value="forgotPassword.htm" />
|
||||
<property name="userManager" ref="userManager" />
|
||||
</bean>
|
||||
|
||||
<bean id="SArticleController"
|
||||
|
||||
Reference in New Issue
Block a user