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.56 -r1.57
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	2 Jul 2006 13:31:20 -0000	1.56
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	2 Jul 2006 18:59:10 -0000	1.57
@@ -203,6 +203,7 @@
     public static final String FROM_TOOL_CONTENT_ID						="fromToolContentId";
     public static final String TO_TOOL_CONTENT_ID						="toToolContentId";
     public static final String LEARNER_REPORT							="learnerRep";
+    public static final String INDIVIDUAL_LEARNER_REPORT				="individualLearnerRep";
     public static final String REQUEST_LEARNING_REPORT					="requestLearningReport";
     public static final String REQUEST_LEARNING_REPORT_PROGRESS			="requestLearningReportProgress";
     public static final String REQUEST_PREVIEW							="requestPreview";
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.10 -r1.11
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	27 Jun 2006 13:34:47 -0000	1.10
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	2 Jul 2006 18:59:10 -0000	1.11
@@ -263,8 +263,8 @@
 
 		request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString());
 		request.getSession().setAttribute(REQUEST_LEARNING_REPORT_PROGRESS, new Boolean(false).toString());
-		logger.debug("fwd'ing to: " + LEARNER_REPORT);
-		return (mapping.findForward(LEARNER_REPORT));
+		logger.debug("fwd'ing to: " + INDIVIDUAL_LEARNER_REPORT);
+		return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));
 	}
 
     
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.36 -r1.37
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	25 Jun 2006 23:23:36 -0000	1.36
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	2 Jul 2006 18:59:10 -0000	1.37
@@ -379,8 +379,8 @@
 	    	
     		request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString());
     		request.getSession().setAttribute(REQUEST_LEARNING_REPORT_PROGRESS, new Boolean(true).toString());
-    		logger.debug("fwd'ing to for learner progress" + LEARNER_REPORT);
-    		return (mapping.findForward(LEARNER_REPORT));		}
+    		logger.debug("fwd'ing to for learner progress" + INDIVIDUAL_LEARNER_REPORT);
+    		return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));		}
     	
 		/* by now, we know that the mode is learner*/
 	    /* find out if the content is set to run offline or online. If it is set to run offline , the learners are informed about that. */
@@ -439,8 +439,8 @@
 		    		    	qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, currentToolSessionId.toString(), null);
 		    		    	
 		    	    		request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString());
-		    	    		logger.debug("fwd'ing to." + LEARNER_REPORT);
-		    	    		return (mapping.findForward(LEARNER_REPORT));
+		    	    		logger.debug("fwd'ing to." + INDIVIDUAL_LEARNER_REPORT);
+		    	    		return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));
 		    			}
 		    		}
 		    }
Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v
diff -u -r1.29 -r1.30
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	25 Jun 2006 17:21:43 -0000	1.29
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	2 Jul 2006 18:59:11 -0000	1.30
@@ -199,6 +199,11 @@
 		    redirect="false"
 	      />
 
+	      <forward
+	        name="individualLearnerRep"
+	        path="/learning/LearnerRep.jsp"
+		    redirect="false"
+	      />
 
 	  	<forward
 			name="loadMonitoring"
@@ -275,6 +280,13 @@
 		    redirect="false"
 	      />
       
+	      <forward
+	        name="individualLearnerRep"
+	        path="/learning/LearnerRep.jsp"
+		    redirect="false"
+	      />
+
+      
 	     <forward
 	        name="learnerRep"
 	        path="/monitoring/LearnerRep.jsp"
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/web/learning/AnswersContent.jsp	29 Jun 2006 21:43:53 -0000	1.9
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	2 Jul 2006 18:59:10 -0000	1.10
@@ -19,16 +19,24 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<html:html locale="true">
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<html:html>
 <head>
-	<title> <bean:message key="label.learning.qa"/> </title>
-	<%@ include file="/common/header.jsp"%>
-	<%@ include file="/common/fckeditorheader.jsp"%>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
 
 	<script language="JavaScript" type="text/JavaScript">
 		function submitLearningMethod(actionMethod) 
@@ -42,20 +50,22 @@
 			submitLearningMethod(actionMethod);
 		}
 	</script>	
-
-
 </head>
+
 <body>
+	<div id="page-learner">
 
+<h1 class="no-tabs-below">
+	<c:out value="${sessionScope.activityTitle}" escapeXml="false" />
+</h1>
+
+<div id="header-no-tabs-learner"></div>
+
+<div id="content-learner">
 	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
   		<html:hidden property="method"/>	 
 			<table class="forms">
 
-			<tr><td NOWRAP>
-				 <c:out value="${sessionScope.activityTitle}" escapeXml="false"/> 
-			</td></tr>
-
-
 			<tr> <td>
 				<html:errors/>
 			</td></tr>
@@ -96,9 +106,21 @@
 		  	</c:if> 		
 	 	</table>
 	</html:form>
-	
+</div>
+
+<div id="footer-learner"></div>
+
+</div>
 </body>
 </html:html>
 
+
+
+
+
+
+
+
+
 	
 	
\ No newline at end of file
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	29 Jun 2006 17:46:45 -0000	1.3
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	2 Jul 2006 18:59:10 -0000	1.4
@@ -18,18 +18,26 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
+
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
         "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
-<html:html locale="true">
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<html:html>
 <head>
-	<title> <bean:message key="label.learning.qa"/> </title>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
 
-	<%@ include file="/common/header.jsp"%>
-	<%@ include file="/common/fckeditorheader.jsp"%>
-	
 	<script language="JavaScript" type="text/JavaScript">
 		function submitLearningMethod(actionMethod) 
 		{
@@ -43,7 +51,17 @@
 		}
 	</script>	
 </head>
+
 <body>
+	<div id="page-learner">
+
+<h1 class="no-tabs-below">
+	<c:out value="${sessionScope.activityTitle}" escapeXml="false" />
+</h1>
+
+<div id="header-no-tabs-learner"></div>
+
+<div id="content-learner">
 	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
   		<html:hidden property="method"/>	 
 
@@ -53,12 +71,6 @@
 		    	  	</th>
 				  </tr>
 
-					<tr>
-						<td NOWRAP colspan=2>
-							<hr>
-						</td> 
-					</tr>
-
 			
 					<tr> <td align=left>		
 						<table align="left">
@@ -90,27 +102,38 @@
 						</table>
 					</td></tr>
 					
-			  	   	<tr> 
-						<td colspan=2 NOWRAP>
-				 		&nbsp
-				 		</td>
-			  	   </tr>
-
 	  	   		  <tr>
-						<td colspan=2 NOWRAP >
+						<td colspan=2 NOWRAP>
 			                                <html:submit property="viewAllResults" 
-                                             styleClass="linkbutton" 
+                                             styleClass="button" 
                                              onclick="submitMethod('viewAllResults');">
                                     <bean:message key="label.allResponses"/>
                                 </html:submit>
 					  	 </td>
 				  </tr>
-				
+				  
 				</table>
 	</html:form>
-	
+</div>
+
+<div id="footer-learner"></div>	
+
+	</div>
 </body>
 </html:html>
 
-	
-					
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	
\ 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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	2 Jul 2006 18:59:10 -0000	1.1
@@ -0,0 +1,163 @@
+<%-- 
+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
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<html:html>
+<head>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
+
+	<script language="JavaScript" type="text/JavaScript">
+
+		function submitMonitoringMethod(actionMethod) 
+		{
+			document.QaMonitoringForm.method.value=actionMethod; 
+			document.QaMonitoringForm.submit();
+		}
+		
+		function submitMethod(actionMethod) 
+		{
+			submitMonitoringMethod(actionMethod);
+		}
+	</script>		
+</head>
+
+<body>
+	<div id="page-learner">
+	
+	<h1 class="no-tabs-below">
+		<c:out value="${sessionScope.activityTitle}" escapeXml="false" />
+	</h1>
+
+	<div id="header-no-tabs-learner"></div>
+	
+
+	<div id="content-learner">
+		<c:if test="${ requestLearningReportProgress != 'true'}"> 			
+			<c:if test="${ requestLearningReportViewOnly != 'true'}"> 			
+		     	<table class="forms"> 	  
+					<tr> <th scope="col">
+						 <c:out value="${sessionScope.reportTitleLearner}" escapeXml="false"/> 
+					 </th>
+					</tr>
+				</table>		
+			</c:if> 				    
+		
+			<c:if test="${ requestLearningReportViewOnly == 'true'}"> 			
+		       	<table class="forms"> 	  
+					<tr> <th scope="col">
+						<bean:message key="label.learning.viewOnly"/>
+					 </th>
+					</tr>
+				</table>				
+			</c:if> 				    
+		
+				<c:set var="monitoringURL">
+					<html:rewrite page="/monitoring.do" />
+				</c:set>
+		
+			  <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
+				<html:hidden property="method"/>	 
+		
+					<jsp:include page="/monitoring/SummaryContent.jsp" />
+		
+						<c:if test="${ requestLearningReportViewOnly == 'true'}"> 			
+					       	<table> 	  
+									<tr> <td  valign=top>
+										<div class="right-buttons">
+											 <bean:message key="label.learning.forceFinish"/> &nbsp
+			
+											<html:submit onclick="javascript:submitMethod('endLearning');" styleClass="button">
+												<bean:message key="button.endLearning"/>
+											</html:submit>	 				
+										</div> 		  															 		  					
+										</td> 
+									</tr>
+							</table>
+						</c:if> 			
+		
+						<c:if test="${ requestLearningReportViewOnly != 'true'}"> 			
+					       	<table> 	  
+									<tr> <td  valign=top>
+										<div class="right-buttons">
+											<html:submit onclick="javascript:submitMethod('endLearning');" styleClass="button">
+												<bean:message key="button.endLearning"/>
+											</html:submit>	 				
+										</div> 		  					
+										</td> 
+									</tr>
+							</table>
+						</c:if> 			
+		
+			</html:form>
+		</c:if> 				    
+		
+		<c:if test="${ requestLearningReportProgress == 'true'}"> 			
+		       	<table class="forms"> 	  
+					<tr> <th scope="col">
+						<bean:message key="label.learner.progress"/>
+					 </th>
+					</tr>
+				</table>						 
+		
+				<c:set var="monitoringURL">
+					<html:rewrite page="/monitoring.do" />
+				</c:set>
+		
+			  <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
+				<html:hidden property="method"/>	 
+		
+						<jsp:include page="/monitoring/SummaryContent.jsp" />
+		
+			</html:form>
+		</c:if> 				    
+
+	</div>
+	
+
+<div id="footer-learner"></div>	
+
+</div>
+</body>
+</html:html>
+
+
+
+
+
+
+
+
+
+	
+	
\ No newline at end of file
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/SequentialAnswersContent.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	29 Jun 2006 17:46:45 -0000	1.10
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	2 Jul 2006 18:59:10 -0000	1.11
@@ -65,7 +65,6 @@
 						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<bean:message key="button.getPreviousQuestion"/>
 						</html:submit>	 				 		  					
-					 		&nbsp&nbsp
 						<html:submit onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
 									<bean:message key="button.done"/>
 						</html:submit>	 				 		  					
@@ -74,7 +73,7 @@
 
   				  <c:when test="${(sessionScope.currentQuestionIndex == sessionScope.totalQuestionCount) && 
 				  				  (sessionScope.totalQuestionCount == 1) }"> 
-					 <td NOWRAP valign=top align=right> 
+					 <td NOWRAP valign=top> 
 						<html:submit onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
 									<bean:message key="button.done"/>
 						</html:submit>	 				 		  					
@@ -83,19 +82,18 @@
 				  
 				  
  				  <c:when test="${sessionScope.currentQuestionIndex != sessionScope.totalQuestionCount && sessionScope.currentQuestionIndex > 1}"> 
-					 <td NOWRAP valign=top align=right> 
+					 <td NOWRAP valign=top> 
 						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<bean:message key="button.getPreviousQuestion"/>
 						</html:submit>	 				 		  					
-						&nbsp&nbsp
 						<html:submit onclick="javascript:submitMethod('getNextQuestion');" styleClass="button">
 									<bean:message key="button.getNextQuestion"/>
 						</html:submit>	 				 		  					
 					</td> 
   				  </c:when> 
   				  
 				  <c:otherwise>
-					 <td NOWRAP valign=top align=right> 
+					 <td NOWRAP valign=top> 
 						<html:submit onclick="javascript:submitMethod('getNextQuestion');" styleClass="button">
 									<bean:message key="button.getNextQuestion"/>
 						</html:submit>