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.26 -r1.27
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	10 Oct 2006 16:16:51 -0000	1.26
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	19 Oct 2006 23:38:54 -0000	1.27
@@ -268,6 +268,7 @@
 		
     	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
     	
+    	qaLearningForm.resetAll();
 		logger.debug("fwd'ing to." + INDIVIDUAL_LEARNER_RESULTS);
 		return (mapping.findForward(INDIVIDUAL_LEARNER_RESULTS));
 	}
@@ -416,6 +417,8 @@
     	
 	    request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 		logger.debug("GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(GENERAL_LEARNER_FLOW_DTO));
+		
+		qaLearningForm.resetAll();
         logger.debug("forwarding to: " + LOAD_LEARNER);
 		return (mapping.findForward(LOAD_LEARNER));	
 	}
@@ -512,6 +515,7 @@
 		logger.debug("final generalLearnerFlowDTO: " + generalLearnerFlowDTO);
 		logger.debug("fwd'ing to: " + INDIVIDUAL_LEARNER_REPORT);
 		
+		qaLearningForm.resetAll();
 		logger.debug("remove map holding MAP_ALL_RESULTS_KEY, httpSessionID: " + httpSessionID);
 		return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));
 	}
@@ -562,6 +566,7 @@
     	
     	populateAnswersMap(qaLearningForm, request, generalLearnerFlowDTO, true, false);
     	
+    	qaLearningForm.resetAll();
         return (mapping.findForward(LOAD_LEARNER));
     }
     
@@ -708,7 +713,8 @@
 	    logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO);
     	
     	populateAnswersMap(qaLearningForm, request, generalLearnerFlowDTO, false, false);
-    	
+    
+    	qaLearningForm.resetAll();
         return (mapping.findForward(LOAD_LEARNER));
     }
     
@@ -815,6 +821,8 @@
 	    logger.debug("removing map with httpSessionID: " + httpSessionID);
 	    request.getSession().removeAttribute(httpSessionID);
 
+	    qaLearningForm.resetAll();
+	    
 	    String nextActivityUrl = qaService.leaveToolSession(new Long(toolSessionID), new Long(user.getUserID().longValue()));
 	    response.sendRedirect(nextActivityUrl);
 	    
@@ -925,6 +933,7 @@
 		logger.debug("final generalLearnerFlowDTO: " + generalLearnerFlowDTO);
 		qaLearningForm.resetUserActions(); /*resets all except submitAnswersContent */
         
+		qaLearningForm.resetAll();
 		logger.debug("fwd'ing to: " + NOTEBOOK);
         return (mapping.findForward(NOTEBOOK));
 	}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaLearningForm.java,v
diff -u -r1.20 -r1.21
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java	20 Sep 2006 15:15:43 -0000	1.20
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java	19 Oct 2006 23:38:54 -0000	1.21
@@ -53,14 +53,68 @@
 	protected String userID;
 	protected String entryText;
 	protected String viewAllResults;
+	protected String viewAll;
 	protected String redoQuestions;
 	protected String responseId;
 	
+	protected String btnCombined;
+	protected String btnGetPrevious;
+	protected String btnDone;
+	protected String btnGetNext;
+	
 	protected String requestLearningReport;
 	protected String requestLearningReportProgress;
 	protected String requestLearningReportViewOnly;
 	
 	
+    /**
+     * @return Returns the btnCombined.
+     */
+    public String getBtnCombined() {
+        return btnCombined;
+    }
+    /**
+     * @param btnCombined The btnCombined to set.
+     */
+    public void setBtnCombined(String btnCombined) {
+        this.btnCombined = btnCombined;
+    }
+    /**
+     * @return Returns the btnDone.
+     */
+    public String getBtnDone() {
+        return btnDone;
+    }
+    /**
+     * @param btnDone The btnDone to set.
+     */
+    public void setBtnDone(String btnDone) {
+        this.btnDone = btnDone;
+    }
+    /**
+     * @return Returns the btnGetNext.
+     */
+    public String getBtnGetNext() {
+        return btnGetNext;
+    }
+    /**
+     * @param btnGetNext The btnGetNext to set.
+     */
+    public void setBtnGetNext(String btnGetNext) {
+        this.btnGetNext = btnGetNext;
+    }
+    /**
+     * @return Returns the btnGetPrevious.
+     */
+    public String getBtnGetPrevious() {
+        return btnGetPrevious;
+    }
+    /**
+     * @param btnGetPrevious The btnGetPrevious to set.
+     */
+    public void setBtnGetPrevious(String btnGetPrevious) {
+        this.btnGetPrevious = btnGetPrevious;
+    }
 	/**
      * reset user actions in learning mode
      * @param qaAuthoringForm
@@ -76,8 +130,32 @@
     	this.forwardtoReflection=null;
     }
     
+    protected void resetAll()
+    {
+    	this.submitAnswersContent=null;
+    	this.getNextQuestion =null;
+    	this.getPreviousQuestion =null;
+    	this.endLearning =null;
+    	this.refreshAnswers =null;
+    	this.submitReflection =null;
+    	this.forwardtoReflection =null;
+
+    	this.viewAllResults =null;
+    	this.viewAll =null;
+    	this.redoQuestions =null;
+
+    	this.btnCombined=null;
+    	this.btnGetPrevious=null;
+    	this.btnDone=null;
+    	this.btnGetNext=null;
+    	
+    	this.requestLearningReport =null;
+    	this.requestLearningReportProgress =null;
+    	this.requestLearningReportViewOnly =null;
+    }
+    
+    
 	
-	
 	/**
 	 * @return Returns the currentQuestionIndex.
 	 */
@@ -364,4 +442,16 @@
     public void setSubmitReflection(String submitReflection) {
         this.submitReflection = submitReflection;
     }
+    /**
+     * @return Returns the viewAll.
+     */
+    public String getViewAll() {
+        return viewAll;
+    }
+    /**
+     * @param viewAll The viewAll to set.
+     */
+    public void setViewAll(String viewAll) {
+        this.viewAll = viewAll;
+    }
 }
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	17 Oct 2006 20:32:56 -0000	1.20
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	19 Oct 2006 23:38:53 -0000	1.21
@@ -45,8 +45,8 @@
 			</c:forEach>
 			<tr>
 				 <td> 
-						<html:submit onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
+						<html:button property="btnCombined" onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
 							<fmt:message key="button.submitAllContent"/>
-						</html:submit>	 				 		  					
+						</html:button>	 				 		  					
 				</td> 
 			</tr>
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.18 -r1.19
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	17 Oct 2006 20:32:56 -0000	1.18
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	19 Oct 2006 23:38:53 -0000	1.19
@@ -138,19 +138,17 @@
 
 	  	   		  <tr>
 	  	   		  		<td>
-                               <html:submit property="redoQuestions" 
+                               <html:button property="redoQuestions" 
                                              styleClass="button" 
                                              onclick="submitMethod('redoQuestions');">
                                     <fmt:message key="label.redo"/>
-                                </html:submit>
+                                </html:button>
 					  	 </td>
 	  	   		  
 						<td>
-                              <html:submit property="viewAllResults" 
-                                         styleClass="button" 
-                                         onclick="submitMethod('viewAllResults');">
-                                <fmt:message key="label.allResponses"/>
-                            </html:submit>
+							<html:button property="viewAllResults" onclick="submitMethod('viewAllResults');" styleClass="button">
+					                             <fmt:message key="label.allResponses"/>
+							</html:button>					  	 
 					  	 </td>
 				  </tr>
 
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_laqa/web/learning/LearnerRep.jsp	17 Oct 2006 20:32:56 -0000	1.20
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	19 Oct 2006 23:38:53 -0000	1.21
@@ -146,25 +146,25 @@
 				       	<table> 	  
 								<tr> 
 		  	   		  		<td>
-	                               <html:submit property="refreshAnswers" 
+	                               <html:button property="refreshAnswers" 
 	                                             styleClass="button" 
 	                                             onclick="submitMethod('viewAllResults');">
 	                                    <fmt:message key="label.refresh"/>
-	                                </html:submit>
+	                                </html:button>
 						  	 </td>
 	
 								<td  valign=top>
 									<div class="right-buttons">							
 										<c:if test="${generalLearnerFlowDTO.reflection != 'true'}"> 						  			  		
-											<html:submit property="endLearning"  onclick="javascript:submitMethod('endLearning');" styleClass="button">
+											<html:button property="endLearning"  onclick="javascript:submitMethod('endLearning');" styleClass="button">
 												<fmt:message key="button.endLearning"/>
-											</html:submit>	 				
+											</html:button>	 				
 									  	</c:if> 				    					
 						
 										<c:if test="${generalLearnerFlowDTO.reflection == 'true'}"> 						  			  		
-											<html:submit property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');" styleClass="button">
+											<html:button property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');" styleClass="button">
 												<fmt:message key="label.continue"/>
-											</html:submit>	 				
+											</html:button>	 				
 									  	</c:if> 				    					
 									</div> 		  															 		  												  	
 								</td> 
@@ -258,25 +258,25 @@
 				       	<table> 	  
 							<tr> 
 		  	   		  		<td>
-	                               <html:submit property="refreshAnswers" 
+	                               <html:button property="refreshAnswers" 
 	                                             styleClass="button" 
 	                                             onclick="submitMethod('viewAllResults');">
 	                                    <fmt:message key="label.refresh"/>
-	                                </html:submit>
+	                                </html:button>
 						  	 </td>
 							
 								<td>
 									<div class="right-buttons">
 										<c:if test="${generalLearnerFlowDTO.reflection != 'true'}"> 						  			  		
-											<html:submit property="endLearning"  onclick="javascript:submitMethod('endLearning');" styleClass="button">
+											<html:button property="endLearning"  onclick="javascript:submitMethod('endLearning');" styleClass="button">
 												<fmt:message key="button.endLearning"/>
-											</html:submit>	 				
+											</html:button>	 				
 									  	</c:if> 				    					
 						
 										<c:if test="${generalLearnerFlowDTO.reflection == 'true'}"> 						  			  		
-											<html:submit property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');" styleClass="button">
+											<html:button property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');" styleClass="button">
 												<fmt:message key="label.continue"/>
-											</html:submit>	 				
+											</html:button>	 				
 									  	</c:if> 				    					
 									</div> 		  															 		  					
 									</td> 
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Notebook.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/web/learning/Notebook.jsp	17 Oct 2006 20:32:56 -0000	1.5
+++ lams_tool_laqa/web/learning/Notebook.jsp	19 Oct 2006 23:38:53 -0000	1.6
@@ -87,9 +87,9 @@
 
 			<tr>
 				<td class="right-buttons">
-					<html:submit property="submitReflection" onclick="javascript:submitMethod('submitReflection');" styleClass="button">					
+					<html:button property="submitReflection" onclick="javascript:submitMethod('submitReflection');" styleClass="button">					
 						<fmt:message key="button.endLearning"/>
-					</html:submit>
+					</html:button>
 				</td>
 			</tr>
 		</table>
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.9 -r1.10
--- lams_tool_laqa/web/learning/RunOffline.jsp	17 Oct 2006 20:32:56 -0000	1.9
+++ lams_tool_laqa/web/learning/RunOffline.jsp	19 Oct 2006 23:38:53 -0000	1.10
@@ -70,15 +70,15 @@
 				<div class="right-buttons">
 
 					<c:if test="${generalLearnerFlowDTO.reflection != 'true'}"> 						  			  		
-						<html:submit property="endLearning" onclick="javascript:submitMethod('endLearning');" styleClass="button">
+						<html:button property="endLearning" onclick="javascript:submitMethod('endLearning');" styleClass="button">
 							<fmt:message key="button.endLearning"/>
-						</html:submit>	 				
+						</html:button>	 				
 				  	</c:if> 				    					
 	
 					<c:if test="${generalLearnerFlowDTO.reflection == 'true'}"> 						  			  		
-						<html:submit property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"  styleClass="button">
+						<html:button property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"  styleClass="button">
 							<fmt:message key="label.continue"/>
-						</html:submit>	 				
+						</html:button>	 				
 				  	</c:if> 				    					
 			  	
 				</div> 		  															 		  					
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/SequentialAnswersContent.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	17 Oct 2006 20:32:56 -0000	1.19
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	19 Oct 2006 23:38:53 -0000	1.20
@@ -59,42 +59,42 @@
 				  <c:when test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
 				  				  (generalLearnerFlowDTO.totalQuestionCount != 1) }"> 
 					<td NOWRAP>
-						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
+						<html:button property="btnGetPrevious" onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<fmt:message key="button.getPreviousQuestion"/>
-						</html:submit>	 				 		  					
-						<html:submit onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
+						</html:button>	 				 		  					
+						<html:button property="btnDone" onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
 									<fmt:message key="button.done"/>
-						</html:submit>	 				 		  					
+						</html:button>	 				 		  					
 					</td> 
 				  </c:when> 
 
   				  <c:when test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
 				  				  (generalLearnerFlowDTO.totalQuestionCount == 1) }"> 
 					 <td NOWRAP valign=top> 
-						<html:submit onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
+						<html:button property="btnDone" onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
 									<fmt:message key="button.done"/>
-						</html:submit>	 				 		  					
+						</html:button>	 				 		  					
 					</td> 
 				  </c:when> 
 				  
 				  
  				  <c:when test="${generalLearnerFlowDTO.currentQuestionIndex != generalLearnerFlowDTO.totalQuestionCount && 
 				 				  generalLearnerFlowDTO.currentQuestionIndex > 1}"> 
 					 <td NOWRAP valign=top> 
-						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
+						<html:button property="btnGetPrevious" onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<fmt:message key="button.getPreviousQuestion"/>
-						</html:submit>	 				 		  					
-						<html:submit onclick="javascript:submitMethod('getNextQuestion');" styleClass="button">
+						</html:button>	 				 		  					
+						<html:button property="btnGetNext" onclick="javascript:submitMethod('getNextQuestion');" styleClass="button">
 									<fmt:message key="button.getNextQuestion"/>
-						</html:submit>	 				 		  					
+						</html:button>	 				 		  					
 					</td> 
   				  </c:when> 
   				  
 				  <c:otherwise>
 					 <td NOWRAP valign=top> 
-						<html:submit onclick="javascript:submitMethod('getNextQuestion');" styleClass="button">
+						<html:button property="btnGetNext" onclick="javascript:submitMethod('getNextQuestion');" styleClass="button">
 									<fmt:message key="button.getNextQuestion"/>
-						</html:submit>	 				 		  					
+						</html:button>	 				 		  					
 					</td> 
 				  </c:otherwise>
 				</c:choose>