Index: lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf4b1f384bdfc7ff432dcbc130a2cc393780e7237 -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f4b1f384bdfc7ff432dcbc130a2cc393780e7237)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -136,8 +136,10 @@
 message.step.of  =Step {0} of {1}
 message.no.reflection.available  =No notebook available
 button.edit  =Edit
-errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
-error.attachment.executable  =The uploaded file is executable, please zip it before uploading.
+errors.maxfilesize=Uploaded file exceeded maximum size of {0}
+label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
+error.attachment.executable  =The uploaded file can not be an executable.
+error.file.type.zip=File must be a zip file.
 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\u201d, if you come back to this Share Resource, you won\u2019t be able to share new resources.
 message.activityLocked  =The instructor has set this activity not to allow you to view or share any more resources after you have finished it.
Index: lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rf4b1f384bdfc7ff432dcbc130a2cc393780e7237 -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f4b1f384bdfc7ff432dcbc130a2cc393780e7237)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -136,8 +136,9 @@
 message.step.of  =Step {0} of {1}
 message.no.reflection.available  =No notebook available
 button.edit  =Edit
-errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
-error.attachment.executable  =The uploaded file is executable, please zip it before uploading.
+errors.maxfilesize=Uploaded file exceeded maximum size of {0}
+label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
+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\u201d, if you come back to this Share Resource, you won\u2019t be able to share new resources.
 message.activityLocked  =The instructor has set this activity not to allow you to view or share any more resources after you have finished it.
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rb5ab72c783a98abeb08431bafb067ad4b9edf1df -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b5ab72c783a98abeb08431bafb067ad4b9edf1df)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -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_larsrc/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/FileUpload.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/FileUpload.tag	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -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_larsrc/web/WEB-INF/tags/WaitingSpinner.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/WaitingSpinner.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/WaitingSpinner.tag	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -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_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r1f99d03199a3995cfffe0cb1536c08f0220e88b0 -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1f99d03199a3995cfffe0cb1536c08f0220e88b0)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -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_larsrc/web/includes/javascript/rsrcresourceitem.js
===================================================================
diff -u -r33c08844653d1db1980b7a57cd4d22f28e948167 -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js	(.../rsrcresourceitem.js)	(revision 33c08844653d1db1980b7a57cd4d22f28e948167)
+++ lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js	(.../rsrcresourceitem.js)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -109,7 +109,8 @@
 
 		document.getElementById("instructionList").value = $("#instructionForm").serialize();
 		var formData = new FormData(document.getElementById("resourceItemForm"));
-
+		showBusy(instructionTargetDiv);
+		
 		// after submit, it direct to itemlist.jsp, 
 		// then refresh "basic tab" resource list and close this window.
 	    $.ajax({ // create an AJAX call...
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -r73f88e6a635cb095a73df2b86fd67d6a2e6e1301 -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 73f88e6a635cb095a73df2b86fd67d6a2e6e1301)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -2,27 +2,40 @@
 <%@ 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_LARGE_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>
 
 <lams:html>
 	<lams:head>
-		<%@ include file="addheader.jsp"%>
+		<%@ include file="addheader.jsp"%>		
 		<script type="text/javascript">
 			var UPLOAD_FILE_LARGE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_LARGE_MAX_SIZE}"/>';
 			
 			$(document).ready(function(){
 				$('#title').focus();
 			});
 
+			$.validator.addMethod('validateType', function (value, element, param) {
+				return validateNotExecutable(element.files[0], param);
+			}, '<fmt:message key="error.attachment.executable"/>');
+
+			$.validator.addMethod('validateSize', function (value, element, param) {
+				return validateFileSize(element.files[0], param);
+			}, '<fmt:message key="errors.maxfilesize"><fmt:param>${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}</fmt:param></fmt:message>');
+
 						
 	 		$( "#resourceItemForm" ).validate({
 	 			ignore: [],
 				errorClass: "text-danger",
 				wrapper: "span",
 	 			rules: {
 	 				file: {
-	 			    	required: true
-	 			    },
+				    	required: true,
+				    	validateType: '<c:out value="${EXE_FILE_TYPES}"/>',
+				    	validateSize: '<c:out value="${UPLOAD_FILE_LARGE_MAX_SIZE}"/>', 
+				    },
 				    title: {
 				    	required: true
 				    }
@@ -34,7 +47,14 @@
 					title : {
 						required : '<fmt:message key="error.resource.item.title.blank"/> '
 					}
-				}
+				},
+				errorPlacement: function(error, element) {
+			        if (element.hasClass("fileUpload")) {
+			           error.insertAfter(element.parent());
+			        } else {
+			           error.insertAfter(element);
+			        }
+			    }
 			});
 
 		</script>
@@ -68,7 +88,8 @@
 					<span id="itemAttachmentArea">
 					<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
 					</span>
-					<i class="fa fa-spinner" style="display:none" id="itemAttachmentArea_Busy"></i>
+					<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
+					</div>			
 				</div>
 	
 			</html:form>
Index: lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp
===================================================================
diff -u -r33c08844653d1db1980b7a57cd4d22f28e948167 -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp	(.../addheader.jsp)	(revision 33c08844653d1db1980b7a57cd4d22f28e948167)
+++ lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp	(.../addheader.jsp)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -9,9 +9,10 @@
  	<!-- ********************  javascript ********************** -->
 	<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/jquery.validate.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.validate.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrccommon.js'/>"></script>
 
 	<script type="text/javascript">
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -r73f88e6a635cb095a73df2b86fd67d6a2e6e1301 -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision 73f88e6a635cb095a73df2b86fd67d6a2e6e1301)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -2,7 +2,9 @@
 <%@ 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_LARGE_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>
 
 <lams:html>
 	<lams:head>
@@ -18,10 +20,11 @@
 				return this.optional(element) || (element.files[0].type == 'application/zip')
 			});
 			
-			$.validator.addMethod('filesize', function (value, element, param) {
-			    return this.optional(element) || (element.files[0].size <= param)
-			}, '<fmt:message key="errors.maxfilesize"><fmt:param>{0}</fmt:param></fmt:message>');
-		  
+			$.validator.addMethod('validateSize', function (value, element, param) {
+				return validateFileSize(element.files[0], param);
+			}, '<fmt:message key="errors.maxfilesize"><fmt:param>${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}</fmt:param></fmt:message>');
+
+								  
 	 		$( "#resourceItemForm" ).validate({
 	 			ignore: [],
 				errorClass: "text-danger",
@@ -30,7 +33,7 @@
 	 				file: {
 	 			    	required: true,
 	 			    	fileType: true,
-	 			    	filesize: UPLOAD_FILE_LARGE_MAX_SIZE,	 			    	
+	 			    	validateSize: UPLOAD_FILE_LARGE_MAX_SIZE,	 			    	
 	 			    },
 				    title: {
 				    	required: true
@@ -39,12 +42,19 @@
 				messages : {
 					file : {
 						required : '<fmt:message key="error.resource.item.file.blank"/> ',
-						fileType: 'File type incorrect?'
+						fileType: '<fmt:message key="error.file.type.zip"/>'
 					},
 					title : {
 						required : '<fmt:message key="error.resource.item.title.blank"/> '
 					}
-				}
+				},
+				errorPlacement: function(error, element) {
+			        if (element.hasClass("fileUpload")) {
+			           error.insertAfter(element.parent());
+			        } else {
+			           error.insertAfter(element);
+			        }
+			    }
 			});	 		
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
@@ -79,8 +89,9 @@
 					<span id="itemAttachmentArea">
 					<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
 					</span>
-					<i class="fa fa-spinner" style="display:none" id="itemAttachmentArea_Busy"></i>
 				</div>
+
+				<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
 	
 			</html:form>
 
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -r73f88e6a635cb095a73df2b86fd67d6a2e6e1301 -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision 73f88e6a635cb095a73df2b86fd67d6a2e6e1301)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -2,7 +2,9 @@
 <%@ 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_LARGE_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>
 
 <lams:html>
 	<lams:head>		
@@ -18,10 +20,11 @@
 				return this.optional(element) || (element.files[0].type == 'application/zip')
 			});
 			
-			$.validator.addMethod('filesize', function (value, element, param) {
-			    return this.optional(element) || (element.files[0].size <= param)
-			}, '<fmt:message key="errors.maxfilesize"><fmt:param>{0}</fmt:param></fmt:message>');
-			
+			$.validator.addMethod('validateSize', function (value, element, param) {
+				return validateFileSize(element.files[0], param);
+			}, '<fmt:message key="errors.maxfilesize"><fmt:param>${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}</fmt:param></fmt:message>');
+
+								  
 	 		$( "#resourceItemForm" ).validate({
 	 			ignore: [],
 				errorClass: "text-danger",
@@ -30,7 +33,7 @@
 	 				file: {
 	 			    	required: true,
 	 			    	fileType: true,
-	 			    	filesize: UPLOAD_FILE_LARGE_MAX_SIZE,
+	 			    	validateSize: UPLOAD_FILE_LARGE_MAX_SIZE,
 	 			    },
 				    title: {
 				    	required: true
@@ -39,12 +42,19 @@
 				messages : {
 					file : {
 						required : '<fmt:message key="error.resource.item.file.blank"/> ',
-						fileType: 'File type incorrect?'
+						fileType: '<fmt:message key="error.file.type.zip"/>'
 					},
 					title : {
 						required : '<fmt:message key="error.resource.item.title.blank"/> '
 					}
-				}
+				},
+				errorPlacement: function(error, element) {
+			        if (element.hasClass("fileUpload")) {
+			           error.insertAfter(element.parent());
+			        } else {
+			           error.insertAfter(element);
+			        }
+			    }
 			});
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
@@ -80,8 +90,9 @@
 					<span id="itemAttachmentArea">
 					<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
 					</span>
-					<i class="fa fa-spinner" style="display:none" id="itemAttachmentArea_Busy"></i>
 				</div>
+
+				<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>
 	
 			</html:form>
 		
Index: lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271)
+++ lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -8,8 +8,6 @@
 
 		<label><fmt:message key="label.authoring.basic.resource.instructions" /></label>
 
-		<i class="fa fa-spinner" style="display: none" id="instructionArea_Busy"></i>
-
 		<table class="table table-condensed table-no-border">
 			<c:forEach var="item" items="${instructionList}" varStatus="status">
 				<tr id="instructionItem${status.index}">
@@ -37,7 +35,9 @@
 				</tr>
 			</c:forEach>
 		</table>
-
+		
+		<lams:WaitingSpinner id="instructionArea_Busy"/>
+		
 		<a href="#nogo" onclick="javascript:addInstruction();" class="btn btn-default btn-sm pull-right">
 			<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.resource.add.instruction" /> 
 		</a>
Index: lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp
===================================================================
diff -u -r73f88e6a635cb095a73df2b86fd67d6a2e6e1301 -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision 73f88e6a635cb095a73df2b86fd67d6a2e6e1301)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -1,34 +1,12 @@
 <%@ include file="/common/taglibs.jsp"%>
+
 <c:choose>
 	<c:when test="${itemAttachment.hasFile}">
 		<c:out value="${itemAttachment.fileName}" /> &nbsp;
 		<a href="#nogo" onclick="removeItemAttachment(${itemAttachment.itemIndex})" class="btn btn-danger btn-sm"><i class="fa fa-trash-o"></i> <fmt:message key="label.delete" /> </a>
 	</c:when>
 	<c:otherwise>
-
-		<div class="input-group">
-	    <span class="input-group-btn" style="font-size:inherit;">
-				<button id="fileButtonBrowse" type="button" class="btn btn-sm btn-default">
-					<i class="fa fa-upload"></i> <fmt:message key="label.authoring.basic.resource.file.input"/>
-				</button>
-			</span>
-			<input type="file" id="fileSelector" name="file" style="display:none"> 
-			<input type="text" id="fileInputName" style="display:none;" disabled="disabled" placeholder="File not selected" class="form-control input-sm">
-		</div>
-
-		<script type="text/javascript">
-			// Fake file upload
-			document.getElementById('fileButtonBrowse').addEventListener('click', function() {
-				document.getElementById('fileSelector').click();
-			});
-			
-			document.getElementById('fileSelector').addEventListener('change', function() {
-				$('#fileInputName').show();
-				document.getElementById('fileInputName').value = this.value.replace(/^.*\\/, "");
-				
-			});
-		</script>    
-
+		<lams:FileUpload fileFieldname="file"  maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
 		
 	</c:otherwise>
 </c:choose>
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -rb3fe40cd67fc779a6eee8320fadc3a489565a557 -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision b3fe40cd67fc779a6eee8320fadc3a489565a557)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -5,7 +5,7 @@
 <div class="panel panel-default voffset5">
 	<div class="panel-heading panel-title">
 		<fmt:message key="label.authoring.basic.resource.list.title" /> 
-		<i class="fa fa-spinner" style="display: none" id="resourceListArea_Busy"></i>
+		<lams:WaitingSpinner id="resourceListArea_Busy" showInline="true"/>
 	</div>
 
 	<table class="table table-striped table-condensed" id="itemTable">
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -r7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -1,7 +1,10 @@
 <%@ 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>
 
 <!-- Add a File Form-->
 <div class="panel panel-default">
@@ -23,34 +26,14 @@
 			<html:text property="title" styleClass="form-control" tabindex="1" styleId="resourcetitle"/>
 	  	</div>	
 
-		<div class="input-group" id="addfile">
-	    <span class="input-group-btn" style="font-size:inherit;">
-				<button tabindex="2" id="fileButtonBrowse" type="button" class="btn btn-sm btn-default">
-					<i class="fa fa-upload"></i> <fmt:message key="label.authoring.basic.resource.file.input"/>
-				</button>
-			</span>
-			<input type="file" id="fileSelector" name="file" style="display:none"> 
-			<input type="text" id="fileInputName" style="display:none;" disabled="disabled" placeholder="File not selected" class="form-control input-sm">
-		</div>
+		<lams:FileUpload fileFieldname="file" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}" tabindex="2"/>
 
-		<script type="text/javascript">
-			// Fake file upload
-			document.getElementById('fileButtonBrowse').addEventListener('click', function() {
-				document.getElementById('fileSelector').click();
-			});
-			
-			document.getElementById('fileSelector').addEventListener('change', function() {
-				$('#fileInputName').show();
-				document.getElementById('fileInputName').value = this.value.replace(/^.*\\/, "");
-				
-			});
-		</script>    
-
 		<div class="form-group voffset10">
 	    	<label for="description"><fmt:message key="label.learning.comment.or.instruction" /></label>
 			<html:text property="description" tabindex="3" styleClass="form-control" maxlength="255"/>
 	  	</div>	
 
+		<lams:WaitingSpinner id="itemAttachmentArea_Busy"/>	
 		<div id="buttons" class="pull-right">
 	 		<html:button property="goback" onclick="javascript:cancel()" styleClass="btn btn-sm btn-default" styleId="cancelButton">
 				<fmt:message key="button.cancel" />
@@ -63,17 +46,19 @@
 	</html:form>
 	
 	<script type="text/javascript">
-	  var UPLOAD_FILE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_MAX_SIZE}"/>';
 
 		$(document).ready(function(){
 			$('#title').focus();
 		});	
 					
-		$.validator.addMethod('filesize', function (value, element, param) {
-		    return this.optional(element) || (element.files[0].size <= param)
-		}, '<fmt:message key="errors.maxfilesize"><fmt:param>{0}</fmt:param></fmt:message>');
+		$.validator.addMethod('validateType', function (value, element, param) {
+			return validateNotExecutable(element.files[0], param);
+		}, '<fmt:message key="error.attachment.executable"/>');
 
-	  
+		$.validator.addMethod('validateSize', function (value, element, param) {
+			return validateFileSize(element.files[0], param);
+		}, '<fmt:message key="errors.maxfilesize"><fmt:param>${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}</fmt:param></fmt:message>');
+
 		$('#resourceItemForm').submit(submitResourceForm);
 		$('#resourceItemForm').validate({
 			ignore: [],
@@ -82,7 +67,8 @@
 			rules: {
 				file: {
 			    	required: true,
-			    	filesize: UPLOAD_FILE_MAX_SIZE, 
+			    	validateType: '<c:out value="${EXE_FILE_TYPES}"/>',
+			    	validateSize: '<c:out value="${UPLOAD_FILE_MAX_SIZE}"/>', 
 			    },
 			    title: {
 			    	required: true
@@ -96,6 +82,13 @@
 					required : '<fmt:message key="error.resource.item.title.blank"/> '
 				}
 			},
+			errorPlacement: function(error, element) {
+		        if (element.hasClass("fileUpload")) {
+		           error.insertAfter(element.parent());
+		        } else {
+		           error.insertAfter(element);
+		        }
+		    }
 		});	
 	</script>
 	
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -23,18 +23,20 @@
 	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="/lams/includes/javascript/jquery.validate.js"></script>
-	
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.validate.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
 	<script type="text/javascript">
 	
 		$(document).ready(function(){
 			cancel();
 		});
 
  		function submitResourceForm() {
+ 			clearFileError();
 			if ( $(this).valid() ) {
 				$('.btn-disable-on-submit').prop('disabled', true);
 				var formData = new FormData(this);
+				showBusy('itemAttachmentArea');
 			    $.ajax({ // create an AJAX call...
 			        data: formData, 
 			        processData: false, // tell jQuery not to process the data
@@ -48,6 +50,7 @@
 			    		alert(textStatus+": "+errorThrown);
 			    	},
 			    	complete: function(response) {
+			    		hideBusy(itemAttachmentArea_Busy);
 			            $('.btn-disable-on-submit').prop('disabled', false);
 					}
 			    });
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rce92f0b193ab5e4ce9a9c161e515cdca982b7ffd -ra4bc09633e07b301174911591702607f522c7037
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ce92f0b193ab5e4ce9a9c161e515cdca982b7ffd)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a4bc09633e07b301174911591702607f522c7037)
@@ -195,7 +195,7 @@
 	</c:if>
 	
 	<!--For release marks feature-->
-	<i class="fa fa-spinner" style="display:none" id="message-area-busy"></i>
+	<lams:WaitingSpinner id="message-area-busy"/>
 	<div id="message-area"></div>
 
 </div>