Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.33.2.9 -r1.33.2.10
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	20 Feb 2017 05:33:46 -0000	1.33.2.9
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	1 Mar 2017 04:08:33 -0000	1.33.2.10
@@ -39,7 +39,6 @@
 label.learner.notAvailable  =Not available
 label.learner.noUpload  =No files have been uploaded yet.
 label.learner.uploadMessage  =Uploaded file must not be executable and not exceed size of {0}
-errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
 learner.finish.without.upload  =No files have been uploaded yet. Files can not be uploaded once you choose OK.
 label.monitoring.heading  =Monitoring
 label.monitoring.heading.userlist  =Summary
@@ -101,7 +100,7 @@
 messsage.learner.finish.confirm  =Are you going to finish submission?
 label.edit  =Edit
 message.no.reflection.available  =No Notebook available
-error.attachment.executable  =The uploaded file is executable, please zip it before uploading.
+error.attachment.executable  =The uploaded file can not be an executable
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Submit Files, you won't be able to continue adding files.
 message.activityLocked  =The instructor has set this activity not to allow submissions after you have finished it. As you are returning to this activity, you are able to see your files but not allowed to add more.
@@ -157,6 +156,6 @@
 label.search  =Search...
 errors.required  ={0} is required.
 errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
+label.add=Add
 
-
-#======= End labels: Exported 150 labels for en AU =====
+#======= End labels: Exported 149 labels for en AU =====
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.30.2.6 -r1.30.2.7
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	20 Feb 2017 05:33:46 -0000	1.30.2.6
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	1 Mar 2017 04:08:33 -0000	1.30.2.7
@@ -38,7 +38,7 @@
 label.learner.dateMarksReleased  =Date marks released
 label.learner.notAvailable  =Not available
 label.learner.noUpload  =No files have been uploaded yet.
-label.learner.uploadMessage  =Only one file can be uploaded at a time - Maximum file size is 1.0 MB
+label.learner.uploadMessage  =Uploaded file must not be executable and not exceed size of {0}
 learner.finish.without.upload  =No files have been uploaded yet. Files can not be uploaded once you choose OK.
 label.monitoring.heading  =Monitoring
 label.monitoring.heading.userlist  =Summary
@@ -100,7 +100,7 @@
 messsage.learner.finish.confirm  =Are you going to finish submission?
 label.edit  =Edit
 message.no.reflection.available  =No Notebook available
-error.attachment.executable  =The uploaded file is executable, please zip it before uploading.
+error.attachment.executable  =The uploaded file can not be an executable
 message.alertContentEdit  =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
 message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Submit Files, you won't be able to continue adding files.
 message.activityLocked  =The instructor has set this activity not to allow submissions after you have finished it. As you are returning to this activity, you are able to see your files but not allowed to add more.
@@ -156,6 +156,6 @@
 label.search  =Search...
 errors.required  ={0} is required.
 errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
+label.add=Add
 
-
-#======= End labels: Exported 150 labels for en AU =====
+#======= End labels: Exported 149 labels for en AU =====
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.21.2.2 -r1.21.2.3
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:34:41 -0000	1.21.2.2
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 04:08:33 -0000	1.21.2.3
@@ -123,7 +123,7 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleId="saveButton" styleClass="btn btn-primary pull-right">
+		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.7 -r1.3.2.8
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:37 -0000	1.3.2.7
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 04:08:34 -0000	1.3.2.8
@@ -529,5 +529,13 @@
        <name>CommentsAuthor</name>
        <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
+   	<tag-file>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/sbmtlearner.jsp,v
diff -u -r1.35.2.12 -r1.35.2.13
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	20 Feb 2017 02:05:15 -0000	1.35.2.12
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	1 Mar 2017 04:08:33 -0000	1.35.2.13
@@ -1,11 +1,18 @@
 <!DOCTYPE html>
 <%@include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %>
+<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE)%></c:set>
+<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE))%></c:set>
+<c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <lams:html>
 <lams:head>
 	<title><fmt:message key="tool.display.name" /></title>
 	<%@ include file="/common/header.jsp"%>
+	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
 
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -46,10 +53,48 @@
 			var continueUrl = "<html:rewrite page='/learning/newReflection.do?sessionMapID=${sessionMapID}'/>";
 			return submitCount(continueUrl);
 		}
+		function validate() {
+			var valid = true;
+
+			// check description
+			clearFileError("desc-error-msg");
+			if ( $('#description').val().trim().length == 0 ) {
+				var requiredMsg = '<fmt:message key="errors.required"><fmt:param><fmt:message key="label.learner.fileDescription"/></fmt:param></fmt:message>';
+				showFileError(requiredMsg, "desc-error-msg");
+				valid = false;
+			}
+			
+			// check file
+			var fileSelect = document.getElementById('file');
+			var files = fileSelect.files;
+			if (files.length == 0) {
+				clearFileError();
+				var requiredMsg = '<fmt:message key="errors.required"><fmt:param><fmt:message key="learner.form.filepath.displayname"/></fmt:param></fmt:message>';
+				showFileError(requiredMsg);
+				valid = false;
+			} else {
+				var file = files[0];
+				if ( ! validateShowErrorNotExecutable(file, '<fmt:message key="error.attachment.executable"/>', false, '${EXE_FILE_TYPES}')
+						 || ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<fmt:message key="errors.maxfilesize"/>') ) {
+					valid = false;
+				}
+			}
+
+			if ( valid ) {
+				disableButtons();
+			}
+			return valid;
+		}
 		function disableButtons() {
 			// do not disable the file button or the file will be missing on the upload.
 			$('.btn-disable-on-submit').prop('disabled', true);
 			$('a.btn-disable-on-submit').hide(); // links must be hidden, cannot be disabled
+			
+			// show the waiting area during the upload
+			var div = document.getElementById("attachmentArea_Busy");
+			if(div != null){
+				div.style.display = '';
+			}
 		}
 	</script>
 
@@ -216,7 +261,7 @@
 
 			<c:if test="${!displayForm}">
 
-				<html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data" onsubmit="disableButtons();" >
+				<html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data" onsubmit="return validate();" >
 					<html:hidden property="sessionMapID" />
 
 					<!-- Hidden fields -->
@@ -231,31 +276,28 @@
 
 							<div class="form-group">
 								<label for="file"><fmt:message key="label.learner.filePath" />&nbsp;<span style="color: red">*</span></label>
-								<html:file property="file" styleClass="btn btn-sm btn-file"
-									disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
-								<p class="help-block">
-									<fmt:message key="label.learner.uploadMessage">
-										<fmt:param>${sessionMap.uploadMaxFileSize}</fmt:param>
-									</fmt:message>
-								</p>
+								<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.learner.filePath"
+									uploadInfoMessageKey="label.learner.uploadMessage" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
 							</div>
 							<div class="form-group">
 								<!--File Description row -->
 								<label for="description"><fmt:message key="label.learner.fileDescription" />&nbsp;<span
 									style="color: red">*</span></label>
-								<html:textarea styleClass="form-control" property="description"
-									disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
-									<p class="help-block"><small><fmt:message key="errors.required"><fmt:param>*</fmt:param></fmt:message></small></p>
+								<html:textarea styleId="description" styleClass="form-control" property="description"/>
+								<div id="desc-error-msg" class="text-danger" style="display: none;"></div>
 							</div>
+							<p class="help-block"><small><fmt:message key="errors.required"><fmt:param>*</fmt:param></fmt:message></small></p>
 							<div class="form-group">
 								<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.arriveLimit}">disabled="disabled"</c:if>
 									class="btn btn-sm btn-default btn-primary btn-disable-on-submit">
-									<i class="fa fa-xs fa-upload"></i> <fmt:message key="label.learner.upload" />
+									<i class="fa fa-xs fa-plus"></i> <fmt:message key="label.add" />
 								</button>
 							</div>
 						</div>
 					</div>
 				</html:form>
+				
+				<lams:WaitingSpinner id="attachmentArea_Busy"/>
 			</c:if>
 		</c:if>
 		<!-- end form -->
Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/updatemark.jsp,v
diff -u -r1.15.2.5 -r1.15.2.6
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	22 Oct 2016 07:05:53 -0000	1.15.2.5
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	1 Mar 2017 04:08:34 -0000	1.15.2.6
@@ -1,6 +1,12 @@
 <!DOCTYPE html>
-
 <%@include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %>
+<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
+<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set>
+<c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set>
+
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
@@ -13,10 +19,10 @@
 	<title><fmt:message key="activity.title" /></title>
 	<lams:css/>
 	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-	
+	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
 	<script type="text/javascript">
 		function removeMarkFile() {
 			var answer = confirm("<fmt:message key="message.monitor.mark.confirmDeleteFile"/>");
@@ -25,6 +31,23 @@
 				document.getElementById("updateMarkForm").submit();
 			}
 		}
+		
+		function validate() {
+			var fileSelect = document.getElementById('markFile');
+			var files = fileSelect.files;
+			if (files.length > 0) {
+				var file = files[0];
+				if ( ! validateShowErrorNotExecutable(file, '<fmt:message key="error.attachment.executable"/>', false, '${EXE_FILE_TYPES}')
+						 || ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<fmt:message key="errors.maxfilesize"/>') ) {
+					return false;
+				}
+			}
+			var div = document.getElementById("attachmentArea_Busy");
+			if(div != null){
+				div.style.display = '';
+			}
+			return true;
+		}
 	</script>
 	
 </lams:head>
@@ -35,7 +58,7 @@
 
 
 		<c:forEach var="fileInfo" items="${report}" varStatus="status">
-			<html:form action="/mark.do" method="post" styleId="updateMarkForm" enctype="multipart/form-data">
+			<html:form action="/mark.do" method="post" styleId="updateMarkForm" enctype="multipart/form-data" onsubmit="return validate();">
 			
 				<html:hidden property="method" value="updateMark" styleId="method" />
 				<html:hidden property="toolSessionID" />
@@ -69,7 +92,8 @@
 				<c:choose>
 					<c:when test="${empty fileInfo.markFileUUID}">
 						<dd>
-								<html:file property="markFile" />
+							<lams:FileUpload fileFieldname="markFile" fileInputMessageKey="label.learner.filePath"
+									uploadInfoMessageKey="label.learner.uploadMessage" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
 						</dd>
 					</c:when>
 					<c:otherwise>
@@ -96,11 +120,9 @@
 								</html:link>
 								</div>
 								
-								<div class="offset2">
-									<small>
-									<fmt:message key="label.monitor.mark.replaceFile" />:
-									<html:file property="markFile" />
-									</small>
+								<div class="offset5">
+									<lams:FileUpload fileFieldname="markFile" fileInputMessageKey="label.monitor.mark.replaceFile"
+									uploadInfoMessageKey="label.learner.uploadMessage" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
 								</div>
 						</dd>		
 					</c:otherwise>
@@ -113,6 +135,8 @@
 						toolbarSet="DefaultMonitor"></lams:CKEditor>
 				</div>
 
+				<lams:WaitingSpinner id="attachmentArea_Busy"/>
+
 				<hr width="100%" />
 				<div id="buttons" class="pull-right">	
 					<c:if test="${updateMode == 'listMark'}">
@@ -128,9 +152,9 @@
 					<html:link href="${cancelUrl}" styleClass="btn btn-default">
 						<fmt:message key="label.cancel" />
 					</html:link>
-					<html:link href="javascript:document.getElementById('updateMarkForm').submit()" styleClass="btn  btn-primary loffset10">
+					<button type="submit" class="btn  btn-primary loffset10">
 						<fmt:message key="label.monitoring.saveMarks.button" />
-					</html:link>
+					</button>
 				</div>
 			</html:form>
 		</c:forEach>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/parts/summary.jsp,v
diff -u -r1.21.2.10 -r1.21.2.11
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	13 Dec 2016 22:54:36 -0000	1.21.2.10
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	1 Mar 2017 04:08:33 -0000	1.21.2.11
@@ -153,7 +153,7 @@
 	</c:if>
 	
 	<!--For release marks feature-->
-	<i class="fa fa-refresh fa-spin fa-fw" style="display:none" id="messageArea_Busy"></i>
+	<lams:WaitingSpinner id="messageArea_Busy"/>
 	<div id="messageArea"></div>
 
 </div>