Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	17 Sep 2006 06:23:44 -0000	1.15
+++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	2 Oct 2006 01:59:55 -0000	1.16
@@ -18,14 +18,7 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-logic-el" prefix="logic-el" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
@@ -64,8 +57,8 @@
 			 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true' && mcGeneralLearnerFlowDTO.passMark != '0'}"> 		
 					  <tr>
 					  	<td NOWRAP align=left valign=top colspan=2> 
-						  	 <b>  <bean:message key="label.learner.message"/> (<c:out value="${mcGeneralLearnerFlowDTO.passMark}"/>
-						  	 <bean:message key="label.percent"/> )  </b>
+						  	 <b>  <bean:message key="label.learner.message"/> ( <c:out value="${mcGeneralLearnerFlowDTO.passMark}"/> )  </b>
+						  	 
 					  	</td>
 					  </tr>
 					</c:if>
@@ -76,8 +69,8 @@
 								<c:forEach var="dto" varStatus="status" items="${requestScope.listQuestionCandidateAnswersDto}">
 									  <tr>
 									  	<td NOWRAP align=left valign=top> 
-										  		<c:out value="${dto.question}"/> &nbsp[ <b> <bean:message key="label.weight"/> : </b>
-										  		<c:out value="${dto.weight}"/> ]
+										  		<c:out value="${dto.question}"  escapeXml="false" /> &nbsp[ <b> <bean:message key="label.mark"/> </b>
+										  		<c:out value="${dto.mark}"/> ]
 									  	</td>
 									  </tr>