diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index 5ca8d88..f7a101f 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -246,7 +246,7 @@ evaluation.headPage=Here is a report of the evaluation evaluation.titleArticle=The title of article is evaluation.note=The note for the criterion evaluation.thisArticle=evaluate this article -evaluation.choose=Choose a article to evaluate +evaluation.choose=Choose an article to evaluate evaluation.help=Choose an article that you would like to evaluate invitation.send=Send an invitation @@ -273,8 +273,8 @@ delegateArticles.help=Click to an article to delegate it to the referees #valider les articles validate.download=download the article validate.report=View the result of the evaluation -validate.validate=validate -validate.reject=reject +validate.validate=Validate +validate.reject=Reject #report des evaluations report.headPage=Here is the list of the evaluation diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp index 6af924b..0464274 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp @@ -25,7 +25,7 @@

- 404
+ 404
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp index f04719a..92fd08d 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp @@ -6,39 +6,44 @@

: ${evaluationForm.title}

- + + +

Rating

+
- - - - - - - +
+ ${criterion.name} + + + + + + +
+ - - - - + + +

Commentary

+
+ +
+ + +
-
- - - -
${criterion.name} - - - - -
- - - - "/> +
+ + +
+ +
+ +"/>
- - + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp index 2defb95..b7aa859 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp @@ -1,4 +1,4 @@ - <%@ include file="/WEB-INF/decorators/include.jsp"%> +<%@ include file="/WEB-INF/decorators/include.jsp"%> @@ -12,29 +12,39 @@

-