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.97 -r1.98
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	21 May 2015 23:43:12 -0000	1.97
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	24 Jun 2015 20:08:44 -0000	1.98
@@ -193,7 +193,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 LEARNER_REP = "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.65 -r1.66
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	24 Jun 2015 10:19:51 -0000	1.65
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	24 Jun 2015 20:08:44 -0000	1.66
@@ -49,6 +49,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.ActionRedirect;
 import org.apache.tomcat.util.json.JSONArray;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
@@ -116,6 +117,15 @@
 
 	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 	QaContent qaContent = qaSession.getQaContent();
+	
+	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
+	//prohibit users from submitting answers after response is finalized but Resubmit button is not pressed (e.g. using 2 browsers)
+	if (qaQueUsr.isResponseFinalized()) {
+	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("learningStarter"));
+	    redirect.addParameter(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID);
+	    redirect.addParameter(MODE, "learner");
+	    return redirect;
+	}
 
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 
@@ -179,7 +189,6 @@
 	
 	//in case noReeditAllowed finalize response so user can't refresh the page and post answers again
 	if (errors.isEmpty() && qaContent.isNoReeditAllowed()) {
-	    QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
 	    qaQueUsr.setResponseFinalized(true);
 	    QaLearningAction.qaService.updateUser(qaQueUsr);
 	}
@@ -245,9 +254,15 @@
 	    HttpServletResponse response) throws IOException, ServletException {
 	initializeQAService();
 	QaLearningForm qaLearningForm = (QaLearningForm) form;
+	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
+	 
+	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
+	//prohibit users from autosaving answers after response is finalized but Resubmit button is not pressed (e.g. using 2 browsers)
+	if (qaQueUsr.isResponseFinalized()) {
+	    return null;
+	}
 
 	LearningUtil.saveFormRequestData(request, qaLearningForm);
-	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 	QaContent qaContent = qaSession.getQaContent();
 	int intTotalQuestionCount = qaContent.getQaQueContents().size();
@@ -320,6 +335,10 @@
 	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
 	LearningUtil.populateAnswers(sessionMap, qaContent, qaQueUsr, mapQuestions, generalLearnerFlowDTO,
 		QaLearningAction.qaService);
+	
+	//in order to track whether redo button is pressed store this info
+	qaQueUsr.setResponseFinalized(false);
+	QaLearningAction.qaService.updateUser(qaQueUsr);
 
 	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 	qaLearningForm.resetAll();
@@ -409,7 +428,7 @@
 	    }
 
 	    request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
-	    return (mapping.findForward(QaAppConstants.INDIVIDUAL_LEARNER_REPORT));
+	    return (mapping.findForward(QaAppConstants.LEARNER_REP));
 
 	} else if (qaContent.isReflect()) {
 	    return forwardtoReflection(mapping, request, qaContent, toolSessionID, userID, qaLearningForm);
@@ -496,7 +515,7 @@
 
 	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 
-	return (mapping.findForward(QaAppConstants.INDIVIDUAL_LEARNER_REPORT));
+	return (mapping.findForward(QaAppConstants.LEARNER_REP));
     }
 
     /**
@@ -525,6 +544,15 @@
 
 	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 	QaContent qaContent = qaSession.getQaContent();
+	
+	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
+	//prohibit users from submitting answers after response is finalized but Resubmit button is not pressed (e.g. using 2 browsers)
+	if (qaQueUsr.isResponseFinalized()) {
+	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("learningStarter"));
+	    redirect.addParameter(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID);
+	    redirect.addParameter(MODE, "learner");
+	    return redirect;
+	}
 
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 
@@ -663,6 +691,15 @@
 	qaLearningForm.setToolSessionID(toolSessionID);
 	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
 	QaContent qaContent = qaSession.getQaContent();
+	
+	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
+	//prohibit users from submitting answers after response is finalized but Resubmit button is not pressed (e.g. using 2 browsers)
+	if (qaQueUsr.isResponseFinalized()) {
+	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("learningStarter"));
+	    redirect.addParameter(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID);
+	    redirect.addParameter(MODE, "learner");
+	    return redirect;
+	}
 
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 
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.92 -r1.93
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	20 Jun 2015 20:48:46 -0000	1.92
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	24 Jun 2015 20:08:44 -0000	1.93
@@ -286,7 +286,7 @@
 		    generalLearnerFlowDTO);
 	    request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 
-	    return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));
+	    return (mapping.findForward(LEARNER_REP));
 	}
 
 	//check if there is submission deadline
@@ -344,7 +344,7 @@
 			return (mapping.findForward(REVISITED_LEARNER_REP));
 		    } else {
 			generalLearnerFlowDTO.setRequestLearningReportViewOnly(new Boolean(false).toString());
-			return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));
+			return (mapping.findForward(LEARNER_REP));
 		    }
 		}
 	    }
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.53 -r1.54
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	3 Jun 2014 16:22:22 -0000	1.53
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	24 Jun 2015 20:08:44 -0000	1.54
@@ -186,14 +186,7 @@
 	        path="/learning/LearnerRep.jsp"
 		    redirect="false"
 	      />
-	      
-	      <forward
-	        name="learningStarter"
-	        path="/learningIndex.jsp"
-		    redirect="false"
-	      />
 
-
 	     <forward
 	        name="revisitedLearnerRep"
 	        path="/learning/RevisitedLearnerRep.jsp"
@@ -247,8 +240,8 @@
 	      
 	    <forward
 	        name="learningStarter"
-	        path="/learningIndex.jsp"
-		    redirect="false"
+	        path="/learningStarter.do"
+		    redirect="true"
 	      />
       
 	      <forward
Index: lams_tool_laqa/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/editQuestionBox.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_laqa/web/authoring/editQuestionBox.jsp	21 May 2015 23:43:12 -0000	1.15
+++ lams_tool_laqa/web/authoring/editQuestionBox.jsp	24 Jun 2015 20:08:44 -0000	1.16
@@ -68,7 +68,7 @@
 				</label>
 			</div>
 			
-			<div class="field-name space-top" >
+			<div class="field-name small-space-top" >
 				<label for="min-words-limit">
 					<fmt:message key="label.minimum.number.words" >
 						<fmt:param> </fmt:param>
@@ -77,7 +77,7 @@
 				<html:text property="minWordsLimit" styleId="min-words-limit"/>
 			</div>
 
-			<div class="field-name space-top">
+			<div class="field-name small-space-top">
 				<fmt:message key="label.feedback"></fmt:message>
 			</div>
 			<lams:STRUTS-textarea property="feedback" rows="3" cols="75"/>
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/newQuestionBox.jsp,v
diff -u -r1.29 -r1.30
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	21 May 2015 23:43:12 -0000	1.29
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	24 Jun 2015 20:08:44 -0000	1.30
@@ -209,7 +209,7 @@
 				</label>
 			</div>
 			
-			<div class="field-name space-top" >
+			<div class="field-name small-space-top" >
 				<label for="min-words-limit">
 					<fmt:message key="label.minimum.number.words" >
 						<fmt:param> </fmt:param>
@@ -218,7 +218,7 @@
 				<html:text property="minWordsLimit" styleId="min-words-limit"/>
 			</div>
 
-            <div class="field-name space-top">
+            <div class="field-name small-space-top">
                 <fmt:message key="label.feedback"></fmt:message>
             </div>
             <lams:STRUTS-textarea property="feedback" rows="3" cols="75"/>