Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r816962c9f50fa4103fad5743264e28de164da9cd -r20d56e5a580f9c44979e40663e21cd981f75dc80
--- lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 816962c9f50fa4103fad5743264e28de164da9cd)
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 20d56e5a580f9c44979e40663e21cd981f75dc80)
@@ -40,7 +40,7 @@
 label.authoring.basic.resource.delete  =Delete
 label.authoring.basic.resource.title.input  =Title
 label.authoring.basic.resource.description.input  =Description
-label.authoring.choosefile.button  =Choose file
+label.authoring.choosefile.button  =File
 label.authoring.advance.allow.contribute.tasks  =Allow Learners to contribute tasks
 label.authoring.advance.lock.on.finished  =Lock when finished
 label.authoring.advance.monitor.verification.required  =Monitor needs to verify these tasks before letting Learners to complete activity
@@ -167,7 +167,8 @@
 label.confirm  =Confirm
 label.task.options  =Task options
 label.activity.completion  =End of activity
-errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes.
+errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
+error.attachment.executable  =Uploaded file is executable
+label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
 
-
 #======= End labels: Exported 162 labels for en AU =====
Index: lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r816962c9f50fa4103fad5743264e28de164da9cd -r20d56e5a580f9c44979e40663e21cd981f75dc80
--- lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 816962c9f50fa4103fad5743264e28de164da9cd)
+++ lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 20d56e5a580f9c44979e40663e21cd981f75dc80)
@@ -40,7 +40,7 @@
 label.authoring.basic.resource.delete  =Delete
 label.authoring.basic.resource.title.input  =Title
 label.authoring.basic.resource.description.input  =Description
-label.authoring.choosefile.button  =Choose file
+label.authoring.choosefile.button  =File
 label.authoring.advance.allow.contribute.tasks  =Allow Learners to contribute tasks
 label.authoring.advance.lock.on.finished  =Lock when finished
 label.authoring.advance.monitor.verification.required  =Monitor needs to verify these tasks before letting Learners to complete activity
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rb5ab72c783a98abeb08431bafb067ad4b9edf1df -r20d56e5a580f9c44979e40663e21cd981f75dc80
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b5ab72c783a98abeb08431bafb067ad4b9edf1df)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 20d56e5a580f9c44979e40663e21cd981f75dc80)
@@ -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_task/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/FileUpload.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/FileUpload.tag	(revision 20d56e5a580f9c44979e40663e21cd981f75dc80)
@@ -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_task/web/WEB-INF/tags/WaitingSpinner.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/WaitingSpinner.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/WaitingSpinner.tag	(revision 20d56e5a580f9c44979e40663e21cd981f75dc80)
@@ -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_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r1f99d03199a3995cfffe0cb1536c08f0220e88b0 -r20d56e5a580f9c44979e40663e21cd981f75dc80
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1f99d03199a3995cfffe0cb1536c08f0220e88b0)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 20d56e5a580f9c44979e40663e21cd981f75dc80)
@@ -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_task/web/pages/learning/learning.jsp
===================================================================
diff -u -r3d7ad32687edeec93585fe3ef54b554d891dbe98 -r20d56e5a580f9c44979e40663e21cd981f75dc80
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3d7ad32687edeec93585fe3ef54b554d891dbe98)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 20d56e5a580f9c44979e40663e21cd981f75dc80)
@@ -1,5 +1,9 @@
 <!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:if test="${not empty param.sessionMapID}">
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 </c:if>
@@ -9,6 +13,10 @@
 <c:set var="taskList" value="${sessionMap.taskList}" />
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
+<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>
+
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
@@ -24,9 +32,31 @@
 				if ( addTaskArea && addTaskArea.contentWindow.disableButtons  ) {
 					addTaskArea.contentWindow.disableButtons();
 				}
+				
+				// show the waiting area during the upload
+				var div = document.getElementById("attachmentArea_Busy");
+				if(div != null){
+					div.style.display = '';
+				}
 			} catch(err) {}
 		}
 	
+		function validateFiles() {
+			var fileSelect = document.getElementById('uploadButton');
+			var files = fileSelect.files;
+			if (files.length == 0) {
+				return 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"/>') ) {
+					return false;
+				}
+			}
+			disableButtons();
+			return true;
+		}
+	
 		function checkNew() {
 			document.location.href = "<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}";
 			return false;
Index: lams_tool_task/web/pages/learning/parts/itemdetails.jsp
===================================================================
diff -u -re11fef2ebb0ae3b3d8261d8d01de83107037c5a8 -r20d56e5a580f9c44979e40663e21cd981f75dc80
--- lams_tool_task/web/pages/learning/parts/itemdetails.jsp	(.../itemdetails.jsp)	(revision e11fef2ebb0ae3b3d8261d8d01de83107037c5a8)
+++ lams_tool_task/web/pages/learning/parts/itemdetails.jsp	(.../itemdetails.jsp)	(revision 20d56e5a580f9c44979e40663e21cd981f75dc80)
@@ -23,7 +23,7 @@
 							</c:if>
 
 							<input type="submit" name="commentButton" value='<fmt:message key="label.preview.post" />'
-								class="btn btn-sm btn-default btn-disable-on-submit voffset5" />
+								class="btn btn-default btn-disable-on-submit voffset5" />
 						</div>
 
 					</c:if>
@@ -32,8 +32,9 @@
 
 			<!-- Uploaded Attachments -->
 			<c:if test="${item.filesAllowed}">
+				<hr class="msg-hr">				
 				<html:form action="/learning/uploadFile.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
-					method="post" enctype="multipart/form-data" onsubmit="disableButtons()">
+					method="post" enctype="multipart/form-data" onsubmit="return validateFiles();">
 					<c:choose>
 						<c:when test="${(mode != 'teacher') && !itemDTO.attachmentRequirementsMet}">
 							<lams:Alert id="fileRequired" close="true" type="info">
@@ -44,20 +45,19 @@
 					</c:otherwise>
 					</c:choose>
 
+					<h5>
+						<fmt:message key="label.preview.upload.file" />
+					</h5>
 					<%@ include file="filelist.jsp"%>
-
 					<c:if test="${sessionMap.mode != 'teacher'}">
-						<h5>
-							<fmt:message key="label.preview.upload.file" />
-						</h5>
-						<html:file property="uploadedFile" styleId="uploadButton" styleClass="form-control">
-							<fmt:message key="label.authoring.choosefile.button" />
-						</html:file>
-
+						<lams:FileUpload fileFieldId="uploadButton"  fileFieldname="uploadedFile" fileInputMessageKey="label.authoring.choosefile.button"
+							maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
 						<input type="submit" name="uploadedFileButton" value='<fmt:message key="label.preview.upload.button" />'
-							class="btn btn-sm btn-default btn-disable-on-submit voffset5" />
+							class="btn btn-default btn-disable-on-submit voffset5" />
 					</c:if>
 				</html:form>
+				
+				<lams:WaitingSpinner id="attachmentArea_Busy"/>
 			</c:if>
 		</c:if>
 
Index: lams_tool_task/web/pages/learning/parts/itemlist.jsp
===================================================================
diff -u -rbfb35f4f0e90063d8ea06eea71a7f6768ee0f1dc -r20d56e5a580f9c44979e40663e21cd981f75dc80
--- lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision bfb35f4f0e90063d8ea06eea71a7f6768ee0f1dc)
+++ lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 20d56e5a580f9c44979e40663e21cd981f75dc80)
@@ -2,12 +2,8 @@
 
 <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/upload.js"></script>
 
-<script language="JavaScript" type="text/JavaScript">
-	<!--
-	-->		
-</script>
-
 <h4>
 	<fmt:message key="label.learning.tasks.to.do" />
 </h4>