Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.52 -r1.53
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	7 Apr 2006 00:44:22 -0000	1.52
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	24 May 2006 15:43:47 -0000	1.53
@@ -223,7 +223,7 @@
     public static final String QUESTION_LISTING_MODE_COMBINED			="questionListingModeCombined";
     
     public static final String FEEDBACK_TYPE_SEQUENTIAL					="You will be presented a total of : ";
-    public static final String FEEDBACK_TYPE_COMBINED					="You are being presented a total of : ";
+    public static final String FEEDBACK_TYPE_COMBINED					="You are being presented total of: ";
     public static final String QUESTIONS								=" questions.";
 
     public static final String ATTACHMENT_LIST                          ="attachmentList";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	7 Apr 2006 00:44:22 -0000	1.5
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	24 May 2006 15:43:47 -0000	1.6
@@ -86,6 +86,7 @@
 package org.lamsfoundation.lams.tool.qa.web;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.Map;
 
 import javax.servlet.ServletException;
@@ -101,6 +102,7 @@
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueUsr;
+import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -173,7 +175,6 @@
     		{
     			logger.debug("totalQuestionCount is 1: " + qaLearningForm.getAnswer());
     			mapAnswers.put(new Long(1).toString(), qaLearningForm.getAnswer());
-    			
     		}
     		else 
     		{
@@ -288,7 +289,8 @@
         qaLearningForm.resetUserActions(); /*resets all except submitAnswersContent */
         
         request.getSession().setAttribute(MAP_ANSWERS, mapAnswers);
-                
+        logger.debug("final MAP_ANSWERS: " + mapAnswers);
+        
         return (mapping.findForward(LOAD_LEARNER));
     }
     
@@ -370,6 +372,14 @@
 	    logger.debug("leaving the tool: " +
 	                 "leaveToolSession() with toolSessionId: " +  toolSessionId + " and user: " + user);
 	    
+	    logger.debug("set status to COMPLETE");
+	    QaSession qaSession = qaService.retrieveQaSessionOrNullById(toolSessionId.longValue());
+	    logger.debug("qaSession: " + qaSession);
+        qaSession.setSession_end_date(new Date(System.currentTimeMillis()));
+        qaSession.setSession_status(COMPLETED); 
+        qaService.updateQaSession(qaSession);
+        logger.debug("tool session has been marked COMPLETE: " + qaSession);
+	    
 	    String nextActivityUrl = qaService.leaveToolSession(toolSessionId, new Long(user.getUserID().longValue()));
 	    response.sendRedirect(nextActivityUrl);
 	}
Index: lams_tool_laqa/web/QaErrorBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/QaErrorBox.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/web/QaErrorBox.jsp	7 Apr 2006 00:44:22 -0000	1.5
+++ lams_tool_laqa/web/QaErrorBox.jsp	24 May 2006 15:43:24 -0000	1.6
@@ -25,10 +25,37 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-				
-		
-<div id="datatablecontainer">
-<table border="0" cellspacing="2" cellpadding="2" summary="This table is being used for layout purposes only">
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+
+<html:html locale="true">
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
+	<!-- depending on user / site preference this will get changed probably use passed in variable from flash to select which one to use-->
+
+ 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
+    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+    <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
+    <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+
+	<script language="JavaScript" type="text/JavaScript">
+    	var imgRoot="${lams}images/";
+	    var themeName="aqua";
+	</script>
+	
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/tabcontroller.js"></script>    
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
+</head>
+
+<body>	
+	
+	<table width="80%" cellspacing="8" align="CENTER" class="forms">
 		<c:if test="${userExceptionContentDefineLater == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
 						<font size=2> <bean:message key="error.defineLater"/> </font>
@@ -100,24 +127,24 @@
 						<font size=2> <bean:message key="error.defaultContent.notSetup"/> </font>
 			</td> </tr>
 		</c:if> 				    
-		
 </table>
+	
+</body>
+</html:html>
 
-<!--
-<logic:messagesPresent> 
-<table border="0" cellspacing="2" cellpadding="2" summary="This table is being used for layout purposes only">
-<tr>
-	<td width="10%"  align="right" >
-		<img src="images/error.jpg" alt="Error occured"/>
-	</td>
-	<td width="90%" valign="middle" class="body" colspan="2">
-		 <html:messages id="error" message="false"> 
-			<font size=2> <c:out value="${error}" escapeXml="false"/> </font> <br>
-		 </html:messages> 
-	</td>
-</tr>
 
-</logic:messagesPresent>
--->
-</div>
 
+
+
+
+
+
+
+
+				
+		
+
+
+
+
+
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/learning/AnswersContent.jsp	19 Apr 2006 02:26:45 -0000	1.4
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	24 May 2006 15:43:23 -0000	1.5
@@ -19,8 +19,6 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-
 <%@ taglib uri="tags-bean" prefix="bean"%> 
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-logic" prefix="logic" %>
@@ -29,11 +27,18 @@
 <%@ 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>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+
+<html:html locale="true">
 <head>
-	<title> </title>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<jsp:include page="/learning/learningHeader.jsp" />
+	
 	<script language="JavaScript" type="text/JavaScript">
-
 		function submitLearningMethod(actionMethod) 
 		{
 			document.QaLearningForm.method.value=actionMethod; 
@@ -44,63 +49,54 @@
 		{
 			submitLearningMethod(actionMethod);
 		}
-		
-		function MM_reloadPage(init) {  //reloads the window if Nav4 resized
-		  if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) {
-		    document.MM_pgW=innerWidth; document.MM_pgH=innerHeight; onresize=MM_reloadPage; }}
-		  else if (innerWidth!=document.MM_pgW || innerHeight!=document.MM_pgH) location.reload();
-		}
-		MM_reloadPage(true);
-		//-->
 	</script>	
-	<lams:css/>
 </head>
+<body>
 
 	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
   		<html:hidden property="method"/>	 
-		<br>
-		<table align=center bgcolor="#FFFFFF"> 
+			<table width="80%" cellspacing="8" align="CENTER" class="forms">
 		
 			<c:if test="${questionListingMode != 'questionListingModePreview'}"> 						
-				<tr><td NOWRAP class="input" valign=top>
-					<font size=2> <b> <c:out value="${sessionScope.activityTitle}" escapeXml="false"/> </b> </font>
+				<tr><td NOWRAP valign=top>
+					 <c:out value="${sessionScope.activityTitle}" escapeXml="false"/> 
 				</td></tr>
 			</c:if> 		
 			
 			<c:if test="${questionListingMode == 'questionListingModePreview'}"> 						
-				<tr><td NOWRAP class="input" valign=top>
+				<tr><th scope="col" NOWRAP valign=top>
 					<font size=2> <b> <bean:message key="label.preview"/> </b> </font>
-				</td></tr>
-				<tr><td NOWRAP class="input" valign=top>
+				</th></tr>
+				<tr><td NOWRAP valign=top>
 					&nbsp&nbsp&nbsp&nbsp&nbsp
 				</td></tr>
 			</c:if> 		
 			
 			<c:if test="${questionListingMode != 'questionListingModePreview'}"> 						
-				<tr> <td class="error">
+				<tr> <td>
 					<html:errors/>
 				</td></tr>
 
 				<c:if test="${sessionScope.isDefineLater == 'true'}"> 			
-					<tr> <td class="error">
+					<tr> <td>
 						<bean:message key="error.defineLater"/>
 					</td></tr>
 				</c:if> 		
 			</c:if>														  					 									  													  			
 			
 			<c:if test="${sessionScope.isDefineLater == 'false'}"> 			
 				<c:if test="${sessionScope.isToolActivityOffline == 'true'}"> 			
-					<tr> <td class="error">
+					<tr> <td>
 						<bean:message key="label.learning.forceOfflineMessage"/>
 					</td></tr>
 				</c:if> 		
 			
 				<c:if test="${sessionScope.isToolActivityOffline == 'false'}"> 			
-					<tr><td NOWRAP class="input" valign=top>
-						<font size=2> 	<c:out value="${sessionScope.activityInstructions}" escapeXml="false"/> </font>
+					<tr><td NOWRAP valign=top>
+						<c:out value="${sessionScope.activityInstructions}" escapeXml="false"/> 
 					</td></tr>
 		
-					<tr> <td class="error">
+					<tr> <td>
 						 <font size=2>	<c:out value="${sessionScope.userFeedback}" escapeXml="true"/> </font>
 					</td></tr>
 				
@@ -122,5 +118,8 @@
 	 	</table>
 	</html:form>
 	
+</body>
+</html:html>
+
 	
 	
\ 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.8 -r1.9
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	7 Apr 2006 00:44:23 -0000	1.8
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	24 May 2006 15:43:24 -0000	1.9
@@ -28,28 +28,30 @@
 <%@ 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>
+
 			<tr> <td>
-			<table>
+			<table width="80%" cellspacing="8" align="CENTER" class="forms">
 				<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 						  <tr>
-						  	<td colspan=2 NOWRAP class="input" valign=top> <font size=2> <b> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>: </b> 
+						  	<td colspan=2 NOWRAP valign=top> <font size=2> <b> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>:  </b>  </font> 
 						  		<c:out value="${questionEntry.value}" escapeXml="false"/> 
-						  	</font> </td>
+						  	 </td>
 						  </tr>
 						  <tr> 
-					 		<td NOWRAP class="input" valign=top > <font size=2> <b> <bean:message key="label.answer"/> </b> </font> </td>
-					 		<td  NOWRAP class="input" valign=top>
+					 		<td NOWRAP valign=top > <font size=2> <b> <bean:message key="label.answer"/> </b> </font> </td>
+					 		<td  NOWRAP valign=top>
 					 			<input type="text" name="answer<c:out value="${questionEntry.key}"  escapeXml="false"/>" size="60" maxlength="255" value=""/> 
 					 		</td>
 					  	  </tr>
 					  	  <tr><td> &nbsp </td> </tr>
 				</c:forEach>
 			</table>
 			
-			<hr>
-			<table>
+			<table width="80%" cellspacing="8" align="CENTER" class="forms">
 			<tr>
-				 <td> 
+				 <td align=right> 
 						<html:submit onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
 							<bean:message key="button.submitAllContent"/>
 						</html:submit>	 				 		  					
Index: lams_tool_laqa/web/learning/Preview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Attic/Preview.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/web/learning/Preview.jsp	7 Apr 2006 00:44:23 -0000	1.2
+++ lams_tool_laqa/web/learning/Preview.jsp	24 May 2006 15:43:24 -0000	1.3
@@ -28,17 +28,20 @@
 <%@ 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>
+
 			<tr> <td>
-			<table>
+			<table width="80%" cellspacing="8" align="CENTER" class="forms">
 				<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 						  <tr>
-						  	<td colspan=2 NOWRAP class="input" valign=top> <font size=2> <b> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>: </b> 
+						  	<td colspan=2 NOWRAP valign=top> <font size=2> <b> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>: </font> </b> 
 						  		<c:out value="${questionEntry.value}" escapeXml="false"/> 
-						  	</font> </td>
+						  	 </td>
 						  </tr>
 						  <tr> 
-					 		<td NOWRAP class="input" valign=top > <font size=2> <b> <bean:message key="label.answer"/> </b> </font> </td>
-					 		<td  NOWRAP class="input" valign=top>
+					 		<td NOWRAP valign=top > <font size=2> <b> <bean:message key="label.answer"/> </b> </font> </td>
+					 		<td  NOWRAP valign=top>
 					 			<input type="text" name="answer<c:out value="${questionEntry.key}"  escapeXml="false"/>" size="60" maxlength="255" value=""/> 
 					 		</td>
 					  	  </tr>
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/SequentialAnswersContent.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	7 Apr 2006 00:44:23 -0000	1.8
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	24 May 2006 15:43:24 -0000	1.9
@@ -19,7 +19,6 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-
 <%@ taglib uri="tags-bean" prefix="bean"%> 
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-logic" prefix="logic" %>
@@ -28,20 +27,25 @@
 <%@ 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>
+
+
 	<!--question content goes here-->
-			<tr> <td >
-			<table>
+			<tr> <td>
+			<table width="80%" cellspacing="8" align="CENTER" class="forms">
 				<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 			  		<c:if test="${questionEntry.key == sessionScope.currentQuestionIndex}"> 			
 					  <tr>
-					  	<td colspan=2 NOWRAP class="input" valign=top> <font size=2> 
+					  	<td colspan=2 NOWRAP valign=top> <font size=2> 
 					  		<b> <bean:message key="label.question"/> 
-						  	<c:out value="${questionEntry.key}" escapeXml="false"/>:</b> <c:out value="${questionEntry.value}" escapeXml="false"/>
-					  	</font>
+						  	<c:out value="${questionEntry.key}" escapeXml="false"/>: </font> </b> 
+						  	<c:out value="${questionEntry.value}" escapeXml="false"/>
 					  </tr>
+
 					  <tr> 
-				 		<td NOWRAP class="input" valign=top> <font size=2> <b> <bean:message key="label.answer"/> </b> </font> </td>
-				 		<td NOWRAP class="input" valign=top> 
+				 		<td NOWRAP valign=top> <font size=2> <b> <bean:message key="label.answer"/> </b> </font> </td>
+				 		<td NOWRAP valign=top> 
 				 			<html:text property="answer" size="60" maxlength="255" value="${sessionScope.currentAnswer}"/>
 				 			<html:hidden property="currentQuestionIndex" value="${questionEntry.key}"/>
 				 		</td>
@@ -52,13 +56,13 @@
 
 	<!--question content ends here-->
 
-			<hr>
-			<table>
+
+			<table width="80%" cellspacing="8" align="CENTER" class="forms">
 				<tr>
 				<c:choose>  
 				  <c:when test="${(sessionScope.currentQuestionIndex == sessionScope.totalQuestionCount) && 
 				  				  (sessionScope.totalQuestionCount !=1) }"> 
-					 <td NOWRAP class="input" valign=top> 
+					 <td NOWRAP valign=top align=right> 
 						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<bean:message key="button.getPreviousQuestion"/>
 						</html:submit>	 				 		  					
@@ -71,7 +75,7 @@
 
   				  <c:when test="${(sessionScope.currentQuestionIndex == sessionScope.totalQuestionCount) && 
 				  				  (sessionScope.totalQuestionCount == 1) }"> 
-					 <td NOWRAP class="input" valign=top> 
+					 <td NOWRAP valign=top align=right> 
 						<html:submit onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
 									<bean:message key="button.done"/>
 						</html:submit>	 				 		  					
@@ -80,7 +84,7 @@
 				  
 				  
  				  <c:when test="${sessionScope.currentQuestionIndex != sessionScope.totalQuestionCount && sessionScope.currentQuestionIndex > 1}"> 
-					 <td NOWRAP class="input" valign=top> 
+					 <td NOWRAP valign=top align=right> 
 						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<bean:message key="button.getPreviousQuestion"/>
 						</html:submit>	 				 		  					
@@ -92,7 +96,7 @@
   				  </c:when> 
   				  
 				  <c:otherwise>
-					 <td NOWRAP class="input" valign=top> 
+					 <td NOWRAP valign=top align=right> 
 						<html:submit onclick="javascript:submitMethod('getNextQuestion');" styleClass="button">
 									<bean:message key="button.getNextQuestion"/>
 						</html:submit>	 				 		  					
Index: lams_tool_laqa/web/learning/learningHeader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Attic/learningHeader.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/learning/learningHeader.jsp	24 May 2006 15:43:23 -0000	1.1
@@ -0,0 +1,49 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ 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>
+
+	<title> <bean:message key="label.learning.qa"/> </title>
+	 <lams:css/>
+	<!-- depending on user / site preference this will get changed probably use passed in variable from flash to select which one to use-->
+
+ 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
+    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+    <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
+    <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+
+	<script language="JavaScript" type="text/JavaScript">
+    	var imgRoot="${lams}images/";
+	    var themeName="aqua";
+	</script>
+	
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/tabcontroller.js"></script>    
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
+	
Index: lams_tool_laqa/web/monitoring/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/LearnerRep.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/web/monitoring/LearnerRep.jsp	19 Apr 2006 02:26:45 -0000	1.7
+++ lams_tool_laqa/web/monitoring/LearnerRep.jsp	24 May 2006 15:43:24 -0000	1.8
@@ -18,7 +18,6 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 
 <%@ taglib uri="tags-bean" prefix="bean"%> 
 <%@ taglib uri="tags-html" prefix="html"%>
@@ -31,10 +30,12 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD hTML 4.01 Transitional//EN">
-<html:html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+
+<html:html locale="true">
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<title> <bean:message key="activity.title"/> </title>
 	<script lang="javascript">
 		var imgRoot="<c:out value="${lams}"/>images/";
@@ -75,10 +76,21 @@
 
 <c:if test="${ requestLearningReportProgress != 'true'}"> 			
 	<c:if test="${ requestLearningReportViewOnly != 'true'}"> 			
-		<b> <font size=2> <c:out value="${sessionScope.reportTitleLearner}" escapeXml="false"/> </font></b>
+		<table width="80%" cellspacing="8" align="CENTER">
+			<tr> <th scope="col">
+				 <c:out value="${sessionScope.reportTitleLearner}" escapeXml="false"/> 
+			 </th>
+			</tr>
+		</table>		
 	</c:if> 				    
+
 	<c:if test="${ requestLearningReportViewOnly == 'true'}"> 			
-		<b> <font size=2> <bean:message key="label.learning.viewOnly"/> </font></b>
+		<table width="80%" cellspacing="8" align="CENTER">
+			<tr> <th scope="col">
+				<bean:message key="label.learning.viewOnly"/>
+			 </th>
+			</tr>
+		</table>				
 	</c:if> 				    
 
 		<c:set var="monitoringURL">
@@ -88,9 +100,7 @@
 	  <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
 		<html:hidden property="method"/>	 
 
-			<div class="tabbody content_b" >
-				<jsp:include page="/monitoring/SummaryContent.jsp" />
-			</div>		         
+			<jsp:include page="/monitoring/SummaryContent.jsp" />
 
 			<c:if test="${ requestLearningReportViewOnly != 'true'}"> 			
 				<table align=right> 	  
@@ -111,7 +121,12 @@
 </c:if> 				    
 
 <c:if test="${ requestLearningReportProgress == 'true'}"> 			
-		 <font size=2> <b> <bean:message key="label.learner.progress"/> </b> </font>
+		<table width="80%" cellspacing="8" align="CENTER">
+			<tr> <th scope="col">
+				<bean:message key="label.learner.progress"/>
+			 </th>
+			</tr>
+		</table>						 
 
 		<c:set var="monitoringURL">
 			<html:rewrite page="/monitoring.do" />
@@ -120,9 +135,8 @@
 	  <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
 		<html:hidden property="method"/>	 
 
-			<div class="tabbody content_b" >
 				<jsp:include page="/monitoring/SummaryContent.jsp" />
-			</div>		         
+
 	</html:form>
 </c:if> 				    
 
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	7 Apr 2006 00:44:22 -0000	1.12
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	24 May 2006 15:43:24 -0000	1.13
@@ -47,7 +47,7 @@
 		<c:if test="${(userExceptionNoToolSessions != 'true') }"> 	
 			<html:hidden property="selectedToolSessionId"/>							
 			<input type="hidden" name="isToolSessionChanged"/>
-				<table class="forms">
+				<table width="80%" cellspacing="8" align="CENTER" class="forms">
 
 				<c:if test="${(requestLearningReport != 'true')}"> 	
 						<tr> 
@@ -90,9 +90,9 @@
 			  	 			<td> &nbsp&nbsp&nbsp</td>
 			  	 		</tr>
 						<tr>			
-							<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.question"/> </b>
+							<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.question"/> : </b> </font>
 								<c:out value="${currentDto.question}" escapeXml="false"/>
-							</font> </td>
+							 </td>
 						</tr>	
 						
 						<tr>