christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Amelioration CSS

Browse Source 
Prise en compte des conferenceCreationToken lors de la creation de conference.
Corrections de forgotPassword
This commit is contained in:
conceptoire.com
2008-02-15 10:12:59 +00:00
parent b55277095c
commit afb3e98b9b
9 changed files with 62 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
YACOSWeb/WebContent/WEB-INF/classes/messages.properties
View File

@@ -96,6 +96,7 @@ form.forgotPassword.email=E-Mail address for your account :
form.forgotPassword.submit=Request new password 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. 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 forgotPassword.title=Reset your password
forgotPassword.submitted=A new password has been successfully generated for your account.\nIt has been sent to your email address.
################### ###################
# MESSAGE ERROR # MESSAGE ERROR
@@ -174,6 +175,8 @@ evaluation.choose=Choose an title to evaluation from the list
invitation.send=Send an invitation invitation.send=Send an invitation
conference.error.noTokenLeft=You have no conference creation token left !\nPlease contact the administrator
#Validation messages for errors #Validation messages for errors
submissionArticle.title=The title should not be null submissionArticle.title=The title should not be null
submissionArticle.theme=The theme should not be null submissionArticle.theme=The theme should not be null

5
YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp
View File

@@ -4,7 +4,12 @@
<head></head> <head></head>
<body> <body>
Acces denied. Sorry for this inconvenience. Acces denied. Sorry for this inconvenience.
<div class="errorBox">
${message}
</div>
</body> </body>
</html> </html>

9
YACOSWeb/WebContent/WEB-INF/jsp/forgotPassword.jsp
View File

@@ -10,6 +10,13 @@
<fmt:message key="form.forgotPassword.help"/> <fmt:message key="form.forgotPassword.help"/>
</p> </p>
<div class="cbb"> <div class="cbb">
<c:choose>
<c:when test="${success}">
<p class="formOk">
<fmt:message key="forgotPassword.submitted"/>
</p>
</c:when>
<c:otherwise>
<form:form commandName="forgotPassword"> <form:form commandName="forgotPassword">
<h2> <h2>
<form:label path="email"> <form:label path="email">
@@ -22,6 +29,8 @@
</div> </div>
<input type="submit" name="submit" value="<fmt:message key="form.forgotPassword.submit"/>"/> <input type="submit" name="submit" value="<fmt:message key="form.forgotPassword.submit"/>"/>
</form:form> </form:form>
</c:otherwise>
</c:choose>
</div> </div>
</body> </body>

BIN
YACOSWeb/WebContent/images/errorSymbol.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
YACOSWeb/WebContent/images/formHelpSymbol.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
YACOSWeb/WebContent/images/formOkSymbol.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

25
YACOSWeb/WebContent/stylesheets/base.css
View File

@@ -33,11 +33,35 @@ form {
} }
.formHelp { .formHelp {
min-height: 30px;
padding: 5px; padding: 5px;
padding-left: 35px;
border: thin solid #94ff90;
background: #dfffe4 url(../images/formHelpSymbol.png) no-repeat 2px 5px;
}
.formOk {
min-height: 30px;
background-image: url(../images/formOkSymbol.png);
background-repeat: no-repeat;
background-position: 2px 5px;
padding: 5px;
padding-left: 35px;
border: thin solid #94ff90; border: thin solid #94ff90;
background-color: #dfffe4; background-color: #dfffe4;
} }
.errorBox {
min-height: 30px;
background-image: url(../images/errorSymbol.png);
background-repeat: no-repeat;
background-position: 2px 5px;
padding: 5px;
padding-left: 35px;
border: thin solid rgb(255,0,12);
background-color: rgb(255,188,182);
}
.formError{ .formError{
color: #ff0000; color: #ff0000;
} }
@@ -229,6 +253,7 @@ form {
} }
#maincontent > * { #maincontent > * {
margin-top: 10px;
margin-right: 10px; margin-right: 10px;
} }

10
YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
View File

@@ -25,6 +25,7 @@ import org.yacos.core.conferences.IConferenceManager;
import org.yacos.core.evaluation.Criterion; import org.yacos.core.evaluation.Criterion;
import org.yacos.core.evaluation.IEvaluationManager; import org.yacos.core.evaluation.IEvaluationManager;
import org.yacos.core.exceptions.ConferenceDoesntExistException; import org.yacos.core.exceptions.ConferenceDoesntExistException;
import org.yacos.core.exceptions.NoConferenceCreationTokenLeftException;
import org.yacos.core.users.IUserManager; import org.yacos.core.users.IUserManager;
import org.yacos.core.users.User; import org.yacos.core.users.User;
import org.yacos.core.users.Role.RoleType; import org.yacos.core.users.Role.RoleType;
@@ -424,8 +425,12 @@ public class AddConferenceController extends AbstractWizardFormController {
if (action == null || action.equals("")) { if (action == null || action.equals("")) {
Conference conf = conferenceManager.addConference( Conference conf = null;
try {
conf = conferenceManager.addConference(
conference.getTitle(), conference.getTitle(),
SessionService.getInstance().getCurrentUserLogin(),
conference.getDescription(), conference.getDescription(),
conference.getOtherInformations(), conference.getOtherInformations(),
conference.getDateArticleParsed(), conference.getDateArticleParsed(),
@@ -433,6 +438,9 @@ public class AddConferenceController extends AbstractWizardFormController {
conference.getDateEvaluationParsed(), conference.getDateEvaluationParsed(),
conference.getDateStartParsed(), conference.getDateStartParsed(),
conference.getDateEndParsed()); conference.getDateEndParsed());
} catch (NoConferenceCreationTokenLeftException e1) {
return new ModelAndView("denied","message",getMessageSourceAccessor().getMessage("conference.error.noTokenLeft"));
}
conference.setConferenceId(conf.getId()); conference.setConferenceId(conf.getId());
SessionService.getInstance().setCurrentConference(conf); SessionService.getInstance().setCurrentConference(conf);

6
YACOSWeb/src/org/yacos/web/system/controller/ForgotPasswordController.java
View File

@@ -42,8 +42,6 @@ public class ForgotPasswordController extends SimpleFormController {
String newPassword = YACOSUtils.generate(12); String newPassword = YACOSUtils.generate(12);
user.setPassword(User.hashPassword(newPassword)); user.setPassword(User.hashPassword(newPassword));
System.out.println(newPassword);
userManager.UpdateUser(user); userManager.UpdateUser(user);
String mailSubject = "Your new YACOS password"; String mailSubject = "Your new YACOS password";
@@ -54,7 +52,9 @@ public class ForgotPasswordController extends SimpleFormController {
MailSenderService.getInstance().sendEMail(email, mailSubject, mailBody); MailSenderService.getInstance().sendEMail(email, mailSubject, mailBody);
return new ModelAndView(getSuccessView()); request.setAttribute("success", true);
return showNewForm(request, response);
} }
} }