christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modification de la validation : mise en page et test d'erreur

Browse Source 
Modification de l'évaluation : mise en page, ajout d'image pour chaque état de l'article.
This commit is contained in:
Frederic Debuire
2008-02-22 23:06:05 +00:00
parent 8ce437a1d3
commit 25c6db06a2
12 changed files with 140 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp
View File

@@ -25,7 +25,7 @@
<h1>
<a href="main.htm">
<img src="./images/404.jpg" alt="404" /><br/>
<img border="0" src="./images/404.jpg" alt="404" /><br/>

61
YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
View File

@@ -6,39 +6,44 @@
<h4 class="title"><fmt:message key="evaluation.title"/>: ${evaluationForm.title}</h4>
<form:form method="post" commandName="evaluationForm">
<form:form method="post" commandName="evaluationForm" id="account_data">
<p class="legend">Rating</p>
<fieldset>
<table>
<c:forEach items="${evaluationForm.simpleRatings}" var="criterion" varStatus="j">
<tr>
<td>${criterion.name}</td>
<form:hidden path="simpleRatings[${j.index}].name"></form:hidden>
<td>
<c:forEach var="i" begin="${criterion.min_rating}" end="${criterion.max_rating}" step="1">
<c:out value="${i}"/>
<form:radiobutton path="simpleRatings[${j.index}].value" value="${i}" />
</c:forEach>
</td>
</tr>
<div>
<form:label path="title">${criterion.name}</form:label>
<form:hidden path="simpleRatings[${j.index}].name"></form:hidden>
<form:label path="simpleRatings[${j.index}].name"><form:select path="simpleRatings[${j.index}].value">
<c:forEach var="i" begin="${criterion.min_rating}" end="${criterion.max_rating}" step="1">
<form:option value="${i}"></form:option>
</c:forEach>
</form:select></form:label>
</div>
</c:forEach>
<tr>
<td><fmt:message key="evaluation.commentAuthor"/></td>
<td><form:textarea path="commentAuthor"/></td>
</tr>
</fieldset>
<p class="legend">Commentary</p>
<fieldset>
<div>
<form:label path="commentAuthor"><fmt:message key="evaluation.commentAuthor"/></form:label>
<form:textarea path="commentAuthor" cols="60" rows="10"/>
</div>
<tr>
<td><fmt:message key="evaluation.commentPCMember"/></td>
<td><form:textarea path="commentPCMember"/></td>
<tr>
</table>
<input type="submit" name="submit" value="<fmt:message key="button.OK"/>"/>
<div>
<form:label path="commentPCMember"><fmt:message key="evaluation.commentPCMember"/></form:label>
<form:textarea path="commentPCMember" cols="60" rows="10"/>
</div>
</fieldset>
<input type="submit" name="submit" value="<fmt:message key="button.OK"/>"/>
</form:form>
</body>
</html>
</body>
</html>

50
YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
View File

@@ -1,4 +1,4 @@
<%@ include file="/WEB-INF/decorators/include.jsp"%>
<%@ include file="/WEB-INF/decorators/include.jsp"%>
<html>
<head></head>
@@ -12,29 +12,39 @@
</p>
<c:forEach items="${listArticle}" var="article">
<ul class="article">
<li class="title">Title: <a href="<c:url value="${article.URL_article}"/>">${article.title}</a></li>
<li class="author">Author: <b>${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</b></li>
<li class="topic">Topic: <b>${article.topic}</b></li>
<c:choose>
<c:when test="${article.state eq 'SUBMITED'}">
<li class="article_url"><a title="Click to evaluate" href="<c:url value="evaluation.htm?id=${article.id}"/>"><img src="./images/cc-kedit-128x128.png" alt="Click to evaluate" /></a></li>
</c:when>
<div style="border: 1px solid orange;">
<table style="width: 100%">
<tr>
<td colspan="2" align="center">
<a title="Download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>"><b>${article.title}</b></a> by ${article.mainAuthor.firstName} ${article.mainAuthor.lastName}
</td>
</tr>
<tr>
<td align="left">
Topic: <b>${article.topic}</b><br/>
Abstract: ${article.abstractText}
</td>
<td align="right">
<c:if test="${article.state eq 'SUBMITED'}">
<a title="Click to evaluate" href="<c:url value="evaluation.htm?id=${article.id}"/>">Evaluate <img src="./images/button_follow_32x32.png" alt="Click to evaluate" /></a>
</c:if>
<c:otherwise>
<li class="article_url"><a title="Click to modify evaluation" href="<c:url value="evaluation.htm?id=${article.id}"/>"><img src="./images/cc-button_ok-128x128.png" alt="Click to modify evaluation" /></a></li>
</c:otherwise>
</c:choose>
<c:if test="${article.state eq 'EVALUATED'}">
<a title="Click to modify evaluation" href="<c:url value="evaluation.htm?id=${article.id}"/>">Modify the evaluation <img src="./images/cc-kedit-32x32.png" alt="Click to modify evaluation" /></a>
</c:if>
<c:if test="${article.state eq 'REJECTED'}">
Rejected <img src="./images/cancel32.png" alt="This article has been rejected" />
</c:if>
</ul>
<br />
<hr />
<br />
<c:if test="${article.state eq 'ACCEPTED'}">
Accepted <img src="./images/ok32.png" alt="This article has been accepted" />
</c:if>
</td>
</tr>
</table>
</div>
</c:forEach>
</body>
</html>

2
YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
View File

@@ -47,7 +47,7 @@
<span class="formError"><form:errors path="theme" /></span>
</div>
<div>
<form:label path="theme"><fmt:message key="form.submission.article.abstractText" /></form:label>
<form:label path="abstractText"><fmt:message key="form.submission.article.abstractText" /></form:label>
<form:textarea path="abstractText" cols="60" rows="10" />*<br />
<span class="abstractText"><form:errors path="theme" /></span>
</div>

41
YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
View File

@@ -2,22 +2,37 @@
<html>
<head></head>
<body>
<h4 class="title">NO NAME</h4>
<br>
<body>
<h4 class="title">Validate an article</h4>
<p class="formHelp">
Choose whether you want to validate an article (i.e. the article will take part in the conference) or reject it.
</p>
<c:forEach items="${listArticleValidate}" var="article">
<ul class="article">
<li class="title">TiTle: ${article.title} </li>
<li class="author">Author: ${article.mainAuthor}</li>
<li class="topic">Topic: ${article.topic}</li>
<li class="state">State: ${article.state} <a href="<c:url value="validateOrReject.htm?value=valide&id=${article.id}"/>"><fmt:message key="validate.validate"/></a>
<a href="<c:url value="validateOrReject.htm?value=reject&id=${article.id}"/>"><fmt:message key="validate.reject"/></a> </li>
<li class="article_url"><a href="<c:url value="${article.URL_article}"/>"><fmt:message key="validate.download"/></a> <a href="<c:url value="listReport.htm?id=${article.id}"/>"><fmt:message key="validate.report"/></a></li>
</ul>
<div style="border: 1px solid orange;">
<table style="width: 100%; text-align: center;">
<tr>
<td><b>${article.title}</b></td>
<td>${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</td>
</tr>
<tr>
<td colspan="2">State: ${article.state}
<a href="<c:url value="validateOrReject.htm?value=valide&id=${article.id}"/>">
<fmt:message key="validate.validate" /><img src="./images/ok.png" alt="Validate" /></a>
<a href="<c:url value="validateOrReject.htm?value=reject&id=${article.id}"/>">
<fmt:message key="validate.reject" /><img src="./images/cancel.png" alt="Reject" /></a></td>
</tr>
<tr>
<td><a title="Download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download<img
src="./images/cc-download_manager-32x32.png" alt="Download" /></a></td>
<td><a href="<c:url value="listReport.htm?id=${article.id}"/>"><fmt:message key="validate.report" /></a></td>
</tr>
</table>
</div>
</c:forEach>
<a href="<c:url value="main.htm"/>">Home</a>
</body>
</html>