Index: lams_tool_chat/web/pages/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/learning/defineLater.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_chat/web/pages/learning/defineLater.jsp	28 Sep 2006 23:29:57 -0000	1.3
+++ lams_tool_chat/web/pages/learning/defineLater.jsp	27 Oct 2006 08:27:07 -0000	1.4
@@ -1,11 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<h1>
-	<fmt:message key="activity.title" />
-</h1>
-
 <div id="content">
-	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet"/>
+	<h1>
+		<fmt:message key="activity.title" />
+	</h1>
+	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
 </div>
 
 
Index: lams_tool_chat/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/learning/notebook.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_chat/web/pages/learning/notebook.jsp	25 Oct 2006 05:35:05 -0000	1.4
+++ lams_tool_chat/web/pages/learning/notebook.jsp	27 Oct 2006 08:27:07 -0000	1.5
@@ -1,28 +1,26 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <div id="content">
-<h1>
-	${chatDTO.title}
-</h1>
+	<h1>
+		${chatDTO.title}
+	</h1>
 
 	<html:form action="/learning" method="post">
-	
-					<p class="small-space-top"><lams:out value="${chatDTO.reflectInstructions}"/>
-					</p>			
-			
-					<html:textarea cols="60" rows="8" property="entryText" styleClass="text-area"></html:textarea>
-			
-			
-			<div align="right" class="space-bottom-top">
-					<html:hidden property="dispatch" value="submitReflection" />
-					<html:hidden property="chatUserUID" />
-					<html:submit styleClass="button">
-						<fmt:message>button.finish</fmt:message>
-					</html:submit>
-		 </div>
-	
-		 
-		 
+
+		<p class="small-space-top">
+			<lams:out value="${chatDTO.reflectInstructions}" />
+		</p>
+
+		<html:textarea cols="60" rows="8" property="entryText"
+			styleClass="text-area"></html:textarea>
+
+		<div align="right" class="space-bottom-top">
+			<html:hidden property="dispatch" value="submitReflection" />
+			<html:hidden property="chatUserUID" />
+			<html:submit styleClass="button">
+				<fmt:message>button.finish</fmt:message>
+			</html:submit>
+		</div>
 	</html:form>
 </div>
 
Index: lams_tool_chat/web/pages/learning/runOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/learning/Attic/runOffline.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_chat/web/pages/learning/runOffline.jsp	28 Sep 2006 23:29:57 -0000	1.6
+++ lams_tool_chat/web/pages/learning/runOffline.jsp	27 Oct 2006 08:27:07 -0000	1.7
@@ -1,22 +1,16 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<h1>
-	<fmt:message key="activity.title" />
-</h1>
-
 <div id="content">
+	<h1>
+		<fmt:message key="activity.title" />
+	</h1>
+	
+	<p>
+		<fmt:message key="message.runOfflineSet" />
+	</p>
 
-	<table>
-		<tr>
-			<td>
-				<fmt:message key="message.runOfflineSet" />
-			</td>
-		</tr>
-	</table>
-
 	<c:if test="${MODE == 'learner' || MODE == 'author'}">
 		<%@ include file="parts/finishButton.jsp"%>
 	</c:if>
-	<div class="space-bottom"></div>
 </div>
 
Index: lams_tool_forum/web/jsps/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/definelater.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/learning/definelater.jsp	28 Sep 2006 23:30:18 -0000	1.6
+++ lams_tool_forum/web/jsps/learning/definelater.jsp	27 Oct 2006 08:27:45 -0000	1.7
@@ -1,11 +1,10 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-<h1>&nbsp;</h1>
-
-
-
 <div id="content">
-	<lams:DefineLater/>
+	<h1>
+		<fmt:message key="activity.title" />
+	</h1>
+	<lams:DefineLater />
 </div>
 
 
Index: lams_tool_forum/web/jsps/learning/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/Attic/runoffline.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/web/jsps/learning/runoffline.jsp	6 Oct 2006 02:48:18 -0000	1.8
+++ lams_tool_forum/web/jsps/learning/runoffline.jsp	27 Oct 2006 08:27:45 -0000	1.9
@@ -1,48 +1,43 @@
 <%@ include file="/includes/taglibs.jsp"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<h1>
-	<fmt:message key="activity.title" />
-</h1>
+<div id="content">
 
+	<h1>
+		<fmt:message key="activity.title" />
+	</h1>
 
+	<p>
+		<fmt:message key="run.offline.message" />
+	</p>
 
-<div id="content">
-	<table>
-		<tr>
-			<td>
-				<h2>
-					<fmt:message key="run.offline.message" />
-				</h2>
-			</td>
-		</tr>
-	</table>
-
-	<div class="right-buttons">
+	<div align="right" class="space-bottom-top">
 		<c:set var="continue">
-			<html:rewrite page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
+			<html:rewrite
+				page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
 		</c:set>
 		<c:set var="finish">
 			<html:rewrite page="/learning/finish.do?sessionMapID=${sessionMapID}" />
 		</c:set>
 
-		<div class="buttons-right">
-			<c:choose>
-				<c:when test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
-					<html:button property="continue" onclick="javascript:location.href='${continue}';"  styleClass="button">
-						<fmt:message key="label.continue" />
-					</html:button>
-				</c:when>
-				<c:otherwise>
-					<html:button property="finish" onclick="javascript:location.href='${finish}';" styleClass="button">
-						<fmt:message key="label.finish" />
-					</html:button>
-				</c:otherwise>
-			</c:choose>
-		</div>
-	</div>
+		<c:choose>
+			<c:when
+				test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
+				<html:button property="continue"
+					onclick="javascript:location.href='${continue}';"
+					styleClass="button">
+					<fmt:message key="label.continue" />
+				</html:button>
+			</c:when>
+			<c:otherwise>
+				<html:button property="finish"
+					onclick="javascript:location.href='${finish}';" styleClass="button">
+					<fmt:message key="label.finish" />
+				</html:button>
+			</c:otherwise>
+		</c:choose>
 
-	<div class="space-bottom"></div>
+	</div>
 </div>
 
 
Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.18 -r1.19
--- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	25 Oct 2006 08:50:40 -0000	1.18
+++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	27 Oct 2006 08:28:18 -0000	1.19
@@ -41,8 +41,6 @@
 		
 		
 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
-		
-		
 			<p>
 				<strong> <fmt:message key="label.withRetries" /> </strong>
 			</p>
@@ -75,8 +73,8 @@
 		
 			<div class="shading-bg">
 				<c:out value="${dto.question}" escapeXml="false" />
-				&nbsp; [
-				<fmt:message key="label.mark" />
+				 [
+				<strong><fmt:message key="label.mark" /></strong>
 				<c:out value="${dto.mark}" />
 				]
 			</div>
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/IndividualLearnerResults.jsp,v
diff -u -r1.32 -r1.33
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	25 Oct 2006 08:50:40 -0000	1.32
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	27 Oct 2006 08:28:18 -0000	1.33
@@ -100,9 +100,9 @@
 				</c:if>
 			</p>
 
-			<div class="field-name" style="margin-bottom:-20px;">
+			<h4>
 				<fmt:message key="label.yourAnswers" />
-			</div>
+			</h4>
 
 
 
Index: lams_tool_lamc/web/learning/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Notebook.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/web/learning/Notebook.jsp	25 Oct 2006 08:50:40 -0000	1.7
+++ lams_tool_lamc/web/learning/Notebook.jsp	27 Oct 2006 08:28:18 -0000	1.8
@@ -35,44 +35,49 @@
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css/>
-	<title><fmt:message key="activity.title" /></title>
+	<lams:css />
+	<title><fmt:message key="activity.title" />
+	</title>
 </head>
 
 <body class="stripes">
-	
-	<html:form  action="/learning?method=displayMc&validate=false" enctype="multipart/form-data" method="POST" target="_self">
-		<html:hidden property="toolContentID"/>						
-		<html:hidden property="toolSessionID"/>						
-		<html:hidden property="httpSessionID"/>			
-		<html:hidden property="userID"/>								
-		
+
+	<html:form action="/learning?method=displayMc&validate=false"
+		enctype="multipart/form-data" method="POST" target="_self">
+		<html:hidden property="toolContentID" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="httpSessionID" />
+		<html:hidden property="userID" />
+
 		<div id="content">
-			
-		<h1>
-			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false"/> 		
-		</h1>
-		
 
-		
-					<p>
-					<c:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false"/> 
-				</p>
-				
-					<html:textarea cols="60" rows="8" property="entryText" styleClass="text-area"></html:textarea>
-			
-				<div align="right" class="space-bottom-top">
-					<html:submit property="submitReflection" styleClass="button">					
-						<fmt:message key="button.endLearning"/>
-					</html:submit>
-				</div>
+			<h1>
+				<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}"
+					escapeXml="false" />
+			</h1>
 
-		
+
+
+			<p>
+				<c:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}"
+					escapeXml="false" />
+			</p>
+
+			<html:textarea cols="60" rows="8" property="entryText"
+				styleClass="text-area"></html:textarea>
+
+			<div align="right" class="space-bottom-top">
+				<html:submit property="submitReflection" styleClass="button">
+					<fmt:message key="button.endLearning" />
+				</html:submit>
+			</div>
+
+
 		</div>
-	</html:form>	
-	
+	</html:form>
 
 
+
 </body>
 </html:html>
 
Index: lams_tool_lamc/web/learning/ResultsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/ResultsSummary.jsp,v
diff -u -r1.25 -r1.26
--- lams_tool_lamc/web/learning/ResultsSummary.jsp	25 Oct 2006 08:50:40 -0000	1.25
+++ lams_tool_lamc/web/learning/ResultsSummary.jsp	27 Oct 2006 08:28:18 -0000	1.26
@@ -88,27 +88,27 @@
 					<table class="alternative-color" cellspacing="1">
 					  <tr>
 					  	<td width="30%"> 
-						  	  <b> <fmt:message key="label.topMark"/> </b>
+						  	  <strong> <fmt:message key="label.topMark"/> </strong>
 						 </td> 
-						 <td NOWRAP align=left>	
+						 <td>	
 							  	 <c:out value="${mcGeneralLearnerFlowDTO.topMark}"/>
 					  	</td>
 					  </tr>	
 
 					  <tr>
-					  	<td NOWRAP align=left valign=top> 
-						  	<b> <fmt:message key="label.avMark"/> </b>
+					  	<td> 
+						  	 <strong><fmt:message key="label.avMark"/> </strong>
 					  	</td>
-					  	<td NOWRAP align=left>
+					  	<td>
 							  	<c:out value="${mcGeneralLearnerFlowDTO.averageMark}"/>
 					  	</td>
 					  </tr>	
 
 					  <tr>
-					  	<td NOWRAP align=left valign=top> 
-							  <b> <fmt:message key="label.loMark"/> </b>
+					  	<td> 
+							   <strong> <fmt:message key="label.loMark"/>  </strong>
 					  	</td>
-					  	<td NOWRAP align=left>
+					  	<td>
 							  	<c:out value="${mcGeneralLearnerFlowDTO.lowestMark}"/>
 					  	</td>
 					  </tr>	
@@ -161,8 +161,8 @@
 </html:form>
 </div>
 
-<div id="footer"></div>
 
+
 </body>
 </html:html>
 
Index: lams_tool_lamc/web/learning/RunOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_lamc/web/learning/RunOffline.jsp	17 Oct 2006 20:35:24 -0000	1.8
+++ lams_tool_lamc/web/learning/RunOffline.jsp	27 Oct 2006 08:28:18 -0000	1.9
@@ -35,49 +35,45 @@
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css/>
-	<title><fmt:message key="activity.title" /></title>
+	<lams:css />
+	<title><fmt:message key="activity.title" />
+	</title>
 </head>
 
 <body class="stripes">
-	
-	<html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
-		<html:hidden property="toolContentID"/>						
-		<html:hidden property="toolSessionID"/>						
-		<html:hidden property="httpSessionID"/>			
-		<html:hidden property="userID"/>								
 
-	
+	<html:form action="/learning?method=displayMc&validate=false"
+		method="POST" target="_self">
+		<html:hidden property="toolContentID" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="httpSessionID" />
+		<html:hidden property="userID" />
+
+
 		<div id="content">
-			&nbsp&nbsp&nbsp&nbsp&nbsp <fmt:message key="label.learning.forceOfflineMessage" />
-			
-			<table>	
-			<tr>	
-			<td>
-				<div class="right-buttons">
 
-					<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
-						<html:submit property="learnerFinished" styleClass="button">
-							<fmt:message key="label.finished"/>
-						</html:submit>	 				
-				  	</c:if> 				    					
-	
-					<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
-						<html:submit property="forwardtoReflection"  styleClass="button">
-							<fmt:message key="label.continue"/>
-						</html:submit>	 				
-				  	</c:if> 				    					
-			  	
-				</div> 		  															 		  					
-			</td> 
-			</tr>
-			</table>
-		</div>
-	</html:form>	
-	
-	<div id="footer"></div>
+			<p>
+				<fmt:message key="label.learning.forceOfflineMessage" />
+			</p>
 
 
+			<div align="right" class="space-bottom-top">
+
+				<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
+					<html:submit property="learnerFinished" styleClass="button">
+						<fmt:message key="label.finished" />
+					</html:submit>
+				</c:if>
+
+				<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}">
+					<html:submit property="forwardtoReflection" styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:submit>
+				</c:if>
+			</div>
+		</div>
+	</html:form>
+	<div id="footer"></div>
 </body>
 </html:html>
 
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.35 -r1.36
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	19 Oct 2006 13:21:41 -0000	1.35
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	27 Oct 2006 08:28:18 -0000	1.36
@@ -35,243 +35,208 @@
 <head>
 	<html:base />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<lams:css/>
+	<lams:css />
 	<title><fmt:message key="activity.title" /></title>
 </head>
 
 <body class="stripes">
 
-<div id="content">
-	<h1>
-		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
-	</h1>
+	<div id="content">
+		<h1>
+			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}"
+				escapeXml="false" />
+		</h1>
 
-		<html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
-			<html:hidden property="toolContentID"/>						
-			<html:hidden property="toolSessionID"/>								
-			<html:hidden property="httpSessionID"/>											
-			<html:hidden property="userID"/>											
-			<html:hidden property="userOverPassMark"/>						
-			<html:hidden property="passMarkApplicable"/>										
-			<html:hidden property="learnerProgress"/>										
-			<html:hidden property="learnerProgressUserId"/>										
-			<html:hidden property="questionListingMode"/>													
-		
-				<table class="forms">
-					<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}"> 							  
-					  <tr>
-					  	<th scope="col" valign=top colspan=2> 
-						  	 <fmt:message key="label.assessment"/> 
-					  	</th>
-					  </tr>
-					</c:if> 								  					  
+		<html:form action="/learning?method=displayMc&validate=false"
+			method="POST" target="_self">
+			<html:hidden property="toolContentID" />
+			<html:hidden property="toolSessionID" />
+			<html:hidden property="httpSessionID" />
+			<html:hidden property="userID" />
+			<html:hidden property="userOverPassMark" />
+			<html:hidden property="passMarkApplicable" />
+			<html:hidden property="learnerProgress" />
+			<html:hidden property="learnerProgressUserId" />
+			<html:hidden property="questionListingMode" />
 
+			<h2>
+				<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}">
+					<fmt:message key="label.assessment" />
+				</c:if>
+			</h2>
 
-					<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}"> 							  
-					  <tr>
-					  	<td NOWRAP align=center valign=top colspan=2> 
-						  	<b>  <fmt:message key="label.viewAnswers"/>  </b>
-					  	</td>
-					  </tr>
-					</c:if> 								  
+			<h2>
+				<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}">
+					<fmt:message key="label.viewAnswers" />
+				</c:if>
 
-					<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress == 'true'}"> 							  
-					  <tr>
-					  	<td NOWRAP align=center valign=top colspan=2> 
-						  	 <b> <fmt:message key="label.learner.viewAnswers"/> </b>
-					  	</td>
-					  </tr>
-					</c:if> 								  
+				<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress == 'true'}">
+					<fmt:message key="label.learner.viewAnswers" />
+				</c:if>
+			</h2>
 
-					
-  		  	 		<c:set var="mainQueIndex" scope="request" value="0"/>
-					<c:forEach var="questionEntry" items="${mcGeneralLearnerFlowDTO.mapQuestionsContent}">
-					<c:set var="mainQueIndex" scope="request" value="${mainQueIndex +1}"/>
-						  <tr>
-						  	<td NOWRAP align=left valign=top colspan=2> 
-								  		<c:out value="${questionEntry.value}" escapeXml="false"/> 
-						  	</td>
-						  </tr>
+			<!--  QUESTIONS  -->
+			<c:set var="mainQueIndex" scope="request" value="0" />
+			<c:forEach var="questionEntry"
+				items="${mcGeneralLearnerFlowDTO.mapQuestionsContent}">
+				<c:set var="mainQueIndex" scope="request" value="${mainQueIndex +1}" />
 
-								  								  
-						  <tr>						 
-							<td NOWRAP align=left>
-							<table align=left>
-			  		  	 		<c:set var="queIndex" scope="request" value="0"/>
-								<c:forEach var="mainEntry" items="${mcGeneralLearnerFlowDTO.mapGeneralOptionsContent}">
-									<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-									
-										<c:if test="${requestScope.mainQueIndex == requestScope.queIndex}"> 		
-									  		<c:forEach var="subEntry" items="${mainEntry.value}">
-				  								<tr> 
-													<td NOWRAP align=left valign=top> 
-						   								    <img src="<c:out value="${tool}"/>images/dot.jpg" align=left> &nbsp
-															<c:out value="${subEntry.value}" escapeXml="false"/> 
-													</td> 
-												</tr>	
-											</c:forEach>
+				<div class="shading-bg">
+					<p>
+						<c:out value="${questionEntry.value}" escapeXml="false" />
+					</p>
 
-												<tr>												
-												<td NOWRAP colspan=2 align=left valign=top> 
-					   								   <b>  <fmt:message key="label.attempts"/> </b>
-												</td> 
-												</tr>
-												
-												
-												<tr>
-													<td  NOWRAP align=left valign=top> 											
-													<table align=left>
-														<c:forEach var="attemptEntry" items="${mcGeneralLearnerFlowDTO.mapQueAttempts}">
+					<!--  CANDIDATE ANSWERS  -->
+					<c:set var="queIndex" scope="request" value="0" />
+					<c:forEach var="mainEntry"
+						items="${mcGeneralLearnerFlowDTO.mapGeneralOptionsContent}">
+						<c:set var="queIndex" scope="request" value="${queIndex +1}" />
 
-															<c:if test="${requestScope.mainQueIndex == attemptEntry.key}"> 		
- 											  		  	 		<c:set var="aIndex" scope="request" value="1"/>
-																 <c:forEach var="i" begin="1" end="30" step="1">
+						<c:if test="${requestScope.mainQueIndex == requestScope.queIndex}">
+							<ul>
+								<c:forEach var="subEntry" items="${mainEntry.value}">
+									<li>
+										<c:out value="${subEntry.value}" escapeXml="false" />
+									</li>
+								</c:forEach>
+							</ul>
 
-					 													<c:forEach var="distinctAttemptEntry" items="${attemptEntry.value}">
 
-																				<c:if test="${distinctAttemptEntry.key == i}"> 	
-																					<tr>
-																						<td NOWRAP align=left valign=top> 
-																								<b> <fmt:message key="label.attempt"/> <c:out value="${requestScope.aIndex}"/>:  </b>
-																						</td>
-																						<c:set var="aIndex" scope="request" value="${requestScope.aIndex +1}"/>
-								 														<td align=left valign=top> 																					
-									 														<table align=left>
-											 													<c:forEach var="singleAttemptEntry" items="${distinctAttemptEntry.value}">
-																									<tr>
-																										<td NOWRAP align=left valign=top>
-													 															<c:out value="${singleAttemptEntry.value}" escapeXml="false"/> 
-												 														</td>
-																									</tr>	
-																								</c:forEach>
-																							</table>	
-								 														</td>
-																					</tr>		
-																				</c:if> 																																						
-																		</c:forEach>
-																		
-																</c:forEach>
-															</c:if> 																		
+
+							<!--  ATTEMPTS -->
+							<h4>
+								<fmt:message key="label.attempts" />
+							</h4>
+
+							<c:forEach var="attemptEntry"
+								items="${mcGeneralLearnerFlowDTO.mapQueAttempts}">
+								<c:if test="${requestScope.mainQueIndex == attemptEntry.key}">
+
+									<c:set var="aIndex" scope="request" value="1" />
+									<c:forEach var="i" begin="1" end="30" step="1">
+
+
+										<c:forEach var="distinctAttemptEntry"
+											items="${attemptEntry.value}">
+
+											<div>
+												<c:if test="${distinctAttemptEntry.key == i}">
+													<p>
+														<strong><fmt:message key="label.attempt" /> <c:out
+																value="${requestScope.aIndex}" />: </strong>
+													</p>
+													<c:set var="aIndex" scope="request"
+														value="${requestScope.aIndex +1}" />
+													<ul>
+														<c:forEach var="singleAttemptEntry"
+															items="${distinctAttemptEntry.value}">
+															<li>
+																<c:out value="${singleAttemptEntry.value}"
+																	escapeXml="false" />
+															</li>
 														</c:forEach>
-													</table>
-													</td>
-											  </tr>
-										</c:if> 			
-								</c:forEach>
-							</table>
-							</td>
-						</tr>
-						
-						
+													</ul>
 
-						  <tr>
-						  	<td NOWRAP align=left valign=top colspan=2> 
-								<c:forEach var="feedbackEntry" items="${mcGeneralLearnerFlowDTO.mapFeedbackContent}">
-									<c:if test="${requestScope.mainQueIndex == feedbackEntry.key}"> 		
-									  	<i> <c:out value="${feedbackEntry.value}" escapeXml="false"/> </i>
-									</c:if> 			
-								</c:forEach>
-						  	</td>
-						  </tr>
-						
+												</c:if>
+											</div>
+
+										</c:forEach>
+
+
+									</c:forEach>
+								</c:if>
+							</c:forEach>
+							<!-- END ATTEMPTS -->
+
+						</c:if>
 					</c:forEach>
+					<!--  END CANDIDATE ANSWERS -->
 
+					<c:forEach var="feedbackEntry"
+						items="${mcGeneralLearnerFlowDTO.mapFeedbackContent}">
+						<c:if test="${requestScope.mainQueIndex == feedbackEntry.key}">
+							<p>
+								<em> <c:out value="${feedbackEntry.value}" escapeXml="false" />
+								</em>
+							</p>
+						</c:if>
+					</c:forEach>
+				</div>
+			</c:forEach>
+			<!-- END QUESTION  -->
 
-					<c:if test="${mcGeneralLearnerFlowDTO.reportViewOnly != 'true'}"> 							  
-						<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}"> 							  
+			<c:if test="${mcGeneralLearnerFlowDTO.reportViewOnly != 'true'}">
+				<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}">
 
-					 		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}"> 					  	   
-				  	   		  <tr>
-							  	<td NOWRAP valign=top> 
-							  			<html:submit property="redoQuestions" styleClass="button">
-											<fmt:message key="label.redo.questions"/>
-										</html:submit>	 		
-					       
-				   						<html:submit property="viewSummary" styleClass="button">
-											<fmt:message key="label.view.summary"/>
-										</html:submit>	 				 		  					
-							  	 </td>
+					<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
 
-							  	<td NOWRAP valign=top> 							  	 
-             	  						<div class="right-buttons">	  	   		    
-											<c:if test="${((McLearningForm.passMarkApplicable == 'true') && (McLearningForm.userOverPassMark == 'true'))}">
-												<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
-													<html:submit property="learnerFinished"  styleClass="button">
-														<fmt:message key="label.finished"/>
-													</html:submit>	 				
-											  	</c:if> 				    					
-								
-												<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
-													<html:submit property="forwardtoReflection" styleClass="button">
-														<fmt:message key="label.continue"/>
-													</html:submit>	 				
-											  	</c:if> 				    					
-									  	   </c:if>	
-									  	   
-									</div>								  	   
-							  	 </td>									
-							  </tr>
-							</c:if> 				
-			
-							<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}"> 							  
-				  	   		  <tr>
-				  	   		    <td  valign=top>
-					   						<html:submit property="viewSummary" styleClass="button">
-												<fmt:message key="label.view.summary"/>
-											</html:submit>	 				 		  					
-							  	 </td>
-							  	 
-	 			  	   		    <td  valign=top>
-		    	  						<div class="right-buttons">
-											<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
-												<html:submit property="learnerFinished"  styleClass="button">
-													<fmt:message key="label.finished"/>
-												</html:submit>	 				
-										  	</c:if> 				    					
-							
-											<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
-												<html:submit property="forwardtoReflection" styleClass="button">
-													<fmt:message key="label.continue"/>
-												</html:submit>	 				
-										  	</c:if> 				    					
-										   
-										</div>
-							  	 </td>
-							  	 
-							  </tr>
-							</c:if> 																		
-						</c:if> 																								
-					</c:if> 					
-					
+						<html:submit property="redoQuestions" styleClass="button">
+							<fmt:message key="label.redo.questions" />
+						</html:submit>
+						<html:submit property="viewSummary" styleClass="button">
+							<fmt:message key="label.view.summary" />
+						</html:submit>
 
-							<tr> 
-							<td valign=top>
-									<table>
-										<tr> 
-						  	   		  		<td>
-												<b> <fmt:message key="label.notebook.entries"/> </b>						
-											 </td>
-										</tr>
-										
-										<tr> 
-						  	   		  		<td>
-												<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/>				  	   		  		
-											 </td>
-										</tr>
-								</table>
-		
-							</td>
-							</tr>
+						<div class="right-buttons">
+							<c:if
+								test="${((McLearningForm.passMarkApplicable == 'true') && (McLearningForm.userOverPassMark == 'true'))}">
+								<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
+									<html:submit property="learnerFinished" styleClass="button">
+										<fmt:message key="label.finished" />
+									</html:submit>
+								</c:if>
 
-					
-				  	<html:hidden property="doneLearnerProgress"/>						   
-				</table>
-	</html:form>
+								<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}">
+									<html:submit property="forwardtoReflection" styleClass="button">
+										<fmt:message key="label.continue" />
+									</html:submit>
+								</c:if>
+							</c:if>
+						</div>
 
-</div>
+					</c:if>
 
-<div id="footer"></div>
 
+					<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
+
+						<html:submit property="viewSummary" styleClass="button">
+							<fmt:message key="label.view.summary" />
+						</html:submit>
+
+						<div class="right-buttons">
+							<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
+								<html:submit property="learnerFinished" styleClass="button">
+									<fmt:message key="label.finished" />
+								</html:submit>
+							</c:if>
+
+							<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}">
+								<html:submit property="forwardtoReflection" styleClass="button">
+									<fmt:message key="label.continue" />
+								</html:submit>
+							</c:if>
+
+						</div>
+
+					</c:if>
+
+
+				</c:if>
+			</c:if>
+
+			<h2>
+				<fmt:message key="label.notebook.entries" />
+			</h2>
+
+			<p>
+				<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}"
+					escapeXml="false" />
+			</p>
+
+			<html:hidden property="doneLearnerProgress" />
+
+		</html:form>
+	</div>
 </body>
 </html:html>
 
@@ -283,5 +248,5 @@
 
 
 
-	
-	
\ No newline at end of file
+
+
Index: lams_tool_lamc/web/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/defineLater.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_lamc/web/learning/defineLater.jsp	17 Oct 2006 20:35:24 -0000	1.8
+++ lams_tool_lamc/web/learning/defineLater.jsp	27 Oct 2006 08:28:18 -0000	1.9
@@ -50,8 +50,6 @@
 	</div>
 	
 	<div id="footer-learner"></div>
-
-
 </div>
 </body>
 </html:html>
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_laqa/web/learning/AnswersContent.jsp	17 Oct 2006 20:32:56 -0000	1.21
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	27 Oct 2006 08:28:37 -0000	1.22
@@ -34,10 +34,10 @@
 <html:html>
 <head>
 	<html:base />
-	
+
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css/>
-	
+	<lams:css />
+
 	<title><fmt:message key="activity.title" /></title>
 
 	<script language="JavaScript" type="text/JavaScript">
@@ -52,79 +52,81 @@
 			submitLearningMethod(actionMethod);
 		}
 		
-	</script>	
+	</script>
 </head>
 
 <body class="stripes">
 
+	<div id="content">
+		<h1>
+			<c:out value="${generalLearnerFlowDTO.activityTitle}"
+				escapeXml="false" />
+		</h1>
 
+		<html:form action="/learning?validate=false"
+			enctype="multipart/form-data" method="POST" target="_self">
+			<html:hidden property="method" />
+			<html:hidden property="toolSessionID" />
+			<html:hidden property="userID" />
+			<html:hidden property="httpSessionID" />
+			<html:hidden property="questionIndex" />
+			<html:hidden property="totalQuestionCount" />
 
 
-<div id="content">
-<h1>
-	<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="false" />
-</h1>
+			<html:errors />
 
-	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
-  		<html:hidden property="method"/>	 
-		<html:hidden property="toolSessionID"/>						
-		<html:hidden property="userID"/>						
-		<html:hidden property="httpSessionID"/>		
-		<html:hidden property="questionIndex"/>		
-		<html:hidden property="totalQuestionCount"/>		
+			<c:if test="${generalLearnerFlowDTO.activityOffline == 'true'}">
+				<h3>
+				   <fmt:message key="label.learning.forceOfflineMessage" />
+				</h3>
+			</c:if>
+
+
+			<c:if test="${generalLearnerFlowDTO.activityOffline == 'false'}">
+				<p>
+				  <c:out value="${generalLearnerFlowDTO.activityInstructions}"
+						escapeXml="false" />
+				</p>
+				<c:choose>
+
+					<c:when
+						test="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}">
+
+						<c:if test="${generalLearnerFlowDTO.initialScreen == 'true'}">
+							<p><fmt:message key="label.feedback.seq" />
 								
-			<table>
+								<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+								
+								<fmt:message key="label.questions.simple" /></p>
+							
+						</c:if>
 
-			<tr> <td>
-				<html:errors/>
-			</td></tr>
+						<c:if test="${generalLearnerFlowDTO.initialScreen != 'true'}">
+							<p>
+								<fmt:message key="label.questions.remaining" />
+								<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+							</p>
+						</c:if>
 
-			<c:if test="${generalLearnerFlowDTO.activityOffline == 'true'}"> 			
-				<tr> <td NOWRAP>
-					<fmt:message key="label.learning.forceOfflineMessage"/>
-				</td></tr>
-			</c:if> 		
-		
-			<c:if test="${generalLearnerFlowDTO.activityOffline == 'false'}"> 			
-				<tr><td NOWRAP>
-					<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false"/> 
-				</td></tr>
-	
-			
-				<c:choose> 
-				  <c:when test="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}" > 
-		
-				  		<c:if test="${generalLearnerFlowDTO.initialScreen == 'true'}"> 							  		
-						  	<tr> <td NOWRAP>
-			 					<fmt:message key="label.feedback.seq"/> &nbsp <c:out value="${generalLearnerFlowDTO.remainingQuestionCount}"/> &nbsp
-			 					<fmt:message key="label.questions.simple"/>
-							</td></tr>
-						</c:if> 									
-				  		<c:if test="${generalLearnerFlowDTO.initialScreen != 'true'}"> 							  		
-						  	<tr> <td NOWRAP>				  		
-			 					<fmt:message key="label.questions.remaining"/> &nbsp <c:out value="${generalLearnerFlowDTO.remainingQuestionCount}"/> 
-							</td></tr>			 					
-						</c:if> 													  		
-				  
-						<jsp:include page="/learning/SequentialAnswersContent.jsp" /> 
-				  </c:when> 
+						<jsp:include page="/learning/SequentialAnswersContent.jsp" />
+					</c:when>
 
-				  <c:otherwise>
-					  	<tr> <td NOWRAP>
-		 					<fmt:message key="label.feedback.combined"/> &nbsp <c:out value="${generalLearnerFlowDTO.remainingQuestionCount}"/> &nbsp
-		 					<fmt:message key="label.questions.simple"/>
-						</td></tr>
-				  
-					  	<jsp:include page="/learning/CombinedAnswersContent.jsp" /> 
-				  </c:otherwise>
-				</c:choose> 
-			</c:if> 		
-	 	</table>
-	</html:form>
-</div>
+					<c:otherwise>
 
-<div id="footer"></div>
+						<fmt:message key="label.feedback.combined" /> &nbsp <c:out
+							value="${generalLearnerFlowDTO.remainingQuestionCount}" />
+						<fmt:message key="label.questions.simple" />
 
+						<jsp:include page="/learning/CombinedAnswersContent.jsp" />
+					</c:otherwise>
+				</c:choose>
+			</c:if>
+
+		</html:form>
+	</div>
+
+	<div id="footer"></div>
+
 </body>
 </html:html>
 
@@ -136,5 +138,5 @@
 
 
 
-	
-	
\ No newline at end of file
+
+
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	19 Oct 2006 23:38:53 -0000	1.21
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	27 Oct 2006 08:28:37 -0000	1.22
@@ -18,35 +18,58 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-
-<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 
-			<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
-			
-					<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswers}">
-				  		<c:if test="${questionEntry.key == answerEntry.key}"> 			
-						  <tr> <td><b> <fmt:message key="label.question"/> <c:out value="${questionEntry.key}"/>:  </b> </td></tr>
-						  <tr> <td><c:out value="${questionEntry.value}" escapeXml="false"/> </td></tr>
-						  <tr> <td><b> <fmt:message key="label.answer"/> </b> </td></tr>
-					 	  <tr> <td><textarea name="answer<c:out value="${questionEntry.key}" />" rows=5 cols=60><c:out value="${answerEntry.value}" escapeXml="false"/></textarea> </td></tr>
-					 	  <tr> <td>&nbsp;</td></tr>
-  	   					</c:if> 			
-					</c:forEach>
-			
-			</c:forEach>
-			<tr>
-				 <td> 
-						<html:button property="btnCombined" onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
-							<fmt:message key="button.submitAllContent"/>
-						</html:button>	 				 		  					
-				</td> 
-			</tr>
+<c:forEach var="questionEntry"
+	items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
+
+	<c:forEach var="answerEntry"
+		items="${generalLearnerFlowDTO.mapAnswers}">
+		<c:if test="${questionEntry.key == answerEntry.key}">
+
+		<div class="shading-bg">
+			<p>
+			 <strong><fmt:message key="label.question" /> <c:out
+					value="${questionEntry.key}" />:</strong>
+					</p>
+				
+				 
+					<c:out value="${questionEntry.value}" escapeXml="false" />
+					  <p><strong><fmt:message key="label.answer" /></strong>
+					</p>
+					
+					<textarea name="answer<c:out value="${questionEntry.key}" />" rows="5"
+						cols="60" class="text-area"><c:out value="${answerEntry.value}" escapeXml="false" /></textarea>
+					
+		</div>
+		
+		</c:if>
+	
+	
+	</c:forEach>
+
+</c:forEach>
+ 
+ 	<div align="right" class="space-bottom-top">
+	
+		<html:button property="btnCombined"
+			onclick="javascript:submitMethod('submitAnswersContent');"
+			styleClass="button">
+			<fmt:message key="button.submitAllContent" />
+		</html:button>
+		
+		</div>
+
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	19 Oct 2006 23:38:53 -0000	1.19
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	27 Oct 2006 08:28:37 -0000	1.20
@@ -34,7 +34,7 @@
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css/>
+	<lams:css />
 	<title><fmt:message key="activity.title" /></title>
 
 	<script language="JavaScript" type="text/JavaScript">
@@ -48,117 +48,113 @@
 		{
 			submitLearningMethod(actionMethod);
 		}
-	</script>	
+	</script>
 </head>
 
 <body class="stripes">
 
 
 
 
-<div id="content">
-<h1>
-	<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="false" />
-</h1>
-	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
-  		<html:hidden property="method"/>	 
-		<html:hidden property="toolSessionID"/>		
-		<html:hidden property="userID"/>										
-		<html:hidden property="httpSessionID"/>								
-		<html:hidden property="totalQuestionCount"/>				
+	<div id="content">
+		<h1>
+			<c:out value="${generalLearnerFlowDTO.activityTitle}"
+				escapeXml="false" />
+		</h1>
+		<html:form action="/learning?validate=false"
+			enctype="multipart/form-data" method="POST" target="_self">
+			<html:hidden property="method" />
+			<html:hidden property="toolSessionID" />
+			<html:hidden property="userID" />
+			<html:hidden property="httpSessionID" />
+			<html:hidden property="totalQuestionCount" />
 
-				<table class="forms">
-				  <tr><td align=center colspan=2>
-					  	<b> <fmt:message key="label.learning.reportMessage"/> </b>
-		    	  	</td>
-				  </tr>
 
-			
-					<tr> <td align=left colspan=2>		
-						<table align="left">
-							<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
-									  <tr>
-										<td colspan=2>
-											<b> <fmt:message key="label.question"/> <c:out value="${questionEntry.key}"/>:  </b>  
-									  	 </td>
-									  </tr>
-									  
-  									  <tr>
-										<td colspan=2>
-									  		<c:out value="${questionEntry.value}" escapeXml="false"/> 
-									  	 </td>
-									  </tr>
-									  
-									  
-				  			  		<c:forEach var="answerEntry" items="${generalLearnerFlowDTO.mapAnswersPresentable}">
-										<c:if test="${answerEntry.key == questionEntry.key}"> 						  			  		
-										  <tr>
-											<td colspan=2> <b> <fmt:message key="label.learning.yourAnswer"/>  </b>  
-										  	</td>
-										  </tr>
-										  
-										  <tr>
-											<td colspan=2> 
-												  <c:out value="${answerEntry.value}" escapeXml="false"/>						  																	
-										  	</td>
-										  </tr>
-									  	</c:if> 				    
-									</c:forEach>
-									
+			<p>
+				<strong><fmt:message key="label.learning.reportMessage" />
+				</strong>
+			</p>
 
-				  			  		<c:forEach var="feedbackEntry" items="${generalLearnerFlowDTO.mapFeedback}">
-										<c:if test="${(feedbackEntry.value != '') && (feedbackEntry.value != null) }"> 						  			  		
-					  			  			<c:if test="${feedbackEntry.key == questionEntry.key}"> 						  			  		
-											  <tr>
-												<td colspan=2> <b> <fmt:message key="label.feedback"/>:  </b>  
-											  	</td>
-											  </tr>
-											  
-											  <tr>
-												<td colspan=2> 
-													  <c:out value="${feedbackEntry.value}" escapeXml="false"/>						  																	
-											  	</td>
-											  </tr>
-										  	</c:if> 				    
-									  	</c:if> 				    										  	
-									</c:forEach>
-									
-									
-							  	  <tr><td> &nbsp </td> </tr>
-							  	  <tr><td> &nbsp </td> </tr>
-							</c:forEach>
-						</table>
-					</td></tr>
-					
-					<tr> <td align=left colspan=2>							
-								<fmt:message key="label.responses.locked"/> 
-						</td>
-					</tr>
-							
 
-	  	   		  <tr>
-	  	   		  		<td>
-                               <html:button property="redoQuestions" 
-                                             styleClass="button" 
-                                             onclick="submitMethod('redoQuestions');">
-                                    <fmt:message key="label.redo"/>
-                                </html:button>
-					  	 </td>
-	  	   		  
-						<td>
-							<html:button property="viewAllResults" onclick="submitMethod('viewAllResults');" styleClass="button">
-					                             <fmt:message key="label.allResponses"/>
-							</html:button>					  	 
-					  	 </td>
-				  </tr>
 
-				  
-				</table>
-	</html:form>
-</div>
+			<c:forEach var="questionEntry"
+				items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
 
-<div id="footer"></div>	
+				<div class="shading-bg">
+					<p>
+						<strong><fmt:message key="label.question" /> <c:out
+								value="${questionEntry.key}" />:</strong>
+						<br>
+						<c:out value="${questionEntry.value}" escapeXml="false" />
+					</p>
 
+					<c:forEach var="answerEntry"
+						items="${generalLearnerFlowDTO.mapAnswersPresentable}">
+						<c:if test="${answerEntry.key == questionEntry.key}">
+
+
+
+							<p>
+								<strong> <fmt:message key="label.learning.yourAnswer" />
+								</strong>
+
+								<br>
+								<c:out value="${answerEntry.value}" escapeXml="false" />
+
+							</p>
+
+
+						</c:if>
+					</c:forEach>
+
+
+					<c:forEach var="feedbackEntry"
+						items="${generalLearnerFlowDTO.mapFeedback}">
+						<c:if
+							test="${(feedbackEntry.value != '') && (feedbackEntry.value != null) }">
+							<c:if test="${feedbackEntry.key == questionEntry.key}">
+
+								<span class="field-name"> <fmt:message
+										key="label.feedback" />: </span>
+
+								<c:out value="${feedbackEntry.value}" escapeXml="false" />
+
+							</c:if>
+						</c:if>
+					</c:forEach>
+
+				</div>
+
+			</c:forEach>
+
+			<div class="last-item">
+
+			</div>
+
+			<p>
+				<fmt:message key="label.responses.locked" />
+			</p>
+
+			<div class="space-bottom-top small-space-top">
+				<html:button property="redoQuestions" styleClass="button"
+					onclick="submitMethod('redoQuestions');">
+					<fmt:message key="label.redo" />
+				</html:button>
+
+
+
+				<html:button property="viewAllResults"
+					onclick="submitMethod('viewAllResults');" styleClass="button">
+					<fmt:message key="label.allResponses" />
+				</html:button>
+			</div>
+
+
+		</html:form>
+	</div>
+
+	<div id="footer"></div>
+
 </body>
 </html:html>
 
@@ -176,4 +172,4 @@
 
 
 
-	
\ No newline at end of file
+
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_laqa/web/learning/LearnerRep.jsp	19 Oct 2006 23:38:53 -0000	1.21
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	27 Oct 2006 08:28:37 -0000	1.22
@@ -55,9 +55,6 @@
 </head>
 
 <body class="stripes">
-	
-	
-	
 
 	<div id="content">
 	<h1>
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Notebook.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/web/learning/Notebook.jsp	19 Oct 2006 23:38:53 -0000	1.6
+++ lams_tool_laqa/web/learning/Notebook.jsp	27 Oct 2006 08:28:37 -0000	1.7
@@ -34,7 +34,7 @@
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css/>
+	<lams:css />
 	<title><fmt:message key="activity.title" /></title>
 
 	<script language="JavaScript" type="text/JavaScript">
@@ -49,58 +49,47 @@
 			submitLearningMethod(actionMethod);
 		}
 		
-	</script>	
+	</script>
 
-	
+
 </head>
 
 <body class="stripes">
-	
-	
-	
-	
-	<html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
-  		<html:hidden property="method"/>	 
-		<html:hidden property="toolSessionID"/>		
-		<html:hidden property="userID"/>										
-		<html:hidden property="httpSessionID"/>		
-		<html:hidden property="totalQuestionCount"/>		
-	
+	<html:form action="/learning?validate=false"
+		enctype="multipart/form-data" method="POST" target="_self">
+		<html:hidden property="method" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
+		<html:hidden property="httpSessionID" />
+		<html:hidden property="totalQuestionCount" />
+
 		<div id="content">
-		
-	<h1>
-		<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="false"/> 		
-	</h1>
-	
-		<table>
-			<tr>
-				<td>
-					<c:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeXml="false"/> 
-				</td>
-			</tr>
 
-			<tr>
-				<td>
-					<html:textarea cols="60" rows="8" property="entryText"></html:textarea>
-				</td>
-			</tr>
+			<h1>
+				<c:out value="${generalLearnerFlowDTO.activityTitle}"
+					escapeXml="false" />
+			</h1>
 
-			<tr>
-				<td class="right-buttons">
-					<html:button property="submitReflection" onclick="javascript:submitMethod('submitReflection');" styleClass="button">					
-						<fmt:message key="button.endLearning"/>
-					</html:button>
-				</td>
-			</tr>
-		</table>
+			<p>
+				<c:out value="${generalLearnerFlowDTO.reflectionSubject}"
+					escapeXml="false" />
+			</p>
 
-		
+			<html:textarea cols="60" rows="8" property="entryText"
+				styleClass="text-area"></html:textarea>
+
+			<div align="right" class="space-bottom-top">
+				<html:button property="submitReflection"
+					onclick="javascript:submitMethod('submitReflection');"
+					styleClass="button">
+					<fmt:message key="button.endLearning" />
+				</html:button>
+			</div>
 		</div>
-	</html:form>	
-	
+	</html:form>
+
 	<div id="footer"></div>
 
-
 </body>
 </html:html>
 
Index: lams_tool_laqa/web/learning/RunOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/web/learning/RunOffline.jsp	19 Oct 2006 23:38:53 -0000	1.10
+++ lams_tool_laqa/web/learning/RunOffline.jsp	27 Oct 2006 08:28:37 -0000	1.11
@@ -34,8 +34,9 @@
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css/>
-	<title><fmt:message key="activity.title" /></title>
+	<lams:css />
+	<title><fmt:message key="activity.title" />
+	</title>
 
 	<script language="JavaScript" type="text/JavaScript">
 		function submitLearningMethod(actionMethod) 
@@ -48,49 +49,47 @@
 		{
 			submitLearningMethod(actionMethod);
 		}
-	</script>		
-	
+	</script>
+
 </head>
 
 <body class="stripes">
-	
-	<html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
-  		<html:hidden property="method"/>	 
-		<html:hidden property="toolSessionID"/>		
-		<html:hidden property="userID"/>										
-		<html:hidden property="httpSessionID"/>		
-		<html:hidden property="totalQuestionCount"/>		
-	
+
+	<html:form action="/learning?validate=false"
+		enctype="multipart/form-data" method="POST" target="_self">
+		<html:hidden property="method" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
+		<html:hidden property="httpSessionID" />
+		<html:hidden property="totalQuestionCount" />
+
 		<div id="content">
-			&nbsp&nbsp&nbsp&nbsp&nbsp <fmt:message key="label.learning.forceOfflineMessage" />
-			
-			<table>	
-			<tr>	
-			<td>
-				<div class="right-buttons">
+			<p>
+				<fmt:message key="label.learning.forceOfflineMessage" />
+			</p>
 
-					<c:if test="${generalLearnerFlowDTO.reflection != 'true'}"> 						  			  		
-						<html:button property="endLearning" onclick="javascript:submitMethod('endLearning');" styleClass="button">
-							<fmt:message key="button.endLearning"/>
-						</html:button>	 				
-				  	</c:if> 				    					
-	
-					<c:if test="${generalLearnerFlowDTO.reflection == 'true'}"> 						  			  		
-						<html:button property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"  styleClass="button">
-							<fmt:message key="label.continue"/>
-						</html:button>	 				
-				  	</c:if> 				    					
-			  	
-				</div> 		  															 		  					
-			</td> 
-			</tr>
-			</table>
-		</div>
-	</html:form>	
-	
-	<div id="footer"></div>
+			<div align="right" class="space-bottom-top">
 
+				<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
+					<html:button property="endLearning"
+						onclick="javascript:submitMethod('endLearning');"
+						styleClass="button">
+						<fmt:message key="button.endLearning" />
+					</html:button>
+				</c:if>
 
+				<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
+					<html:button property="forwardtoReflection"
+						onclick="javascript:submitMethod('forwardtoReflection');"
+						styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</c:if>
+
+			</div>
+		</div>
+	</html:form>
+	<div id="footer"></div>
 </body>
 </html:html>
 
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/SequentialAnswersContent.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	19 Oct 2006 23:38:53 -0000	1.20
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	27 Oct 2006 08:28:37 -0000	1.21
@@ -18,85 +18,116 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="fck-editor" prefix="FCK"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 
+<!--question content goes here-->
 
-	<!--question content goes here-->
-				<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
-			  		<c:if test="${questionEntry.key == generalLearnerFlowDTO.currentQuestionIndex}"> 			
-					  <tr> <td><b> <fmt:message key="label.question"/> 
-						  	<c:out value="${questionEntry.key}" />:  </b> 
-					</td></tr>
-					  
+<div class="shading-bg">
+	<c:forEach var="questionEntry"
+		items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
 
-					  <tr> <td><c:out value="${questionEntry.value}" escapeXml="false"/> 
-					  </td></tr>
-					  
+		<c:if
+			test="${questionEntry.key == generalLearnerFlowDTO.currentQuestionIndex}">
 
-					  <tr> <td><b> <fmt:message key="label.answer"/> </b> 
-					</td></tr>
-				  	  
-				  	  
-					  <tr> <td><textarea name="answer" rows=5 cols=60><c:out value="${generalLearnerFlowDTO.currentAnswer}" escapeXml="false"/></textarea>
-				 			<html:hidden property="currentQuestionIndex" value="${questionEntry.key}"/>
-				 	</td></tr>
-				  	  
- 					</c:if> 			
-				</c:forEach>
+			<p>
+				<strong><fmt:message key="label.question" /> <c:out
+						value="${questionEntry.key}" />:</strong>
+				<br>
+				<c:out value="${questionEntry.value}" escapeXml="false" />
+			</p>
 
+			<p>
+				<strong><fmt:message key="label.answer" /> </strong>
+			</p>
+
+
+			<textarea name="answer" rows="5" cols="60" class="text-area"><c:out value="${generalLearnerFlowDTO.currentAnswer}"
+					escapeXml="false" /></textarea>
+			<html:hidden property="currentQuestionIndex"
+				value="${questionEntry.key}" />
+
+
+		</c:if>
+	</c:forEach>
+</div>
+
+<div class="space-bottom">
 	<!--question content ends here-->
-				<tr>
-				<c:choose>  
-				  <c:when test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
-				  				  (generalLearnerFlowDTO.totalQuestionCount != 1) }"> 
-					<td NOWRAP>
-						<html:button property="btnGetPrevious" onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
-									<fmt:message key="button.getPreviousQuestion"/>
-						</html:button>	 				 		  					
-						<html:button property="btnDone" onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
-									<fmt:message key="button.done"/>
-						</html:button>	 				 		  					
-					</td> 
-				  </c:when> 
+	<c:choose>
+		<c:when
+			test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
+				  				  (generalLearnerFlowDTO.totalQuestionCount != 1) }">
 
-  				  <c:when test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
-				  				  (generalLearnerFlowDTO.totalQuestionCount == 1) }"> 
-					 <td NOWRAP valign=top> 
-						<html:button property="btnDone" onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
-									<fmt:message key="button.done"/>
-						</html:button>	 				 		  					
-					</td> 
-				  </c:when> 
-				  
-				  
- 				  <c:when test="${generalLearnerFlowDTO.currentQuestionIndex != generalLearnerFlowDTO.totalQuestionCount && 
-				 				  generalLearnerFlowDTO.currentQuestionIndex > 1}"> 
-					 <td NOWRAP valign=top> 
-						<html:button property="btnGetPrevious" onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
-									<fmt:message key="button.getPreviousQuestion"/>
-						</html:button>	 				 		  					
-						<html:button property="btnGetNext" onclick="javascript:submitMethod('getNextQuestion');" styleClass="button">
-									<fmt:message key="button.getNextQuestion"/>
-						</html:button>	 				 		  					
-					</td> 
-  				  </c:when> 
-  				  
-				  <c:otherwise>
-					 <td NOWRAP valign=top> 
-						<html:button property="btnGetNext" onclick="javascript:submitMethod('getNextQuestion');" styleClass="button">
-									<fmt:message key="button.getNextQuestion"/>
-						</html:button>	 				 		  					
-					</td> 
-				  </c:otherwise>
-				</c:choose> 
-				</tr>
+			<html:button property="btnGetPrevious"
+				onclick="javascript:submitMethod('getPreviousQuestion');"
+				styleClass="button">
+				<fmt:message key="button.getPreviousQuestion" />
+			</html:button>
 
+			<div align="right">
+				<html:button property="btnDone"
+					onclick="javascript:submitMethod('submitAnswersContent');"
+					styleClass="button">
+					<fmt:message key="button.done" />
+				</html:button>
+			</div>
+
+		</c:when>
+
+		<c:when
+			test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
+				  				  (generalLearnerFlowDTO.totalQuestionCount == 1) }">
+			<div align="right">
+				<html:button property="btnDone"
+					onclick="javascript:submitMethod('submitAnswersContent');"
+					styleClass="button">
+					<fmt:message key="button.done" />
+				</html:button>
+			</div>
+
+		</c:when>
+
+		<c:when
+			test="${generalLearnerFlowDTO.currentQuestionIndex != generalLearnerFlowDTO.totalQuestionCount && 
+				 				  generalLearnerFlowDTO.currentQuestionIndex > 1}">
+
+			<html:button property="btnGetPrevious"
+				onclick="javascript:submitMethod('getPreviousQuestion');"
+				styleClass="button">
+				<fmt:message key="button.getPreviousQuestion" />
+			</html:button>
+			<html:button property="btnGetNext"
+				onclick="javascript:submitMethod('getNextQuestion');"
+				styleClass="button">
+				<fmt:message key="button.getNextQuestion" />
+			</html:button>
+
+		</c:when>
+
+		<c:otherwise>
+
+
+			<html:button property="btnGetNext"
+				onclick="javascript:submitMethod('getNextQuestion');"
+				styleClass="button">
+				<fmt:message key="button.getNextQuestion" />
+			</html:button>
+
+
+		</c:otherwise>
+	</c:choose>
+
+</div>
Index: lams_tool_laqa/web/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/defineLater.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/web/learning/defineLater.jsp	17 Oct 2006 20:32:56 -0000	1.6
+++ lams_tool_laqa/web/learning/defineLater.jsp	27 Oct 2006 08:28:37 -0000	1.7
@@ -34,16 +34,17 @@
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css/>
-	<title><fmt:message key="activity.title" /></title>
+	<lams:css />
+	<title><fmt:message key="activity.title" />
+	</title>
 </head>
 
 <body class="stripes">
-	
+
 	<div id="content">
-		<lams:DefineLater defineLaterMessageKey="error.defineLater"/>		
+		<lams:DefineLater defineLaterMessageKey="error.defineLater" />
 	</div>
-	
+
 	<div id="footer"></div>
 
 
Index: lams_tool_larsrc/web/pages/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/definelater.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_larsrc/web/pages/learning/definelater.jsp	28 Sep 2006 23:31:18 -0000	1.5
+++ lams_tool_larsrc/web/pages/learning/definelater.jsp	27 Oct 2006 08:29:33 -0000	1.6
@@ -1,24 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
 <%@include file="/common/taglibs.jsp"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
 <html:html locale="true">
 <head>
 	<%@ include file="/common/header.jsp"%>
 	<meta http-equiv="refresh" content="60">
 </head>
 
 <body class="stripes">
-
+	<div id="content">
 		<h1>
-			${resource.title}
+			<fmt:message key="activity.title" />
 		</h1>
-
-		<div id="content">
-			<lams:DefineLater/>
-		</div>
-		
-		<div id="footer">
-		</div>
-		<!--closes footer-->
-
+		<lams:DefineLater />
+	</div>
+	<div id="footer"></div>
 </body>
 </html:html>
Index: lams_tool_larsrc/web/pages/learning/finish.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/finish.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_larsrc/web/pages/learning/finish.jsp	28 Sep 2006 23:31:18 -0000	1.5
+++ lams_tool_larsrc/web/pages/learning/finish.jsp	27 Oct 2006 08:29:33 -0000	1.6
@@ -9,5 +9,5 @@
     </script>
 	
 	
-	<body class="stripes">
+	</body>
 </html>
Index: lams_tool_larsrc/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/notebook.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/web/pages/learning/notebook.jsp	29 Sep 2006 06:11:15 -0000	1.4
+++ lams_tool_larsrc/web/pages/learning/notebook.jsp	27 Oct 2006 08:29:33 -0000	1.5
@@ -4,54 +4,44 @@
 
 <html:html locale="true">
 <head>
-	<title><fmt:message key="label.learning.title" /></title>
+	<title><fmt:message key="label.learning.title" />
+	</title>
 	<%@ include file="/common/header.jsp"%>
 </head>
 <body class="stripes">
 
-		<c:set var="sessionMapID" value="${param.sessionMapID}"/>
-		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-		
-		<html:form action="/learning/submitReflection" method="post">
-			<html:hidden property="userID" />
-			<html:hidden property="sessionMapID"/>
-			
-			<div id="content">
+	<c:set var="sessionMapID" value="${param.sessionMapID}" />
+	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+	<html:form action="/learning/submitReflection" method="post">
+		<html:hidden property="userID" />
+		<html:hidden property="sessionMapID" />
+
+		<div id="content">
 			<h1>
 				${sessionMap.title}
 			</h1>
-				<table>
-					<tr>
-						<td>
-							<%@ include file="/common/messages.jsp"%>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<lams:out value="${sessionMap.reflectInstructions}"/>
-						</td>
-					</tr>
-		
-					<tr>
-						<td>
-							<html:textarea cols="60" rows="8" property="entryText"/>
-						</td>
-					</tr>
-		
-					<tr>
-						<td class="right-buttons">
-							<html:submit styleClass="button">
-								<fmt:message key="label.finish"/>
-							</html:submit>
-						</td>
-					</tr>
-				</table>
+
+			<%@ include file="/common/messages.jsp"%>
+
+			<p>
+				<lams:out value="${sessionMap.reflectInstructions}" />
+			</p>
+
+			<html:textarea cols="60" rows="8" property="entryText"
+				styleClass="text-area" />
+
+			<div align="right" class="space-bottom-top">
+				<html:submit styleClass="button">
+					<fmt:message key="label.finish" />
+				</html:submit>
 			</div>
-		</html:form>
-		
-		<div id="footer">
 		</div>
-		<!--closes footer-->
+	</html:form>
 
+	<div id="footer">
+	</div>
+	<!--closes footer-->
+
 </body>
 </html:html>
Index: lams_tool_larsrc/web/pages/learning/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/Attic/runoffline.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_larsrc/web/pages/learning/runoffline.jsp	6 Oct 2006 02:48:19 -0000	1.5
+++ lams_tool_larsrc/web/pages/learning/runoffline.jsp	27 Oct 2006 08:29:33 -0000	1.6
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@include file="/common/taglibs.jsp"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <html:html locale="true">
 <head>
 	<%@ include file="/common/header.jsp"%>
@@ -22,38 +22,36 @@
 </head>
 
 <body class="stripes">
-			<h1>
-				${sessionMap.title}
-			</h1>
-			
-			<div id="content">
-				<table>
-					<tr>
-						<td>
-						<h2>
-							<fmt:message key="run.offline.message" />
-						</h2>
-						</td>
-					</tr>
-				</table>						
-				<div class="right-buttons">
-					<c:choose>
-						<c:when test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
-							<html:button property="FinishButton"  onclick="return continueReflect()"  styleClass="button">
-								<fmt:message key="label.continue" />
-							</html:button>
-						</c:when>
-						<c:otherwise>
-							<html:button property="FinishButton"  onclick="return finishSession()"  styleClass="button">
-								<fmt:message key="label.finished" />
-							</html:button>
-						</c:otherwise>
-					</c:choose>		
-				</div>
-			</div>
-	<div id="footer">
+	<div id="content">
+		<h1>
+			${sessionMap.title}
+		</h1>
+
+		<p>
+			<fmt:message key="run.offline.message" />
+		</p>
+
+		<div align="right" class="space-bottom-top">
+			<c:choose>
+				<c:when
+					test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
+					<html:button property="FinishButton"
+						onclick="return continueReflect()" styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</c:when>
+				<c:otherwise>
+					<html:button property="FinishButton"
+						onclick="return finishSession()" styleClass="button">
+						<fmt:message key="label.finished" />
+					</html:button>
+				</c:otherwise>
+			</c:choose>
 		</div>
-		<!--closes footer-->
+	</div>
+	<div id="footer">
+	</div>
+	<!--closes footer-->
 
 </body>
 </html:html>
Index: lams_tool_nb/web/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/defineLater.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_nb/web/defineLater.jsp	28 Sep 2006 23:31:32 -0000	1.2
+++ lams_tool_nb/web/defineLater.jsp	27 Oct 2006 08:29:51 -0000	1.3
@@ -1,16 +1,8 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-<h1>&nbsp;</h1>
-
-
-
 <div id="content">
-
-	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet"/>
-
+	<h1>
+		<fmt:message key="activity.title" />
+	</h1>
+	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
 </div>
-
-
-
-
-
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/learnerContent.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_nb/web/learnerContent.jsp	28 Sep 2006 23:31:32 -0000	1.13
+++ lams_tool_nb/web/learnerContent.jsp	27 Oct 2006 08:29:51 -0000	1.14
@@ -7,17 +7,13 @@
 	<c:out value="${NbLearnerForm.title}" escapeXml="false" />
 </h1>
 
-	<table width="100%">
-		<tr>
-			<td>
-				<p><c:out value="${NbLearnerForm.content}" escapeXml="false" /></p>
-			</td>
-		</tr>
+	
+				<p class="indent"><c:out value="${NbLearnerForm.content}" escapeXml="false" /></p>
+		
 
 		<c:if test="${!NbLearnerForm.readOnly}">
-		<tr>
-			<td>
-					<div class="right-buttons">
+		
+					<div align="right" class="space-bottom-top">
 						<html:form action="/learner" target="_self">
 								<html:hidden property="toolSessionID" />
 								<html:hidden property="mode" />
@@ -35,10 +31,9 @@
 								</c:choose>
 						</html:form>
 					</div>
-				</td>
-			</tr>
+			
 		</c:if>
-	</table>
+	
 </div>
 
 
Index: lams_tool_nb/web/message.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/message.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_nb/web/message.jsp	19 Sep 2006 06:37:24 -0000	1.7
+++ lams_tool_nb/web/message.jsp	27 Oct 2006 08:29:51 -0000	1.8
@@ -1,13 +1,15 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
-	<logic:messagesPresent message="true">
-		<html:messages id="message" message="true">
-			<p class="warning"><bean:write name="message" /></p>
-		</html:messages>
-	</logic:messagesPresent>
+<logic:messagesPresent message="true">
+	<html:messages id="message" message="true">
+		<p class="warning">
+			<bean:write name="message" />
+		</p>
+	</html:messages>
+</logic:messagesPresent>
 
-	<p align="right">
-		<html:form action="/learner" target="_self">
+<p align="right">
+	<html:form action="/learner" target="_self">
 		<html:hidden property="toolSessionID" />
 		<html:hidden property="mode" />
 		<html:submit property="method" styleClass="button">
@@ -20,5 +22,5 @@
 				</c:otherwise>
 			</c:choose>
 		</html:submit>
-		</html:form>
-	</p>
+	</html:form>
+</p>
Index: lams_tool_nb/web/reflect.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/reflect.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_nb/web/reflect.jsp	28 Sep 2006 23:31:32 -0000	1.3
+++ lams_tool_nb/web/reflect.jsp	27 Oct 2006 08:29:51 -0000	1.4
@@ -6,31 +6,19 @@
 </h1>
 
 	<html:form action="/learner" method="post">
-		<table width="100%">
-			<tr>
-				<td>
-					<lams:out value="${reflectInstructions}" />				
-				</td>
-			</tr>
-
-			<tr>
-				<td>
-					<html:textarea cols="60" rows="8" property="reflectionText"></html:textarea>
-				</td>
-			</tr>
-
-			<tr>
-				<td>
-					<div class="right-buttons">
+		 
+					<p><lams:out value="${reflectInstructions}" /></p>				
+			 
+					<html:textarea cols="60" rows="8" property="reflectionText" styleClass="text-area"></html:textarea>
+				 
+					<div align="right" class="space-bottom-top">
 						<html:hidden property="toolSessionID" />
 						<html:hidden property="mode" />
 						<html:submit property="method" styleClass="button">
 							<fmt:message key="button.finish" />
 						</html:submit>
 					</div>
-				</td>
-			</tr>
-		</table>
+			 
 	</html:form>
 </div>
 
Index: lams_tool_notebook/web/pages/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/defineLater.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/web/pages/learning/defineLater.jsp	28 Sep 2006 23:31:51 -0000	1.2
+++ lams_tool_notebook/web/pages/learning/defineLater.jsp	27 Oct 2006 08:30:33 -0000	1.3
@@ -1,21 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <div id="content">
-<h1>
-	<fmt:message key="activity.title" />
-</h1>
-
-	<table>
-		<tr>
-			<td>
-				<fmt:message>message.defineLaterSet</fmt:message>
-			</td>
-		</tr>
-	</table>
-
-	<div class="right-buttons">
-		<a href="javascript:location.reload(true);" class="button"><fmt:message key="button.try.again" /></a>
-	</div>
+	<h1>
+		<fmt:message key="activity.title" />
+	</h1>
+	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
 </div>
 
 
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/notebook.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_notebook/web/pages/learning/notebook.jsp	28 Sep 2006 23:31:51 -0000	1.8
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	27 Oct 2006 08:30:33 -0000	1.9
@@ -1,66 +1,68 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <div id="content">
-<h1>
-	${notebookDTO.title}
-</h1>
+	<h1>
+		${notebookDTO.title}
+	</h1>
 
 	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<html:form action="/learning" method="post">
 
-			<table>
-				<tr>
-					<td>
-						${notebookDTO.instructions}
-					</td>
-				</tr>
 
-				<tr>
-					<td>
-						<c:set var="lrnForm"
-							value="<%=request
+			<p>
+				${notebookDTO.instructions}
+			</p>
+
+			<c:set var="lrnForm"
+				value="<%=request
 											.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-						<c:choose>
-							<c:when test="${contentEditable}">
-								<c:choose>
-									<c:when test="${notebookDTO.allowRichEditor}">
-										<c:set var="language"><lams:user property="localeLanguage"/></c:set>
-										<fck:editor id="entryText" basePath="/lams/fckeditor/"
-											imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
-											linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
-											flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
-											imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
-											linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
-											flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
-											toolbarSet="Default-Learner" defaultLanguage="${language}" autoDetectLanguage="false">
+			<c:choose>
+				<c:when test="${contentEditable}">
+					<c:choose>
+						<c:when test="${notebookDTO.allowRichEditor}">
+							<c:set var="language">
+								<lams:user property="localeLanguage" />
+							</c:set>
+							<fck:editor id="entryText" basePath="/lams/fckeditor/"
+								imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
+								linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+								flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
+								imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+								linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+								flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
+								toolbarSet="Default-Learner" defaultLanguage="${language}"
+								autoDetectLanguage="false">
 												${lrnForm.entryText}
 										</fck:editor>
-									</c:when>
+						</c:when>
 
-									<c:otherwise>
-										<html:textarea cols="60" rows="8" property="entryText"></html:textarea>
-									</c:otherwise>
-								</c:choose>
-							</c:when>
+						<c:otherwise>
+							<html:textarea cols="60" rows="8" property="entryText"
+								styleClass="text-area"></html:textarea>
+						</c:otherwise>
+					</c:choose>
+				</c:when>
 
-							<c:otherwise>
+				<c:otherwise>
 								${lrnForm.entryText}
 							</c:otherwise>
-						</c:choose>
-					</td>
-				</tr>
+			</c:choose>
 
-				<tr>
-					<td class="right-buttons">
-						<html:hidden property="dispatch" value="finishActivity" />
-						<html:hidden property="toolSessionID" />
-						<html:submit styleClass="button">
-							<fmt:message>button.finish</fmt:message>
-						</html:submit>
-					</td>
-				</tr>
-			</table>
+
+			<div align="right" class="space-bottom-top">
+			
+			<html:hidden property="dispatch" value="finishActivity" />
+			<html:hidden property="toolSessionID" />
+			<html:submit styleClass="button">
+				<fmt:message>button.finish</fmt:message>
+			</html:submit>
+
 		</html:form>
+			</div>
+	
 	</c:if>
+
+
+
 </div>
 
Index: lams_tool_notebook/web/pages/learning/runOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/Attic/runOffline.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_notebook/web/pages/learning/runOffline.jsp	28 Sep 2006 23:31:51 -0000	1.3
+++ lams_tool_notebook/web/pages/learning/runOffline.jsp	27 Oct 2006 08:30:33 -0000	1.4
@@ -1,36 +1,28 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <div id="content">
-<h1>
-	${notebookDTO.title}
-</h1>
+	<h1>
+		${notebookDTO.title}
+	</h1>
 
+	<p>
+		${notebookDTO.instructions}
+	</p>
+
+	<p>
+		<fmt:message key="message.runOfflineSet" />
+	</p>
+
 	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<html:form action="/learning" method="post">
+			<html:hidden property="dispatch" value="finishActivity" />
+			<html:hidden property="toolSessionID" />
 
-			<table>
-				<tr>
-					<td>
-						${notebookDTO.instructions}
-					</td>
-				</tr>
-
-				<tr>
-					<td>
-						<fmt:message key="message.runOfflineSet" />
-					</td>
-				</tr>
-
-				<tr>
-					<td class="right-buttons">
-						<html:hidden property="dispatch" value="finishActivity" />
-						<html:hidden property="toolSessionID" />
-						<html:submit styleClass="button">
-							<fmt:message>button.finish</fmt:message>
-						</html:submit>
-					</td>
-				</tr>
-			</table>
+			<div align="right" class="space-bottom-top">
+				<html:submit styleClass="button">
+					<fmt:message>button.finish</fmt:message>
+				</html:submit>
+			</div>
 		</html:form>
 	</c:if>
 </div>
Index: lams_tool_sbmt/web/common/messages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/common/messages.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/web/common/messages.jsp	14 Sep 2006 07:16:21 -0000	1.2
+++ lams_tool_sbmt/web/common/messages.jsp	27 Oct 2006 08:30:49 -0000	1.3
@@ -1,6 +1,7 @@
+<%@include file="/common/taglibs.jsp"%>
+
 <%-- Error Messages --%>
 <logic:messagesPresent>
-	<p>&nbsp;</p>
 	<p class="warning">
 	        <html:messages id="error">
 	            <c:out value="${error}" escapeXml="false"/><br/>
Index: lams_tool_sbmt/web/learner/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/definelater.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_sbmt/web/learner/definelater.jsp	28 Sep 2006 23:32:05 -0000	1.7
+++ lams_tool_sbmt/web/learner/definelater.jsp	27 Oct 2006 08:30:59 -0000	1.8
@@ -6,26 +6,16 @@
 <html:html>
 <head>
 	<%@ include file="/common/header.jsp"%>
-	<script type="text/javascript">
-		var locked =  <c:out value="${learner.locked}"/>;
-		function finish(){
-			var finishUrl= "<html:rewrite page='/learner.do?method=finish&toolSessionID=${learner.toolSessionID}'/>";
-			location.href= finishUrl;
-		}
-	</script>
 </head>
 
 <body class="stripes">
-
-		<div id="content">
+	<div id="content">
 		<h1>
-			<fmt:message key="activity.title"></fmt:message>
+			<fmt:message key="activity.title" />
 		</h1>
-
-			<lams:DefineLater/>
-		</div>
-		<div id="footer"></div>
-
+		<lams:DefineLater />
+	</div>
+	<div id="footer"></div>
 </body>
 </html:html>
 
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/notebook.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/web/learner/notebook.jsp	29 Sep 2006 06:11:19 -0000	1.3
+++ lams_tool_sbmt/web/learner/notebook.jsp	27 Oct 2006 08:30:59 -0000	1.4
@@ -4,51 +4,39 @@
 
 <html:html locale="true">
 <head>
-	<title><fmt:message key="label.learning.title" /></title>
+	<title><fmt:message key="label.learning.title" />
+	</title>
 	<%@ include file="/common/header.jsp"%>
 </head>
 
 <body class="stripes">
 
-		<c:set var="sessionMapID" value="${param.sessionMapID}"/>
-		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-		<html:form action="/learning/submitReflection" method="post">
-			<html:hidden property="userID" />
-			<html:hidden property="sessionMapID"/>
-			<div id="content">
+	<c:set var="sessionMapID" value="${param.sessionMapID}" />
+	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+	<html:form action="/learning/submitReflection" method="post">
+		<html:hidden property="userID" />
+		<html:hidden property="sessionMapID" />
+		<div id="content">
 			<h1>
 				${sessionMap.title}
 			</h1>
-			
-					<table>
-						<tr>
-							<td>
-								<%@ include file="/common/messages.jsp"%>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<lams:out value="${sessionMap.reflectInstructions}"/>
-							</td>
-						</tr>
-			
-						<tr>
-							<td>
-								<html:textarea cols="60" rows="8" property="entryText"/>
-							</td>
-						</tr>
-			
-						<tr>
-							<td class="right-buttons">
-								<html:submit styleClass="button">
-									<fmt:message key="button.finish"/>
-								</html:submit>
-							</td>
-						</tr>
-					</table>
+
+			<%@ include file="/common/messages.jsp"%>
+
+			<p>
+				<lams:out value="${sessionMap.reflectInstructions}" />
+			</p>
+
+			<html:textarea cols="60" rows="8" property="entryText"
+				styleClass="text-area" />
+
+			<div align="right" class="space-bottom-top">
+				<html:submit styleClass="button">
+					<fmt:message key="button.finish" />
+				</html:submit>
 			</div>
-		</html:form>
+	</html:form>
 	<div id="footer"></div>
 
 </body>
-</html:html>	
+</html:html>
Index: lams_tool_sbmt/web/learner/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/Attic/runoffline.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/web/learner/runoffline.jsp	6 Oct 2006 02:48:16 -0000	1.8
+++ lams_tool_sbmt/web/learner/runoffline.jsp	27 Oct 2006 08:30:59 -0000	1.9
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@include file="/common/taglibs.jsp"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <html:html>
 <head>
@@ -22,38 +22,34 @@
 </head>
 
 <body class="stripes">
+	<div id="content">
 
 		<h1>
 			<fmt:message key="activity.title"></fmt:message>
 		</h1>
 
-		<div id="content">
-			<table>
-				<tr>
-					<td>
-						<h2>
-							<fmt:message key="run.offline.message" />
-						</h2>
-					</td>
-				</tr>
-			</table>
-			
-			<div class="right-buttons">
-				<c:choose>
-					<c:when test="${sessionMap.reflectOn and (not sessionMap.finishLock)}">
-						<html:button property="continueButton" onclick="javascript:notebook();" styleClass="button">
-							<fmt:message key="label.continue" />
-						</html:button>
-					</c:when>
-					<c:otherwise>
-						<html:button property="finishButton" onclick="javascript:finish();" styleClass="button">
-							<fmt:message key="button.finish" />
-						</html:button>
-					</c:otherwise>
-				</c:choose>				
-			</div>
-		</div>
-		<div id="footer"></div>
+		<p>
+			<fmt:message key="run.offline.message" />
+		</p>
 
+		<div align="right" class="space-bottom-top">
+			<c:choose>
+				<c:when
+					test="${sessionMap.reflectOn and (not sessionMap.finishLock)}">
+					<html:button property="continueButton"
+						onclick="javascript:notebook();" styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</c:when>
+				<c:otherwise>
+					<html:button property="finishButton" onclick="javascript:finish();"
+						styleClass="button">
+						<fmt:message key="button.finish" />
+					</html:button>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</div>
+	<div id="footer"></div>
 </body>
 </html:html>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/sbmtlearner.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	9 Oct 2006 04:51:22 -0000	1.11
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	27 Oct 2006 08:30:59 -0000	1.12
@@ -2,16 +2,17 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@include file="/common/taglibs.jsp"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <html:html>
 <head>
 	<title><fmt:message key="tool.display.name" /></title>
 	<html:base />
 	<%@ include file="/common/header.jsp"%>
 
-	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">	
-	
+	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>"
+		rel="stylesheet" type="text/css">
+
 	<script type="text/javascript">
 		function submitCount(tUrl){
 			var lockOnFinished = <c:out value="${sessionMap.lockOnFinish}"/>;
@@ -49,178 +50,174 @@
 
 <body class="stripes">
 
-		<div id="content">
+	<div id="content">
 		<h1>
 			<c:out value="${sessionMap.title}" escapeXml="false" />
 		</h1>
 
-			<table cellpadding="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td colspan="2">
-						<h2>
-							<c:out value="${sessionMap.instruction}" escapeXml="false" />
-						</h2>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<%@include file="/common/messages.jsp"%>
-						<c:if test="${sessionMap.limitUpload}">
-							<fmt:message key="message.left.upload.limit">
-								 <fmt:param value="${learner.limitUploadLeft}"/>
-							</fmt:message>
-						</c:if>
-					</td>
-				</tr>
+		<p>
+			<c:out value="${sessionMap.instruction}" escapeXml="false" />
+		</p>
 
-				<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
-				<c:choose>
+		<%@include file="/common/messages.jsp"%>
+		<c:if test="${sessionMap.limitUpload}">
+			<fmt:message key="message.left.upload.limit">
+				<fmt:param value="${learner.limitUploadLeft}" />
+			</fmt:message>
+		</c:if>
 
-					<c:when test="${empty learner.filesUploaded}">
+		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
+		<c:choose>
+
+			<c:when test="${empty learner.filesUploaded}">
+				<p>
+					<fmt:message key="label.learner.noUpload" />
+				</p>
+			</c:when>
+
+			<c:otherwise>
+				<c:forEach var="file" items="${learner.filesUploaded}">
+					
+					<div class="shading-bg">
+					<table>
 						<tr>
+							<!--First Row displaying the name of the File -->
+							<td class="field-name">
+								<fmt:message key="label.learner.fileName" />
+							</td>
 							<td>
-							<fmt:message key="label.learner.noUpload" />
-								<%-- 
-								<p>
-									<fmt:message key="label.learner.uploadMessage" />
-								</p>
-								--%>
+								<c:out value="${file.filePath}" />
+
+								<c:if test="${file.currentLearner}">
+									<c:set var="downloadURL">
+										<c:url
+											value="/download?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true" />
+									</c:set>
+									<a href="${downloadURL}"><fmt:message key="label.download" />
+									</a>
+								</c:if>
 							</td>
 						</tr>
-					</c:when>
 
-					<c:otherwise>
+						<tr>
+							<!--Second Row displaying the description of the File -->
+							<td class="field-name">
+								<fmt:message key="label.learner.fileDescription" />
+							</td>
+							<td>
+								<lams:out value="${file.fileDescription}" />
+							</td>
+						</tr>
 
-						<c:forEach var="file" items="${learner.filesUploaded}">
-							<tr>
-								<!--First Row displaying the name of the File -->
-								<td class="field-name">
-									<fmt:message key="label.learner.fileName" />
-								</td>
-								<td>
-									<c:out value="${file.filePath}" /> &nbsp;&nbsp;
-									<c:if test="${file.currentLearner}">
-										<c:set var="downloadURL">
-											<c:url value="/download?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true"/>
-										</c:set>
-										<a href="${downloadURL}"><fmt:message key="label.download"/> </a>
-									</c:if>
-								</td>
-							</tr>
-							<tr>
-								<!--Second Row displaying the description of the File -->
-								<td class="field-name">
-									<fmt:message key="label.learner.fileDescription" />
-								</td>
-								<td>
-									<lams:out value="${file.fileDescription}"/>
-								</td>
-							</tr>
-							<tr>
-								<!--Third row displaying the date of submission of the File -->
-								<td class="field-name">
-									<fmt:message key="label.learner.time" />
-								</td>
-								<td>
-									<lams:Date value="${file.dateOfSubmission}" />
-								</td>
-							</tr>
-							<tr>
-								<!--Fourth row displaying the comments -->
-								<td class="field-name">
-									<fmt:message key="label.learner.comments" />
-								</td>
-								<td>
-									<c:choose>
-										<c:when test="${empty file.comments}">
-											<fmt:message key="label.learner.notAvailable" />
-										</c:when>
-										<c:otherwise>
-											<c:out value="${file.comments}" escapeXml="false" />
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-							<tr>
-								<!--Fifth row displaying the marks-->
-								<td class="field-name">
-									<fmt:message key="label.learner.marks" />
-								</td>
-								<td>
-									<c:choose>
-										<c:when test="${empty file.comments}">
-											<fmt:message key="label.learner.notAvailable" />
-										</c:when>
-										<c:otherwise>
-											<c:out value="${file.marks}" escapeXml="false" />
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-							<tr>
-								<td colspan="2">
-									<hr size="1" style="width:500px;"/>
-								</td>
-							</tr>
-						</c:forEach>
-
-					</c:otherwise>
-				</c:choose>
-
-			</table>
-
-			<c:if test="${sessionMap.mode != 'teacher'}">
-				<html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data">
-					<html:hidden property="sessionMapID"/>
-					<table>
-						<!-- Hidden fields -->
-						<html:hidden property="toolSessionID" value="${sessionMap.toolSessionID}" />
-
-						<!--File path row -->
 						<tr>
+							<!--Third row displaying the date of submission of the File -->
 							<td class="field-name">
-								<fmt:message key="label.learner.filePath" />
+								<fmt:message key="label.learner.time" />
 							</td>
 							<td>
-								<html:file property="file" disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" size="40" tabindex="1" />
+								<lams:Date value="${file.dateOfSubmission}" />
 							</td>
 						</tr>
-						<!--File Description row -->
+
 						<tr>
+							<!--Fourth row displaying the comments -->
 							<td class="field-name">
-								<fmt:message key="label.learner.fileDescription" />
+								<fmt:message key="label.learner.comments" />
 							</td>
 							<td>
-								<html:textarea rows="5" cols="40" tabindex="2" property="description" disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
+								<c:choose>
+									<c:when test="${empty file.comments}">
+										<fmt:message key="label.learner.notAvailable" />
+									</c:when>
+									<c:otherwise>
+										<c:out value="${file.comments}" escapeXml="false" />
+									</c:otherwise>
+								</c:choose>
 							</td>
 						</tr>
+
 						<tr>
-							<td colspan="2" align="center">
-								<span class="left-buttons">
-									<c:choose>
-										<c:when test="${sessionMap.reflectOn and (not sessionMap.finishLock)}">
-											<html:button property="notebookButton" onclick="javascript:notebook();" styleClass="button">
-												<fmt:message key="label.continue" />
-											</html:button>
-										</c:when>
-										<c:otherwise>
-											<html:button property="finishButton" onclick="javascript:finish();" styleClass="button">
-												<fmt:message key="button.finish" />
-											</html:button>
-										</c:otherwise>
-									</c:choose>
-								</span>						
-								<span class="right-buttons">
-									<html:submit disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" styleClass="button">
-										<fmt:message key="label.learner.upload" />
-									</html:submit>
-								</span>
+							<!--Fifth row displaying the marks-->
+							<td class="field-name">
+								<fmt:message key="label.learner.marks" />
 							</td>
+							<td>
+								<c:choose>
+									<c:when test="${empty file.comments}">
+										<fmt:message key="label.learner.notAvailable" />
+									</c:when>
+									<c:otherwise>
+										<c:out value="${file.marks}" escapeXml="false" />
+									</c:otherwise>
+								</c:choose>
+							</td>
 						</tr>
 					</table>
-				</html:form>
-			</c:if>
-		</div>
-		<div id="footer"></div>
+					</div>
+				</c:forEach>
+
+			</c:otherwise>
+		</c:choose>
+
+
+
+		<div class="last-item"></div>
+		
+		<c:if test="${sessionMap.mode != 'teacher'}">
+			<html:form action="/learner?method=uploadFile" method="post"
+				enctype="multipart/form-data">
+				<html:hidden property="sessionMapID" />
+
+				<!-- Hidden fields -->
+				<html:hidden property="toolSessionID"
+					value="${sessionMap.toolSessionID}" />
+
+				<!--File path row -->
+				<div class="field-name">
+					<fmt:message key="label.learner.filePath" />
+				</div>
+
+				<html:file property="file"
+					disabled="${sessionMap.finishLock || sessionMap.arriveLimit}"
+					size="40" tabindex="1" />
+
+				<!--File Description row -->
+				<div class="field-name space-top">
+					<fmt:message key="label.learner.fileDescription" />
+				</div>
+				<html:textarea rows="5" cols="40" tabindex="2" styleClass="text-area"
+					property="description"
+					disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
+
+				<div class="small-space-top">
+					<html:submit
+						disabled="${sessionMap.finishLock || sessionMap.arriveLimit}"
+						styleClass="button">
+						<fmt:message key="label.learner.upload" />
+					</html:submit>
+				</div>
+
+				<div class="space-bottom-top" align="right">
+					<c:choose>
+						<c:when
+							test="${sessionMap.reflectOn and (not sessionMap.finishLock)}">
+							<html:button property="notebookButton"
+								onclick="javascript:notebook();" styleClass="button">
+								<fmt:message key="label.continue" />
+							</html:button>
+						</c:when>
+						<c:otherwise>
+							<html:button property="finishButton"
+								onclick="javascript:finish();" styleClass="button">
+								<fmt:message key="button.finish" />
+							</html:button>
+						</c:otherwise>
+					</c:choose>
+				</div>
+
+			</html:form>
+		</c:if>
+	</div>
+	<div id="footer"></div>
 </body>
 </html:html>
Index: lams_tool_scribe/web/pages/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/defineLater.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scribe/web/pages/learning/defineLater.jsp	29 Sep 2006 02:44:37 -0000	1.2
+++ lams_tool_scribe/web/pages/learning/defineLater.jsp	27 Oct 2006 08:31:20 -0000	1.3
@@ -1,11 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<h1>
-	<fmt:message key="activity.title" />
-</h1>
-
 <div id="content">
-	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet"/>
+	<h1>
+		<fmt:message key="activity.title" />
+	</h1>
+	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
 </div>
 
 
Index: lams_tool_scribe/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/notebook.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scribe/web/pages/learning/notebook.jsp	29 Sep 2006 02:44:37 -0000	1.2
+++ lams_tool_scribe/web/pages/learning/notebook.jsp	27 Oct 2006 08:31:20 -0000	1.3
@@ -1,34 +1,29 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<h1>
-	${scribeDTO.title}
-</h1>
 
 <div id="content">
+
+	<h1>
+		${scribeDTO.title}
+	</h1>
+
 	<html:form action="/learning" method="post">
-		<table>
-			<tr>
-				<td>
-					${scribeDTO.reflectInstructions}
-				</td>
-			</tr>
+		<html:hidden property="dispatch" value="submitReflection" />
+		<html:hidden property="scribeUserUID" />
 
-			<tr>
-				<td>
-					<html:textarea cols="60" rows="8" property="entryText"></html:textarea>
-				</td>
-			</tr>
+		<p>
+			${scribeDTO.reflectInstructions}
+		</p>
 
-			<tr>
-				<td class="right-buttons">
-					<html:hidden property="dispatch" value="submitReflection" />
-					<html:hidden property="scribeUserUID" />
-					<html:submit styleClass="button">
-						<fmt:message>button.finish</fmt:message>
-					</html:submit>
-				</td>
-			</tr>
-		</table>
+		<html:textarea cols="60" rows="8" property="entryText"
+			styleClass="text-area"></html:textarea>
+
+		<div align="right" class="space-bottom-top">
+			<html:submit styleClass="button">
+				<fmt:message>button.finish</fmt:message>
+			</html:submit>
+		</div>
+
 	</html:form>
 </div>
 
Index: lams_tool_scribe/web/pages/learning/runOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/Attic/runOffline.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scribe/web/pages/learning/runOffline.jsp	29 Sep 2006 02:44:37 -0000	1.2
+++ lams_tool_scribe/web/pages/learning/runOffline.jsp	27 Oct 2006 08:31:20 -0000	1.3
@@ -1,22 +1,15 @@
 <%@ include file="/common/taglibs.jsp"%>
-
-<h1>
-	<fmt:message key="activity.title" />
-</h1>
-
 <div id="content">
+	<h1>
+		<fmt:message key="activity.title" />
+	</h1>
 
-	<table>
-		<tr>
-			<td>
-				<fmt:message key="message.runOfflineSet" />
-			</td>
-		</tr>
-	</table>
+	<p>
+		<fmt:message key="message.runOfflineSet" />
+	</p>
 
 	<c:if test="${MODE == 'learner' || MODE == 'author'}">
 		<%@ include file="parts/finishButton.jsp"%>
 	</c:if>
-	<div class="space-bottom"></div>
 </div>
 
Index: lams_tool_survey/web/pages/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/definelater.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/web/pages/learning/definelater.jsp	28 Sep 2006 23:38:35 -0000	1.2
+++ lams_tool_survey/web/pages/learning/definelater.jsp	27 Oct 2006 08:31:37 -0000	1.3
@@ -1,25 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
 <%@include file="/common/taglibs.jsp"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
 <html:html locale="true">
 <head>
 	<%@ include file="/common/header.jsp"%>
 	<meta http-equiv="refresh" content="60">
 </head>
 
 <body class="stripes">
-
-		<div id="content">
+	<div id="content">
 		<h1>
-			${survey.title}
+			<fmt:message key="activity.title" />
 		</h1>
-
-			<lams:DefineLater/>
-		</div>
-		
-		<div id="footer">
-		</div>
-		<!--closes footer-->
-
-
+		<lams:DefineLater />
+	</div>
+	<div id="footer">
+	</div>
+	<!--closes footer-->
 </body>
 </html:html>
Index: lams_tool_survey/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/notebook.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/web/pages/learning/notebook.jsp	29 Sep 2006 03:46:07 -0000	1.3
+++ lams_tool_survey/web/pages/learning/notebook.jsp	27 Oct 2006 08:31:37 -0000	1.4
@@ -9,49 +9,39 @@
 </head>
 <body class="stripes">
 
-		<c:set var="sessionMapID" value="${param.sessionMapID}"/>
-		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-		
-		<html:form action="/learning/submitReflection" method="post">
-			<html:hidden property="userID" />
-			<html:hidden property="sessionMapID"/>
-			
-			<div id="content">
+	<c:set var="sessionMapID" value="${param.sessionMapID}" />
+	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+
+	<html:form action="/learning/submitReflection" method="post">
+		<html:hidden property="userID" />
+		<html:hidden property="sessionMapID" />
+
+		<div id="content">
 			<h1>
 				${sessionMap.title}
 			</h1>
-				<table>
-					<tr>
-						<td>
-							<%@ include file="/common/messages.jsp"%>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<lams:out value="${sessionMap.reflectInstructions}"/>
-						</td>
-					</tr>
-		
-					<tr>
-						<td>
-							<lams:STRUTS-textarea cols="60" rows="8" property="entryText"/>
-						</td>
-					</tr>
-		
-					<tr>
-						<td class="right-buttons">
-							<html:submit styleClass="button">
-								<fmt:message key="label.finish"/>
-							</html:submit>
-						</td>
-					</tr>
-				</table>
+
+			<p>
+				<lams:out value="${sessionMap.reflectInstructions}" />
+			</p>
+			
+			<%@ include file="/common/messages.jsp"%>
+
+			<lams:STRUTS-textarea cols="60" rows="8" property="entryText"
+				styleClass="text-area" />
+
+			<div align="right" class="space-bottom-top">
+				<html:submit styleClass="button">
+					<fmt:message key="label.finish" />
+				</html:submit>
 			</div>
-		</html:form>
-		
-		<div id="footer">
+
 		</div>
-		<!--closes footer-->
+	</html:form>
 
+	<div id="footer">
+	</div>
+	<!--closes footer-->
+
 </body>
 </html:html>
Index: lams_tool_survey/web/pages/learning/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/Attic/runoffline.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/web/pages/learning/runoffline.jsp	6 Oct 2006 02:48:19 -0000	1.3
+++ lams_tool_survey/web/pages/learning/runoffline.jsp	27 Oct 2006 08:31:37 -0000	1.4
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@include file="/common/taglibs.jsp"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <html:html locale="true">
 <head>
 	<%@ include file="/common/header.jsp"%>
@@ -22,36 +22,34 @@
 </head>
 
 <body class="stripes">
-			<h1>
-				${sessionMap.title}
-			</h1>
-			<div id="content">
-				<table>
-					<tr>
-						<td>
-							<h2>
-								<fmt:message key="run.offline.message" />
-							</h2>
-						</td>
-					</tr>
-				</table>						
-				<div class="buttons-right">
-					<c:choose>
-						<c:when test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
-							<html:button property="FinishButton"  onclick="return continueReflect()" styleClass="button">
-								<fmt:message key="label.continue" />
-							</html:button>
-						</c:when>
-						<c:otherwise>
-							<html:button property="FinishButton"  onclick="return finishSession()"  styleClass="button">
-								<fmt:message key="label.finished" />
-							</html:button>
-						</c:otherwise>
-					</c:choose>		
-				</div>
-			</div>
-	<div class="space-bottom"></div>
-		<!--closes footer-->
+	<div id="content">
 
+		<h1>
+			${sessionMap.title}
+		</h1>
+
+		<p>
+			<fmt:message key="run.offline.message" />
+		</p>
+
+		<div align="right" class="space-bottom-top">
+			<c:choose>
+				<c:when
+					test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
+					<html:button property="FinishButton"
+						onclick="return continueReflect()" styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</c:when>
+				<c:otherwise>
+					<html:button property="FinishButton"
+						onclick="return finishSession()" styleClass="button">
+						<fmt:message key="label.finished" />
+					</html:button>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</div>
+	<!--closes footer-->
 </body>
 </html:html>
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Notebook.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_vote/web/learning/Notebook.jsp	17 Oct 2006 20:29:42 -0000	1.4
+++ lams_tool_vote/web/learning/Notebook.jsp	27 Oct 2006 08:31:52 -0000	1.5
@@ -35,8 +35,9 @@
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css/>
-	<title><fmt:message key="activity.title" /></title>
+	<lams:css />
+	<title><fmt:message key="activity.title" />
+	</title>
 
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) 
@@ -45,51 +46,41 @@
 			document.VoteLearningForm.submit();
 		}
 	</script>
-	
+
 </head>
 
 <body class="stripes">
-	
-	
+	<html:form action="/learning?validate=false"
+		enctype="multipart/form-data" method="POST" target="_self">
 
-	<html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">
+		<html:hidden property="dispatch" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
 
-		<html:hidden property="dispatch"/>
-		<html:hidden property="toolSessionID"/>
-		<html:hidden property="userID"/>	
-	
 		<div id="content">
-		
-	<h1>
-		<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false"/> 		
-	</h1>
-	
-		<table>
-			<tr>
-				<td>
-					<c:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false"/> 
-				</td>
-			</tr>
+			<h1>
+				<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}"
+					escapeXml="false" />
+			</h1>
 
-			<tr>
-				<td>
-					<html:textarea cols="60" rows="8" property="entryText"></html:textarea>
-				</td>
-			</tr>
+			<p>
+				<c:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}"
+					escapeXml="false" />
+			</p>
 
-			<tr>
-				<td class="right-buttons">
-					<html:submit property="submitReflection" onclick="javascript:submitMethod('submitReflection');" styleClass="button">					
-						<fmt:message key="button.endLearning"/>
-					</html:submit>
-				</td>
-			</tr>
-		</table>
+			<html:textarea cols="60" rows="8" property="entryText"
+				styleClass="text-area"></html:textarea>
 
-		
+			<div align="right" class="space-bottom-top">
+				<html:submit property="submitReflection"
+					onclick="javascript:submitMethod('submitReflection');"
+					styleClass="button">
+					<fmt:message key="button.endLearning" />
+				</html:submit>
+			</div>
+
 		</div>
-	</html:form>	
-	
+	</html:form>
 </body>
 </html:html>
 
Index: lams_tool_vote/web/learning/RunOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/web/learning/RunOffline.jsp	17 Oct 2006 20:29:42 -0000	1.5
+++ lams_tool_vote/web/learning/RunOffline.jsp	27 Oct 2006 08:31:52 -0000	1.6
@@ -35,8 +35,9 @@
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css/>
-	<title><fmt:message key="activity.title" /></title>
+	<lams:css />
+	<title><fmt:message key="activity.title" />
+	</title>
 
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) 
@@ -45,43 +46,46 @@
 			document.VoteLearningForm.submit();
 		}
 	</script>
-	
+
 </head>
 
 <body class="stripes">
 
-	<html:form  action="/learning?validate=false" enctype="multipart/form-data"method="POST" target="_self">	
-		<html:hidden property="dispatch"/>
-		<html:hidden property="toolSessionID"/>
-		<html:hidden property="userID"/>	
-	
+	<html:form action="/learning?validate=false"
+		enctype="multipart/form-data" method="POST" target="_self">
+		<html:hidden property="dispatch" />
+		<html:hidden property="toolSessionID" />
+		<html:hidden property="userID" />
+
 		<div id="content">
-			&nbsp&nbsp&nbsp&nbsp&nbsp <fmt:message key="label.learning.forceOfflineMessage" />
-			
-			<table>	
-			<tr>	
-			<td>
-				<div class="right-buttons">
 
-					<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
-						<html:submit property="learnerFinished"  onclick="javascript:submitMethod('learnerFinished');" styleClass="button">
-							<fmt:message key="label.finished"/>
-						</html:submit>	 										
-				  	</c:if> 				    					
-	
-					<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
-						<html:submit property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');" styleClass="button">
-							<fmt:message key="label.continue"/>
-						</html:submit>	 				
-				  	</c:if> 				    					
-			  	
-				</div> 		  															 		  					
-			</td> 
-			</tr>
-			</table>
+			<p>
+				<fmt:message key="label.learning.forceOfflineMessage" />
+			</p>
+
+			<div align="right" class="space-bottom-top">
+
+				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
+					<html:submit property="learnerFinished"
+						onclick="javascript:submitMethod('learnerFinished');"
+						styleClass="button">
+						<fmt:message key="label.finished" />
+					</html:submit>
+				</c:if>
+
+				<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true'}">
+					<html:submit property="forwardtoReflection"
+						onclick="javascript:submitMethod('forwardtoReflection');"
+						styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:submit>
+				</c:if>
+
+			</div>
+
 		</div>
-	</html:form>	
-	
+	</html:form>
+
 </body>
 </html:html>
 
Index: lams_tool_vote/web/learning/defineLater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/defineLater.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/web/learning/defineLater.jsp	17 Oct 2006 20:29:42 -0000	1.5
+++ lams_tool_vote/web/learning/defineLater.jsp	27 Oct 2006 08:31:52 -0000	1.6
@@ -35,18 +35,19 @@
 <head>
 	<html:base />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<lams:css/>
-	<title><fmt:message key="activity.title" /></title>
+	<lams:css />
+	<title><fmt:message key="activity.title" />
+	</title>
 </head>
 
 <body class="stripes">
-	
 	<div id="content">
-		<lams:DefineLater defineLaterMessageKey="error.defineLater"/>
+		<h1>
+			<fmt:message key="activity.title" />
+		</h1>
+		<lams:DefineLater defineLaterMessageKey="error.defineLater" />
 	</div>
-	
 	<div id="footer"></div>
-
 </body>
 </html:html>