From 87e83645118e0a12e4943293836e9885123404aa Mon Sep 17 00:00:00 2001 From: Frederic Debuire Date: Mon, 25 Feb 2008 23:22:25 +0000 Subject: [PATCH] =?UTF-8?q?Correction=20g=C3=A9n=C3=A9rale?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/classes/messages.properties | 27 +-- .../WebContent/WEB-INF/jsp/addConference.jsp | 3 - .../WebContent/WEB-INF/jsp/addConference2.jsp | 3 - .../WebContent/WEB-INF/jsp/addConference3.jsp | 2 - .../WebContent/WEB-INF/jsp/addConference4.jsp | 21 +- .../WebContent/WEB-INF/jsp/addConference5.jsp | 197 +++++++++--------- .../WebContent/WEB-INF/jsp/conflictList.jsp | 24 +-- .../WEB-INF/jsp/delegateArticle.jsp | 19 +- .../WebContent/WEB-INF/jsp/detailArticle.jsp | 38 +++- .../WEB-INF/jsp/dispatchArticle.jsp | 24 +-- YACOSWeb/WebContent/WEB-INF/jsp/forum.jsp | 34 ++- .../WebContent/WEB-INF/jsp/forumArticle.jsp | 5 +- .../WebContent/WEB-INF/jsp/listArticle.jsp | 15 +- .../WebContent/WEB-INF/jsp/listConference.jsp | 8 +- YACOSWeb/WebContent/WEB-INF/jsp/main.jsp | 12 +- .../WEB-INF/jsp/reportConfCreate.jsp | 12 +- .../WEB-INF/jsp/submissionArticle.jsp | 2 +- YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml | 6 + YACOSWeb/WebContent/images/1downarrow.png | Bin 0 -> 876 bytes YACOSWeb/WebContent/images/1uparrow.png | Bin 0 -> 932 bytes YACOSWeb/WebContent/images/Thumbs.db | Bin 98816 -> 0 bytes YACOSWeb/WebContent/images/agt_back.png | Bin 0 -> 1055 bytes YACOSWeb/WebContent/images/agt_forward.png | Bin 0 -> 1046 bytes .../WebContent/images/cc-kghostview-24x24.png | Bin 0 -> 1295 bytes YACOSWeb/WebContent/images/cc-wp-24x24.png | Bin 0 -> 1661 bytes .../EvaluationRemoveController.java | 17 +- .../controller/ForumArticleController.java | 22 +- .../PCmember/controller/ForumController.java | 39 +++- .../web/PCmember/form/ArticleForumBean.java | 23 ++ .../validation/ForumArticleValidator.java | 18 ++ .../controller/DetailArticleController.java | 9 +- .../controller/AddConferenceController.java | 34 +-- 32 files changed, 372 insertions(+), 242 deletions(-) create mode 100644 YACOSWeb/WebContent/images/1downarrow.png create mode 100644 YACOSWeb/WebContent/images/1uparrow.png delete mode 100644 YACOSWeb/WebContent/images/Thumbs.db create mode 100644 YACOSWeb/WebContent/images/agt_back.png create mode 100644 YACOSWeb/WebContent/images/agt_forward.png create mode 100644 YACOSWeb/WebContent/images/cc-kghostview-24x24.png create mode 100644 YACOSWeb/WebContent/images/cc-wp-24x24.png create mode 100644 YACOSWeb/src/org/yacos/web/PCmember/form/ArticleForumBean.java create mode 100644 YACOSWeb/src/org/yacos/web/PCmember/validation/ForumArticleValidator.java diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index 7947951..8c4b025 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -268,31 +268,34 @@ invitation.send=Send an invitation #ConflictList ConflictList.list1=Members of the conference -ConflictList.list2=ConflictList of the article -ConflictList.choose=manage the conflict list of the conference's articles -ConflictList.help=Click to an article to edit the conflict list +ConflictList.list2=Members you have excluded +ConflictList.choose=Manage the conflict list +ConflictList.help=Click on an article to edit the conflict list #DispatchMembers members.list1=Members of the conference -members.list2=Members associate to the article +members.list2=Members you have associated dipatchArticle.description=Article's description -dipatchArticle.choose=Dispatch the articles between the members -disptachArticle.help=Click to an article to dispatch the members +dipatchArticle.choose=Dispatch the articles amongst the members +disptachArticle.help=Click on an article to dispatch it to the members #DelegateArticles -delegateArticles.choose=delegate the articles between to the referees -delegateArticles.list1= referees of the conference -delegateArticles.list2= referees associated to this article -delegateArticles.help=Click to an article to delegate it to the referees +delegateArticles.choose=Delegate the articles amongst the referees +delegateArticles.list1= Referees of the conference +delegateArticles.list2= Referees you have associated +delegateArticles.help=Click on an article to delegate it to the referees #valider les articles -validate.download=download the article +validate.download=Download the article validate.report=View the result of the evaluation validate.validate=Validate validate.reject=Reject +#forum validation +forum.validation=You must write a message + #report des evaluations -report.headPage=Here is the list of the evaluation +report.headPage=Report's list report.referee=Evaluated by #detail d'un article diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp index 153a4c1..19abd81 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp @@ -63,8 +63,5 @@ -
-">Home - diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp index 28e0871..db0eafe 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp @@ -77,9 +77,6 @@ -
-">Home - diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp index 0fbc0fe..e48ebf7 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp @@ -62,7 +62,5 @@ -">Home - \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp index d129227..4787a17 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp @@ -171,7 +171,20 @@ var CritereManager = Class.create({ - + + + + +
+ Sorry, you can't modify anymore this part of the conference because the call for paper is already over. +
+ + + + + + + @@ -272,9 +285,9 @@ var CritereManager = Class.create({ - -">Home + + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp index 84c1c2f..6099bd2 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp @@ -117,100 +117,109 @@ function filterUser(el, value) { - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
<fmt:message key=" src="./images/search.png"/> -
-
- - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - -
-
-
-
-
- " />
-
  -
- - - - - -
-
-">Home + + + + +
+ Sorry, you can't modify anymore this part of the conference because the call for paper is already over. +
+ + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
<fmt:message key=" src="./images/search.png"/> +
+
+ + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + +
+
+
+
+
+ " />
+
  +
+ + + + + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp index 83eaac9..4a2ea67 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp @@ -170,35 +170,27 @@
- - + - +
title : ${article.title} -
theme: ${article.topic} -
main author: ${article.mainAuthor.firstName}${article.mainAuthor.lastName} - - -
secondaries authors: - -
${author} - - + 		${article.title} by ${article.mainAuthor.firstName} ${article.mainAuthor.lastName} + article's detail