From 12c8adc4e0e1dcb4928ee2eb22878128085e7228 Mon Sep 17 00:00:00 2001 From: Maxime Dagnicourt Date: Fri, 22 Feb 2008 13:39:37 +0000 Subject: [PATCH] --- .../WEB-INF/classes/messages.properties | 10 +- .../WEB-INF/decorators/usermenu.jsp | 1 + .../WebContent/WEB-INF/jsp/conflictList.jsp | 214 ++++++++++++++++++ .../WEB-INF/jsp/delegateArticle.jsp | 75 +++--- .../WEB-INF/jsp/dispatchArticle.jsp | 49 ++-- YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml | 12 + .../controller/DelegateArticleController.java | 34 ++- .../controller/ConflictListController.java | 142 ++++++++++++ .../controller/DispatchArticleController.java | 2 +- 9 files changed, 461 insertions(+), 78 deletions(-) create mode 100644 YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp create mode 100644 YACOSWeb/src/org/yacos/web/chairman/controller/ConflictListController.java diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index c238035..5ca8d88 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -65,6 +65,7 @@ menu.chairman.conference.create=Create new conference menu.chairman.conference.modify=Modify this conference menu.chairman.article.dispatch=Dispatch articles menu.chairman.article.validate=Validate articles +menu.chairman.article.conflict=Manage the conflict list menu.pcmember.title=PC Member menu.pcmember.article.preference=Article's preference @@ -250,19 +251,24 @@ evaluation.help=Choose an article that you would like to evaluate 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 conclict list #DispatchMembers members.list1=Members of the conference members.list2=Members associate to the article dipatchArticle.description=Article's description dipatchArticle.choose=Dispatch the articles between the members -disptachArticle.help=Click on an article to dispatch the members +disptachArticle.help=Click to an article to dispatch the members #DelegateArticles delegateArticles.choose=delegate the articles between to the referees delegateArticles.list1= referees of the conference delegateArticles.list2= referees aassociate to the article -delegateArticles.help=Click on an article to delegate it to the referees +delegateArticles.help=Click to an article to delegate it to the referees #valider les articles validate.download=download the article diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp index 7ff9b0c..be41143 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp @@ -23,6 +23,7 @@
  • ">
  • ">
  • ">
    • +
  • ">
    • diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp new file mode 100644 index 0000000..22aa3aa --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp @@ -0,0 +1,214 @@ +<%@ include file="/WEB-INF/decorators/include.jsp"%> + + + + + + + + + + + + +

    +

    + +

    + +
    +
    +
    + + + + + + +
    title : ${article.title} +
    theme: ${article.topic} +
    main author: ${article.mainAuthor.firstName}${article.mainAuthor.lastName} + + +
    secondaries authors: + +
    ${author} +     +     +     		download the article
    +
    + +
    +
    +     + + + diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp index cbe73eb..d9351ea 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp @@ -6,7 +6,7 @@ - + @@ -175,32 +173,41 @@

    -
    +
    -

    - - title : ${article.title} -
    theme: ${article.topic} -
    main author: ${article.mainAuthor.firstName}{article.mainAuthor.lastName} - download the article - -

    + + + + + + +
    title : ${article.title} +
    theme: ${article.topic} +
    main author: ${article.mainAuthor.firstName}${article.mainAuthor.lastName} + + +
    secondaries authors: + +
    ${author} +     +     +     		download the article