From 6d1040009a3b8dad12034d75cc129ab3f6e89082 Mon Sep 17 00:00:00 2001
From: Nicolas Michard <nicolas.michard@gmail.com>
Date: Mon, 25 Feb 2008 15:48:05 +0000
Subject: [PATCH] validate article table

---
 .../WEB-INF/jsp/validateArticle.jsp           | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
index 67b593c..6e4f59b 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
@@ -13,17 +13,25 @@
 	<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>
+			<td colspan="3"><b>${article.title}</b></td>
 		</tr>
-		<tr>
-			<td colspan="2">
+		<tr>
+		<td width="25%">
+			Author :<br />
+			${article.mainAuthor.firstName} ${article.mainAuthor.lastName}
+		</td>
+		<td  width="50%">
+			<a class="download" title="Download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download</a>
+		</td>
+		<td width="25%" valign="bottom">
+		
 			<c:choose>
 				<c:when test="${article.state != 'REJECTED' and article.state != 'ACCEPTED'}">
 					<a href="<c:url value="validateOrReject.htm?value=valide&id=${article.id}"/>"
 						onclick="return confirm('You are about to validate this article. This operation cannot be undone. Do you want to continue ?')">
 					<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}"/>"
+					<br />
+					<a href="<c:url value="validateOrReject.htm?value=reject&id=${article.id}"/>"
 						onclick="return confirm('You are about to reject this article. This operation cannot be undone. Do you want to continue ?')">
 						<fmt:message key="validate.reject" /><img src="./images/cancel.png" alt="Reject" /></a>
 				</c:when>
@@ -37,23 +45,19 @@
 					State: ${article.state}
 				</c:otherwise>
 			</c:choose>
-			</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>	
-			<c:if test="${article.state == 'EVALUATED' or article.state == 'REJECTED' or article.state == 'ACCEPTED'}">
-				<td><a href="<c:url value="listReport.htm?id=${article.id}"/>"><fmt:message	key="validate.report" /></a></td>
-			</c:if>
-			<c:if test="${article.state == 'SUBMITED'}">
-				<td>&nbsp;</td>
-			</c:if>	
-		</tr>
+		
+		</td>
+		</tr>
+		<c:if test="${article.state == 'EVALUATED' or article.state == 'REJECTED' or article.state == 'ACCEPTED'}">
+			<tr>
+				<td colspan="3">
+					<a href="<c:url value="listReport.htm?id=${article.id}"/>"><fmt:message	key="validate.report" /></a>
+				</td>
+			</tr>
+		</c:if>
 		</table>
 	</div>
 </c:forEach>
 
-
-<a href="<c:url value="main.htm"/>">Home</a>
 </body>
 </html>
\ No newline at end of file