Index: lams_tool_sbmt/web/learner/sbmtLearner.jsp
===================================================================
diff -u -rbc4150568caa15d2bb1004bc1c73797c95c0205e -r87916b2e9c4406342e26149d731a5ab070f4d4e0
--- lams_tool_sbmt/web/learner/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision bc4150568caa15d2bb1004bc1c73797c95c0205e)
+++ lams_tool_sbmt/web/learner/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision 87916b2e9c4406342e26149d731a5ab070f4d4e0)
@@ -14,16 +14,18 @@
   	<link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
 
 	<script language="javascript">
-	var lockOnFinished = <c:out value="${learner.contentLockOnFinished}"/>;
-	var uploadFileNum = <c:choose><c:when test="${empty filesUploaded}">0</c:when><c:otherwise>1</c:otherwise></c:choose>;
+	var locked =  <c:out value="${learner.locked}"/>;
 	function finish(){
+		var lockOnFinished = <c:out value="${learner.contentLockOnFinished}"/>;
+		var uploadFileNum = <c:choose><c:when test="${empty learner.filesUploaded}">0</c:when><c:otherwise>1</c:otherwise></c:choose>;
+		var finishUrl= "<html:rewrite page='/learner.do?method=finish&toolSessionID=${learner.toolSessionID}&userID=${learner.userID}'/>";
 		if(lockOnFinished && uploadFileNum==0){
 			if(confirm("<fmt:message key='learner.finish.without.upload'/>"))
-				window.close();
+				location.href= finishUrl;
 			else
 				return false;
 		}else
-			window.close();
+			location.href= finishUrl;
 	}
 	</script>
 	<html:javascript formName="SbmtLearnerForm" method="validateForm"/>
@@ -36,7 +38,7 @@
   	<div id="datatablecontainer">
   	<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
 	<c:choose>
-			<c:when test="${empty filesUploaded}">
+			<c:when test="${empty learner.filesUploaded}">
 					<center><b>No files have been uploaded yet.</b><p>Only one file can be uploaded at a time - Maximum file size is 1.0 MB.</p></center>
 			</c:when>
 					
@@ -49,7 +51,7 @@
  				 </tr>
  				-->
  				
-				<c:forEach var="file" items="${filesUploaded}">				
+				<c:forEach var="file" items="${learner.filesUploaded}">				
 				<tr>
 				<!--First Row displaying the name of the File -->
 				<td><BR><b><fmt:message key="label.learner.fileName"/></b></td>
@@ -88,7 +90,7 @@
 						<fmt:message key="label.learner.notAvailable"/><br>
 					</c:when>
 					<c:otherwise>
-						<c:out value="{$file.marks}" escapeXml="false"/><br>
+						<c:out value="${file.marks}" escapeXml="false"/><br>
 					</c:otherwise>
 				</c:choose>
 				</td>
@@ -110,19 +112,19 @@
       	<!--File path row -->
         <tr>
           <td class="formlabel"><fmt:message key="label.learner.filePath"/></td>
-          <td class="formcontrol"><html:file property="filePath" /></td>
+          <td class="formcontrol"><html:file property="filePath" disabled="${learner.locked}" /></td>
         </tr>
         <!--File Description row -->
         <tr>
           <td class="formlabel"><fmt:message key="label.learner.fileDescription"/></td>
           <td class="formcontrol">
-          <html:textarea property="fileDescription" />
+          <html:textarea property="fileDescription"  disabled="${learner.locked}" />
            </td>
         </tr>
         <tr>
-          <td class="formcontrol"><html:submit><fmt:message key="label.learner.upload"/></html:submit></td>
+          <td class="formcontrol"><html:submit disabled="${learner.locked}"><fmt:message key="label.learner.upload" /></html:submit></td>
           <td class="formcontrol">
-          	  <html:button property="finished" onclick="finish()">
+          	  <html:button property="finished" onclick="finish()"  disabled="${learner.locked}">
           	  		<fmt:message key="label.learner.finished"/>
           	  </html:button>
           </td>