Index: lams_tool_lamc/web/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/CombinedAnswersContent.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/CombinedAnswersContent.jsp	14 Nov 2005 17:54:48 -0000	1.3
+++ lams_tool_lamc/web/CombinedAnswersContent.jsp	14 Nov 2005 18:44:10 -0000	1.4
@@ -4,30 +4,77 @@
 <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
 
-			<tr> <td>
-			<table>
-				<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
+	<!--options content goes here-->
+				<table align=center>
+					  <tr>
+					  	<td align=left class="input" valign=top bgColor="#333366" colspan=2> 
+						  	<font size=2 color="#FFFFFF"> <b>  <bean:message key="label.assessment"/> </b> </font>
+					  	</td>
+					  </tr>
+					  
+
+			 		<c:if test="${sessionScope.isRetries == 'true'}"> 		
+					  <tr>
+					  	<td align=center class="input" valign=top colspan=2> 
+						  	<font size=3> <b>  <bean:message key="label.withRetries"/> </b> </font>
+					  	</td>
+					  </tr>
+					</c:if> 			
+				
+					<c:if test="${sessionScope.isRetries == 'false'}"> 		
+					  <tr>
+					  	<td align=center class="input" valign=top colspan=2> 
+						  	<font size=3> <b>  <bean:message key="label.withoutRetries"/> </b> </font>
+					  	</td>
+					  </tr>
+					</c:if> 			
+
+			 		<c:if test="${sessionScope.isRetries == 'true'}"> 		
+					  <tr>
+					  	<td align=left class="input" valign=top colspan=2> 
+						  	<font size=2> <b>  <bean:message key="label.learner.message"/> (<c:out value="${sessionScope.passMark}"/><bean:message key="label.percent"/> ) 
+						  	</b> </font>
+					  	</td>
+					  </tr>
+					</c:if> 								  
+				
+					<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 						  <tr>
-						  	<td colspan=2> Question <c:out value="${questionEntry.key}"/>: <c:out value="${questionEntry.value}"/>
+						  	<td align=left class="input" valign=top bgColor="#009999" colspan=2> 
+							  	<font color="#FFFFFF"> 
+							  		<c:out value="${questionEntry.value}"/> 
+							  	</font> 
+						  	</td>
 						  </tr>
-						  <tr> 
-					 		<td> <fmt:message key="label.answers"/> </td>
-					 		<td>
-					 			<input type="text" name="answer<c:out value="${questionEntry.key}"/>" size="60" maxlength="255" value=""/> 
-					 		</td>
-					  	  </tr>
-					  	  <tr><td> &nbsp </td> </tr>
-				</c:forEach>
-			</table>
-			
-			<hr>
-			<table>
-			<tr>
-				 <td> 
-				 	 <html:submit property="submitAnswersContent" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
-						<bean:message key="button.submitAllContent"/>
-					</html:submit>
-				</td> 
-			</tr>
-			</table>
-			
+					</c:forEach>
+					
+
+		  	 		<c:set var="queIndex" scope="session" value="0"/>
+					<c:forEach var="optionEntry" items="${sessionScope.mapOptionsContent}">
+						<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
+						<tr> 
+							<td align=left class="input" valign=top> 
+								<input type="checkbox" name=optionCheckBox<c:out value="${queIndex}"/>> 
+							</td> 
+							<td align=left class="input" valign=top> 
+								<c:out value="${optionEntry.value}"/>
+							</td>
+						</tr>
+					</c:forEach>
+
+			  	   	<tr> 
+				 		<td colspan=2 class="input" valign=top> 
+				 		&nbsp
+				 		</td>
+			  	   </tr>
+			  	   
+	  	   		  <tr>
+				  	<td colspan=2 align=right class="input" valign=top> 
+			  			<html:submit property="continueOptions" styleClass="a.button">
+							<bean:message key="button.continue"/>
+						</html:submit>	 				 		  					
+				  	 </td>
+				  </tr>
+				</table>
+	<!--options content ends here-->
+