From afb3e98b9bfc0fd00ec52fa724c7120903773229 Mon Sep 17 00:00:00 2001 From: Christian Corsano Date: Fri, 15 Feb 2008 10:12:59 +0000 Subject: [PATCH] Amelioration CSS Prise en compte des conferenceCreationToken lors de la creation de conference. Corrections de forgotPassword --- .../WEB-INF/classes/messages.properties | 3 ++ YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp | 5 ++++ .../WebContent/WEB-INF/jsp/forgotPassword.jsp | 9 ++++++ YACOSWeb/WebContent/images/errorSymbol.png | Bin 0 -> 2056 bytes YACOSWeb/WebContent/images/formHelpSymbol.png | Bin 0 -> 2009 bytes YACOSWeb/WebContent/images/formOkSymbol.png | Bin 0 -> 1990 bytes YACOSWeb/WebContent/stylesheets/base.css | 25 +++++++++++++++++ .../controller/AddConferenceController.java | 26 ++++++++++++------ .../controller/ForgotPasswordController.java | 6 ++-- 9 files changed, 62 insertions(+), 12 deletions(-) create mode 100644 YACOSWeb/WebContent/images/errorSymbol.png create mode 100644 YACOSWeb/WebContent/images/formHelpSymbol.png create mode 100644 YACOSWeb/WebContent/images/formOkSymbol.png diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index d88d4af..3467d8f 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -96,6 +96,7 @@ 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 +forgotPassword.submitted=A new password has been successfully generated for your account.\nIt has been sent to your email address. ################### # MESSAGE ERROR @@ -174,6 +175,8 @@ evaluation.choose=Choose an title to evaluation from the list invitation.send=Send an invitation +conference.error.noTokenLeft=You have no conference creation token left !\nPlease contact the administrator + #Validation messages for errors submissionArticle.title=The title should not be null submissionArticle.theme=The theme should not be null diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp index 30ae70e..0803e99 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp @@ -4,7 +4,12 @@ + Acces denied. Sorry for this inconvenience. +
+ ${message} +
+ \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/forgotPassword.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/forgotPassword.jsp index 4aafbbf..47953b9 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/forgotPassword.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/forgotPassword.jsp @@ -10,6 +10,13 @@

+ + +

+ +

+ +

@@ -22,6 +29,8 @@

"/> + + diff --git a/YACOSWeb/WebContent/images/errorSymbol.png b/YACOSWeb/WebContent/images/errorSymbol.png new file mode 100644 index 0000000000000000000000000000000000000000..dead6ce4a7620873ae0f0c743836d22a51f84776 GIT binary patch literal 2056 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 literal 0 HcmV?d00001 diff --git a/YACOSWeb/WebContent/images/formOkSymbol.png b/YACOSWeb/WebContent/images/formOkSymbol.png new file mode 100644 index 0000000000000000000000000000000000000000..d0749e4e12876868c94f29e538d0e02a672ad5f2 GIT binary patch literal 1990 zcmV;%2RZnOP)4Tx0C=2@luu|JRUF4ZZ#tnMi6E{u29$?~7$ga6E4oFf$tLMGZrCo@o7t@`MI<2JZ1pH!szp3h5f74sf+u?@5@@aMAqe8Bicl={B4s_y{+SSq z{$Swqe!t)Q{{9R+82G9j1lp3Y=|{%NW#!81nml-&0fra^D7#@WT`VpDl!HLC&+h+> z0Jt$x4g#HDI(hxKm!A6K{jc-4hrcU{{rP)r$gHfcfsjC|7W0chYCYx?K(8Mcq~efJy$AP((>)gy-i5QAA5 z_@&*xHwp(oga;qA+kb!3Za?@G4(!7B+HIOvXGcQ(2ywsh8Md7+J&fa-0LZ|l6R`XU zc)_ApgBoC+4FU#p5&`Qqx?&P>EYb}je zt4E9*NVUh2xp^_cYs4+ zO`WSRF2^kNx%y0@!#|m(Qv#j^>vEur3vqAO53Hh5c=#xMBn~;UOb}pbP{qSTz* zqcC`cZ2W7crkG$!jyw3=!Qk;GO%xJ`C9(y!#(N4feJlNE`eyo4`f~b@izCgkeq_tM z?zuY`?ovcydb*uxr>9uorNJ~BO%26nZ>BKOX`;KTe{rO*_hx@f|+S{jZ3|>9IXIG7VQ>ormd(Zv6P(tg#RvX9xbcE*0iUg+H@;p1@zg(0Mj#^)?@&;RS@62C0~q;kqv#&e~U%gUl@ zR6VT{&)k26|EK)}0fiL}$-4Xb00009a7bBm000XU000XU0RWnu7ytkSOi4sRR7i=v zmsxC7RT#&A=iJ+wcG_9mLQ7kwol3QU5F$%3-~ximmdF!4%ND6tdB;b2SCl1)kQifv zZzcvYY9$RKku9vTVxWsHOh<+e)49_-a~B_`y{R*$ojWA{-@fyG-}%k*oqPXBFoQm~ zKdv`W_DGanHddXV;8=i=M@97l7#R9vMlwkf$SWI0N*i2k8?aPTI)*9irn=(csVQPu3|Yry2?S+F4ZL#XBu9 zUphKH+)NKKpqZH4-xDAFJR|sseQ<|FIk=2fm9@-v1 zw80?z{VTkVpWstLCzN88vz$Re?%XThKT!ZaVt@LYh4s^`yeTTFat*Mt8ORdwyll^q}ckyT}H%E$8+1$33x&E+I z^N<)9`SqcVe6~Y$Jd!!Ob)b>3uM}uBb)WD4`qqJ}N*P=7pa8YZrjf8OcTzx%pVQv8 zY$|sS>Incmiib^YTWPFnnzCL;=NC?oshAOIpzLX)#dZq?xP1S22MVyh zb<-1}0A9Q_(PA4Yd!&Ng875NU7MeCRu0}6A@q$^;6A8A?*cT>JAyIZo3%h=%C(=~9 zK719^G63*<{HzYIDXK3-4K`Mt^b;I&3(Z&=Zp5xR@!H56c%-N3em}u686Z@A$GC3A zu9Goz0K$P5=K7mm^#=%fXlO^GFFDZ#9gA=gMwUt z;vQNy1wegO0}WM;uE7ARfuRGwiG{SGaq9M0&gRX*RyNMtf+AD^dg6aL&5LI*DG6#| z=<+cmnaPV4s*e}uEOX-i#67xte*hq3>hvY<=IY9P%&UH`B=BQKGHQ}Ud46I^-7?bI zG*=#61mI5mPg+B5WXvq4Wdbn2b|H#TN&+WIluLme9wA&A;{)`j^9uxm^{pH6D!HN8vKqsw+_2SGHV`VWE(tt9Z`#5+B9 zgY*d6N@J@~zNlc9g2J;*DUO7?(J&S(u%Z z9p;o^$T?0B-!wAU*UsXnGW1|?+bcS|@@uBO!bt3oY^)vs+ZATA++5luB5GoNQOu?7 YUn{w^(~UIExc~qF07*qoM6N<$f{|OpxBvhE literal 0 HcmV?d00001 diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css index 85ddc59..a3b3bb9 100644 --- a/YACOSWeb/WebContent/stylesheets/base.css +++ b/YACOSWeb/WebContent/stylesheets/base.css @@ -33,11 +33,35 @@ form { } .formHelp { + min-height: 30px; 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; 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{ color: #ff0000; } @@ -229,6 +253,7 @@ form { } #maincontent > * { + margin-top: 10px; margin-right: 10px; } diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index f93fe7b..b6a23bc 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -25,6 +25,7 @@ import org.yacos.core.conferences.IConferenceManager; import org.yacos.core.evaluation.Criterion; import org.yacos.core.evaluation.IEvaluationManager; import org.yacos.core.exceptions.ConferenceDoesntExistException; +import org.yacos.core.exceptions.NoConferenceCreationTokenLeftException; import org.yacos.core.users.IUserManager; import org.yacos.core.users.User; import org.yacos.core.users.Role.RoleType; @@ -424,15 +425,22 @@ public class AddConferenceController extends AbstractWizardFormController { if (action == null || action.equals("")) { - Conference conf = conferenceManager.addConference( - conference.getTitle(), - conference.getDescription(), - conference.getOtherInformations(), - conference.getDateArticleParsed(), - conference.getDateArticleParsed(), - conference.getDateEvaluationParsed(), - conference.getDateStartParsed(), - conference.getDateEndParsed()); + Conference conf = null; + + try { + conf = conferenceManager.addConference( + conference.getTitle(), + SessionService.getInstance().getCurrentUserLogin(), + conference.getDescription(), + conference.getOtherInformations(), + conference.getDateArticleParsed(), + conference.getDateArticleParsed(), + conference.getDateEvaluationParsed(), + conference.getDateStartParsed(), + conference.getDateEndParsed()); + } catch (NoConferenceCreationTokenLeftException e1) { + return new ModelAndView("denied","message",getMessageSourceAccessor().getMessage("conference.error.noTokenLeft")); + } conference.setConferenceId(conf.getId()); SessionService.getInstance().setCurrentConference(conf); diff --git a/YACOSWeb/src/org/yacos/web/system/controller/ForgotPasswordController.java b/YACOSWeb/src/org/yacos/web/system/controller/ForgotPasswordController.java index b8ab02a..ed16dc2 100644 --- a/YACOSWeb/src/org/yacos/web/system/controller/ForgotPasswordController.java +++ b/YACOSWeb/src/org/yacos/web/system/controller/ForgotPasswordController.java @@ -42,8 +42,6 @@ public class ForgotPasswordController extends SimpleFormController { String newPassword = YACOSUtils.generate(12); user.setPassword(User.hashPassword(newPassword)); - System.out.println(newPassword); - userManager.UpdateUser(user); String mailSubject = "Your new YACOS password"; @@ -54,7 +52,9 @@ public class ForgotPasswordController extends SimpleFormController { MailSenderService.getInstance().sendEMail(email, mailSubject, mailBody); - return new ModelAndView(getSuccessView()); + request.setAttribute("success", true); + + return showNewForm(request, response); } }