Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r8878abdf995d85e382ff0eb22a4118c413cd11cb -r07ace0e41d113321756cbe1d75ab04d8c9cb5841
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8878abdf995d85e382ff0eb22a4118c413cd11cb)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 07ace0e41d113321756cbe1d75ab04d8c9cb5841)
@@ -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
===================================================================
diff -u -r8878abdf995d85e382ff0eb22a4118c413cd11cb -r07ace0e41d113321756cbe1d75ab04d8c9cb5841
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8878abdf995d85e382ff0eb22a4118c413cd11cb)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 07ace0e41d113321756cbe1d75ab04d8c9cb5841)
@@ -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
===================================================================
diff -u -rb5ab72c783a98abeb08431bafb067ad4b9edf1df -r07ace0e41d113321756cbe1d75ab04d8c9cb5841
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b5ab72c783a98abeb08431bafb067ad4b9edf1df)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 07ace0e41d113321756cbe1d75ab04d8c9cb5841)
@@ -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">
Index: lams_tool_sbmt/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/FileUpload.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/FileUpload.tag	(revision 07ace0e41d113321756cbe1d75ab04d8c9cb5841)
@@ -0,0 +1,84 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%-- Usually fileFieldname and fileFieldId are the same, but DACO needs them to be different.
+ If they can be the same, set  fileFieldname and  fileFieldId will be set to the same. 
+ If you need them different, then define both. 
+ If you define neither, fileFieldname = fileFieldId = "fileSelector" --%>
+<%@ attribute name="fileFieldname" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileFieldId" required="false" rtexprvalue="true"%>
+
+<%@ attribute name="fileInputNameFieldname" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileInputMessageKey" required="false" rtexprvalue="true"%>
+
+<%-- Set uploadInfoMessageKey to '-' to NOT show the "not exe and max file size" type message. Leave it blank for the default key  label.upload.info --%>
+<%@ attribute name="uploadInfoMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="maxFileSize" required="true" rtexprvalue="true"%> 
+<%@ attribute name="tabindex" required="false" rtexprvalue="true"%>
+
+<%-- Only set if you have more than one file field on the screen (such as DACO) --%>			
+<%@ attribute name="errorMsgDiv" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileButtonBrowse" required="false" rtexprvalue="true"%>
+
+			
+<c:if test="${empty fileFieldname}">
+	<c:set var="fileFieldname" value="fileSelector" />
+</c:if>
+
+<c:if test="${empty fileFieldId}">
+	<c:set var="fileFieldId" value="${fileFieldname}" />
+</c:if>
+
+<c:if test="${empty fileInputNameFieldname}">
+	<c:set var="fileInputNameFieldname" value="fileInputName" />
+</c:if>
+
+<c:if test="${empty fileInputMessageKey}">
+	<c:set var="fileInputMessageKey" value="label.authoring.basic.resource.file.input" />
+</c:if>
+
+<c:if test="${empty uploadInfoMessageKey}">
+	<c:set var="uploadInfoMessageKey" value="label.upload.info" />
+</c:if>
+
+<c:if test="${not empty tabindex}">
+	<c:set var="tabindexString" value="tabindex='${tabindex}'" />
+</c:if>
+
+<c:if test="${empty errorMsgDiv}">
+	<c:set var="errorMsgDiv" value="file-error-msg" />
+</c:if>
+
+<c:if test="${empty fileButtonBrowse}">
+	<c:set var="fileButtonBrowse" value="fileButtonBrowse" />
+</c:if>
+
+
+<div class="input-group" id="addfile">
+	<span class="input-group-btn" style="font-size:inherit"> <%-- font-size:inherit needed for Share Resources authoring or the button is too small --%>
+		<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-default">
+			<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+		</button>
+	</span>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" style="display:none" class="fileUpload"> 
+	<input type="text" id="${fileInputNameFieldname}" style="display:none" disabled="disabled" placeholder="File not selected" class="form-control file-input-name">
+</div>
+<c:if test="${uploadInfoMessageKey ne '-'}">
+<p class="help-block"><fmt:message key="${uploadInfoMessageKey}"><fmt:param>${maxFileSize}</fmt:param></fmt:message></p>					
+</c:if>
+<div id="${errorMsgDiv}" class="text-danger" style="display:none"></div>			
+
+<script type="text/javascript">
+	// Fake file upload
+	document.getElementById('${fileButtonBrowse}').addEventListener('click', function() {
+		document.getElementById('${fileFieldId}').click();
+	});
+	
+	document.getElementById('${fileFieldId}').addEventListener('change', function() {
+		$('#${fileInputNameFieldname}').show();
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_sbmt/web/WEB-INF/tags/WaitingSpinner.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/WaitingSpinner.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/WaitingSpinner.tag	(revision 07ace0e41d113321756cbe1d75ab04d8c9cb5841)
@@ -0,0 +1,17 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="showInline" required="false" rtexprvalue="true"%>
+			
+<c:if test="${not empty id}">
+	<c:set var="idString">id="${id}"</c:set>
+</c:if>
+
+<c:choose>
+<c:when test="${showInline}">
+<i class="fa fa-refresh fa-spin fa-fw text-primary" style="display:none" ${idString} /></i>
+</c:when>
+<c:otherwise>
+<div class="text-center" style="display:none" ${idString} ><i class="fa fa-refresh fa-spin fa-2x fa-fw text-primary" /></i></div>
+</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r1f99d03199a3995cfffe0cb1536c08f0220e88b0 -r07ace0e41d113321756cbe1d75ab04d8c9cb5841
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1f99d03199a3995cfffe0cb1536c08f0220e88b0)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 07ace0e41d113321756cbe1d75ab04d8c9cb5841)
@@ -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
===================================================================
diff -u -rc594c716c5d793a4a86c95161a6b3be7ebd70af7 -r07ace0e41d113321756cbe1d75ab04d8c9cb5841
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision c594c716c5d793a4a86c95161a6b3be7ebd70af7)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 07ace0e41d113321756cbe1d75ab04d8c9cb5841)
@@ -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
===================================================================
diff -u -raeba69e88ab1e8231f91f2b5908dda5edf03f84f -r07ace0e41d113321756cbe1d75ab04d8c9cb5841
--- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision aeba69e88ab1e8231f91f2b5908dda5edf03f84f)
+++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp	(.../updatemark.jsp)	(revision 07ace0e41d113321756cbe1d75ab04d8c9cb5841)
@@ -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
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r07ace0e41d113321756cbe1d75ab04d8c9cb5841
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 07ace0e41d113321756cbe1d75ab04d8c9cb5841)
@@ -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>