diff --git a/YACOSWeb/.settings/org.eclipse.jdt.core.prefs b/YACOSWeb/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 012b1fd..0000000 --- a/YACOSWeb/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -#Sat Jan 19 01:10:39 CET 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/YACOSWeb/.settings/org.eclipse.wst.validation.prefs b/YACOSWeb/.settings/org.eclipse.wst.validation.prefs index 3ca8770..05f6711 100644 --- a/YACOSWeb/.settings/org.eclipse.wst.validation.prefs +++ b/YACOSWeb/.settings/org.eclipse.wst.validation.prefs @@ -1,6 +1,6 @@ -#Fri Feb 15 22:57:49 CET 2008 +#Sat Feb 16 13:07:24 CET 2008 DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator; -USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator; -USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator; +USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator; +USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator; USER_PREFERENCE=overrideGlobalPreferencesfalse eclipse.preferences.version=1 diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index 9a51c91..ca63159 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -160,7 +160,8 @@ conference.errors.dateStartNonValid=This date is not valid conference.errors.dateStartSuperiorEnd=The start date must be earlier than the end date conference.errors.dateStartSuperiorArticle=The article's deadline date must be earlier than the start date conference.errors.dateStartSuperiorEvaluation=The evaluation's deadline date must be earlier than the start date -conference.errors.dateArticleSuperiorEvaluation=The article's deadline date must be earlier than the evaluation's deadline date +conference.errors.dateArticleSuperiorEvaluation=The article's deadline date must be earlier than the evaluation's deadline date +conference.errors.pageNumberNotValid=It should be a number conference2.title=Calendar conference2.date=Conference's date diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp index 02379a8..9bf0edf 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp @@ -23,7 +23,10 @@ var LoginManager = Class.create({ KeyPressHandler: function(event){ switch(event.keyCode){ case Event.KEY_RETURN: + if (event.element().parentNode.id == 'mainformlogin') $('mainformlogin').submit(); + else + $('mainformlogin2').submit(); } } }); diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp index 7ea40c2..fa3a4ed 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp @@ -2,27 +2,10 @@ - - - - - -

@@ -48,7 +31,7 @@ function verifNumber() { Page's numbers -
+
Authorized file types @@ -76,11 +59,7 @@ function verifNumber() { - - - + ">Home diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp index b0d9ec2..027fddc 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp @@ -123,7 +123,7 @@ function writePerson() { else $('errorMax').style.display = "none"; - if (person.max <= person.min) { + if (parseInt(person.max) <= parseInt(person.min)) { dwr.util.setValues({errorMax:"The min value shouldn't be superior to the max value"}); $('errorMax').style.display = ""; } @@ -215,7 +215,7 @@ var CritereManager = Class.create({ Min: - +
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp index 87545dc..87aae1f 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp @@ -1,45 +1,61 @@ <%@ include file="/WEB-INF/decorators/include.jsp"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -

NO NAME

+

Conference's list

- +
-
+
- - Choix de la conference

- - - La conférence courante est : ${currentConference.title}.

- - - Il n'y a pas de conférence sélectionné.

- +

+ Choose a conference +

- Il n'y a pas de conférence présente.
+
+ Sorry, there is no conference at the moment. +
-

${conference.title}

- ID : ${conference.id}
- Title : ${conference.title}
- Description : ${conference.description}
- Other Informations : ${conference.otherInformations}
+

+ + + + + + + + + ${conference.title} - In this conference you are: + + + ${role.type} + + + + + + + ${conference.title} - You haven't any role in this conference + + +

+ Description: ${conference.description}
- ">Choisir
+ ">Choose
 diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp index 251f0ac..b03d2a0 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp @@ -6,11 +6,10 @@

-

-

-

+
+ +
- @@ -18,62 +17,61 @@ - - - - - + + +
+ +
+ + +
- - -
- -
- 		-
- - - - - - - - - - - - - - - - -
- - - -
- - - -
- - -    -
- " class="forgot_pwd"> - - -
-
- -
-
- -
- +
-
+
+ + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + +    +
+ " class="forgot_pwd"> + + +
+
+ +
+
+ +
+ + +
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp index 941baf5..ed1c8b4 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp @@ -34,7 +34,7 @@ ">Download ">Modify - ">Delete + Delete diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml index 4556cb4..0770673 100644 --- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml +++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml @@ -197,6 +197,7 @@ + diff --git a/YACOSWeb/WebContent/javascripts/yacos/manageArticle.js b/YACOSWeb/WebContent/javascripts/yacos/manageArticle.js index 13837ad..05144d1 100644 --- a/YACOSWeb/WebContent/javascripts/yacos/manageArticle.js +++ b/YACOSWeb/WebContent/javascripts/yacos/manageArticle.js @@ -40,4 +40,10 @@ var AuthorManager = Class.create({ Event.observe(window,'load', function() { new AuthorManager() -}); \ No newline at end of file +}); + +function deleteArticle(ArticleID) { + if (confirm("Are you sure you want to delete this article?")) { + document.location.href = "delete.htm?articleId=" + ArticleID; + } +} \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java b/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java index 0dad6ea..5c6c6c1 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java @@ -2,8 +2,6 @@ package org.yacos.web.author.controller; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.swing.text.html.FormView; - import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndViewDefiningException; import org.springframework.web.servlet.mvc.Controller; diff --git a/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java index 70e2063..f703064 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java @@ -20,13 +20,7 @@ public class ManageArticleController extends SimpleFormController { protected final Log logger = LogFactory.getLog(getClass()); - private IArticleManager articleManager; - - - public void deleteArticle(Integer id) { - articleManager.removeArticle(id); - } - + private IArticleManager articleManager; public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException, NoConferenceSelectedException { diff --git a/YACOSWeb/src/org/yacos/web/chairman/form/FormConference.java b/YACOSWeb/src/org/yacos/web/chairman/form/FormConference.java index 878ed93..51498f2 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/form/FormConference.java +++ b/YACOSWeb/src/org/yacos/web/chairman/form/FormConference.java @@ -18,7 +18,8 @@ public class FormConference { private String dateEnd; private Date dateEndParsed; - private int pageNumber; + private String pageNumber; + private Integer pageNumberChecked; private boolean typePDF; private boolean typeLatec; private boolean typeWord; @@ -63,14 +64,6 @@ public class FormConference { this.otherInformations = otherInformations; } - public int getPageNumber() { - return pageNumber; - } - - public void setPageNumber(int pageNumber) { - this.pageNumber = pageNumber; - } - public String getSendInfo() { return sendInfo; } @@ -214,4 +207,20 @@ public class FormConference { public void setTypeODT(boolean typeODT) { this.typeODT = typeODT; } + + public String getPageNumber() { + return pageNumber; + } + + public void setPageNumber(String pageNumber) { + this.pageNumber = pageNumber; + } + + public Integer getPageNumberChecked() { + return pageNumberChecked; + } + + public void setPageNumberChecked(Integer pageNumberChecked) { + this.pageNumberChecked = pageNumberChecked; + } } diff --git a/YACOSWeb/src/org/yacos/web/chairman/validation/ConferenceValidator.java b/YACOSWeb/src/org/yacos/web/chairman/validation/ConferenceValidator.java index ff07e14..193a81e 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/validation/ConferenceValidator.java +++ b/YACOSWeb/src/org/yacos/web/chairman/validation/ConferenceValidator.java @@ -79,7 +79,17 @@ public class ConferenceValidator implements Validator { } public void validateThirdPage(FormConference conference, Errors errors) { - + try { + String pageNumber = conference.getPageNumber(); + if (! pageNumber.equals("")) { + Integer i = new Integer(pageNumber); + conference.setPageNumberChecked(i); + } + else + conference.setPageNumberChecked(0); + } catch (NumberFormatException e) { + errors.rejectValue("pageNumber", "conference.errors.pageNumberNotValid"); + } } } diff --git a/YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java b/YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java index 473fffa..e974e9b 100644 --- a/YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java @@ -12,43 +12,53 @@ import org.apache.commons.logging.LogFactory; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; import org.yacos.core.conferences.IConferenceManager; +import org.yacos.core.users.IUserManager; +import org.yacos.web.system.session.SessionService; public class ListConferenceController implements Controller{ protected final Log logger = LogFactory.getLog(getClass()); private IConferenceManager conferenceManager; + private IUserManager userManager; + public IUserManager getUserManager() { + return userManager; + } + public void setUserManager(IUserManager userManager) { + this.userManager = userManager; + } public IConferenceManager getConferenceManager() { return conferenceManager; } public void setConferenceManager(IConferenceManager conferenceManager) { this.conferenceManager = conferenceManager; } - - + /** - * Generate list of conference fo can choose + * Generate list of conference */ public ModelAndView handleRequest(HttpServletRequest request, - HttpServletResponse response) throws Exception - { + HttpServletResponse response) throws Exception { - logger.info("Returning listConference view"); - - // List all conference - Map model = new HashMap(); - model.put("listConference", conferenceManager.getConferences()); - - // Error choose conference - String msgCode = request.getParameter("error"); - if (msgCode != null) - { - model.put("errorMessage", msgCode); + logger.info("Returning listConference view"); + + Map model = new HashMap(); + + // add list of conference + model.put("listConference", conferenceManager.getConferences()); + + // add list of role + model.put("listRole", userManager.getRolesForUser(SessionService.getInstance().getCurrentUserLogin())); + + // Error choose conference + String msgCode = request.getParameter("error"); + if (msgCode != null) + { + model.put("errorMessage", msgCode); + } + + + return new ModelAndView("listConference", model); } - - - return new ModelAndView("listConference", model); - } - }