From 0f4e1c1fa0fa45a70bc86a7800800363be52d40f Mon Sep 17 00:00:00 2001
From: Frederic Debuire <frederic.debuire@gmail.com>
Date: Sat, 23 Feb 2008 22:00:43 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20d'un=20menu=20main=20avec=20l'userBoard?=
 =?UTF-8?q?=20et=20les=20infos=20de=20la=20conf.=20Ajout=20d'un=20bouton?=
 =?UTF-8?q?=20back=20lors=20d'une=20=C3=A9valuation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/classes/messages.properties       |  5 +++++
 .../WEB-INF/decorators/usermenu.jsp           | 14 +++++++++++++
 .../WebContent/WEB-INF/jsp/createReport.jsp   | 13 +++++++++++-
 .../controller/EvaluationController.java      | 21 +++++++++++++++++--
 4 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index ac3e93d..4ad010d 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -60,6 +60,11 @@ user.information.followconference={0,choice, 0#You don''t have any conference  |
 
 ###################
 # USER MENU
+
+menu.general.title=Main
+menu.general.userBoard=User Board
+menu.general.confInfo=Conference's informations
+
 menu.chairman.title=Chairman
 menu.chairman.conference.create=Create new conference
 menu.chairman.conference.modify=Modify this conference
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
index 462eab0..e193ec6 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
@@ -12,6 +12,20 @@
 	
 	<c:if test="${currentConferenceId != null}">
 	
+	
+	<!--  MENU : ROLE_USER for general option -->
+	<authz:authorize ifAllGranted="ROLE_USER">
+		<div id="mainmenubloc">
+			<h4><fmt:message key="menu.general.title" /></h4>
+				<ul>
+					<li><a href="<c:url value="userBoard.htm"/>"><fmt:message key="menu.general.userBoard" /></a></li>
+					<li><a href="<c:url value="main.htm"/>"><fmt:message key="menu.general.confInfo" /></a></li>
+				</ul>
+				<div id="footer"></div>
+		</div>
+	</authz:authorize>
+	
+	
 	<!-- MENU : CHAIRMAN -->
 	<authz:authorize ifAllGranted="ROLE_CHAIRMAN">
 		<div id="mainmenubloc">
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp
index ef2fddb..81a97f9 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/createReport.jsp
@@ -6,6 +6,11 @@
 
 <h4 class="title"><fmt:message key="evaluation.headPage" /></h4>
 
+<p class="formOk">
+	You have successfully evaluated the article.<br/>
+	You can modify your evaluation immediately or later.<br/>
+</p>
+
 <table>
 	<tr>
 		<td><fmt:message key="evaluation.titleArticle" /></td>
@@ -29,9 +34,15 @@
 		<td><fmt:message key="evaluation.commentAuthor" /></td>
 		<td>${report.commentAuthor}</td>
 	</tr>
+	
+	<tr>
+		<td colspan="2">
+			<a class="back_link" href="<c:url value="${whereIcome}"/>">Modify the evaluation</a>
+		</td>
+	</tr>
 </table>
 
-<a href="<c:url value="main.htm"/>">Home</a>
+
 
 </body>
 </html>
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
index eda96d3..baaf0a9 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
@@ -1,7 +1,10 @@
 package org.yacos.web.PCmember.controller;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
@@ -201,8 +204,16 @@ public class EvaluationController  extends SimpleFormController {
 
 				article.setState(State.EVALUATED);
 				articleManager.updateArticle(article);
+				
+				Map<String, Object> model = new HashMap<String, Object>();
+				model.put("report", rpt);
+				
+				String addrFrom = request.getHeader("REFERER");
+				addrFrom = addrFrom + "&action=modify";
+				
+				model.put("whereIcome", addrFrom);
 
-				return new ModelAndView("createReport", "report", rpt);
+				return new ModelAndView("createReport", model);
 
 			}
 			catch (NumberFormatException e) {
@@ -262,8 +273,14 @@ public class EvaluationController  extends SimpleFormController {
 				for (Rating rt : ratings) {
 					evaluationManager.updateRating(rt);
 				}
+				
+				Map<String, Object> model = new HashMap<String, Object>();
+				model.put("report", rpt);
+				
+				String addrFrom = request.getHeader("REFERER");				
+				model.put("whereIcome", addrFrom);
 
-				return new ModelAndView("createReport", "report", rpt);
+				return new ModelAndView("createReport", model);
 
 			}
 			catch (NumberFormatException e) {