Index: lams_tool_daco/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r565d9271e54caf3d9a02cb621962c78db60f7e6d -rb99c1a3c6fbea3d9a4190f69b95381f14561ffe1
--- lams_tool_daco/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 565d9271e54caf3d9a02cb621962c78db60f7e6d)
+++ lams_tool_daco/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b99c1a3c6fbea3d9a4190f69b95381f14561ffe1)
@@ -252,6 +252,9 @@
 label.monitoring.average.number.records.heading  =Average Number of Records
 label.activity.completion  =End of activity
 label.notifications  =Notifications
+errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
+error.attachment.executable  =Uploaded file is executable
+error.attachment.must.be.image  =Allowed file formats: JPG, GIF or PNG.
+label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
 
-
 #======= End labels: Exported 246 labels for en AU =====
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rb5ab72c783a98abeb08431bafb067ad4b9edf1df -rb99c1a3c6fbea3d9a4190f69b95381f14561ffe1
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b5ab72c783a98abeb08431bafb067ad4b9edf1df)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b99c1a3c6fbea3d9a4190f69b95381f14561ffe1)
@@ -123,10 +123,10 @@
     }  				
 </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" onclick="javascript:doCancel()" styleId="cancelButton" styleClass="btn btn-default roffset5 pull-right">
+		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
 		</html:link>
 </div>
Index: lams_tool_daco/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/FileUpload.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/FileUpload.tag	(revision b99c1a3c6fbea3d9a4190f69b95381f14561ffe1)
@@ -0,0 +1,80 @@
+<%@ 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"%>
+<%@ 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>
+<p class="help-block"><fmt:message key="${uploadInfoMessageKey}"><fmt:param>${maxFileSize}</fmt:param></fmt:message></p>					
+<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_daco/web/WEB-INF/tags/WaitingSpinner.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/WaitingSpinner.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/WaitingSpinner.tag	(revision b99c1a3c6fbea3d9a4190f69b95381f14561ffe1)
@@ -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_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r1f99d03199a3995cfffe0cb1536c08f0220e88b0 -rb99c1a3c6fbea3d9a4190f69b95381f14561ffe1
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1f99d03199a3995cfffe0cb1536c08f0220e88b0)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b99c1a3c6fbea3d9a4190f69b95381f14561ffe1)
@@ -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_daco/web/includes/css/daco.css
===================================================================
diff -u -rfd2dcf51ae6adf6aee088939b8c616b981e9a6d3 -rb99c1a3c6fbea3d9a4190f69b95381f14561ffe1
--- lams_tool_daco/web/includes/css/daco.css	(.../daco.css)	(revision fd2dcf51ae6adf6aee088939b8c616b981e9a6d3)
+++ lams_tool_daco/web/includes/css/daco.css	(.../daco.css)	(revision b99c1a3c6fbea3d9a4190f69b95381f14561ffe1)
@@ -44,6 +44,10 @@
 form#recordForm input, form#recordForm textarea, form#recordForm select{
 	margin-top: 6px;
 }
+/* overrides form#recordForm input for file input */
+form#recordForm input.file-input-name{ 
+	margin-top: 0px;
+}
 div.bigNumber{
 	font-weight: bold;
 	font-size: larger;
Index: lams_tool_daco/web/includes/javascript/dacoLearning.js
===================================================================
diff -u -rf0769c3a0dcf5d87ba30a8026c27271d88fdd7a6 -rb99c1a3c6fbea3d9a4190f69b95381f14561ffe1
--- lams_tool_daco/web/includes/javascript/dacoLearning.js	(.../dacoLearning.js)	(revision f0769c3a0dcf5d87ba30a8026c27271d88fdd7a6)
+++ lams_tool_daco/web/includes/javascript/dacoLearning.js	(.../dacoLearning.js)	(revision b99c1a3c6fbea3d9a4190f69b95381f14561ffe1)
@@ -18,11 +18,52 @@
 		$('.btn-disable-on-submit').prop('disabled', true);
 		document.location.href=continueReflectUrl;
 	}
+
+	function getFile(errorId) {
+		var arr = errorId.split('-');
+		if ( arr.length > 1 ) {
+			var filenum = arr[1];
+			var fileSelect = document.getElementById('file-'+filenum);
+			if ( fileSelect ) {
+				var files = fileSelect.files;
+				if (files.length > 0) {
+					return files[0];
+				}
+			}
+		}
+		return null;
+	}
 	
 	function saveOrUpdateRecord()	{
-		$('.btn-disable-on-submit').prop('disabled', true);
-		setHiddenFormValues();
-		document.getElementById("recordForm").submit();
+		var valid = true;
+		
+		$('[id^=fileerror-]').each(function(index, element) {
+			console.log(element);
+			var file = getFile(element.id);
+			if ( file ) { 
+				if ( ! validateShowErrorNotExecutable(file, LABEL_NOT_ALLOWED_EXE, false, EXE_STRING, element.id ) || 
+						! validateShowErrorFileSize(file, UPLOAD_FILE_MAX_SIZE, LABEL_MAX_FILE_SIZE, false, element.id) ) {
+					valid = false;
+				}
+			}
+		});
+		$('[id^=imageerror-]').each(function(index, element) {
+			console.log(element);
+			var file = getFile(element.id);
+			if ( file ) { 
+				if ( ! validateShowErrorImageType(file, LABEL_NOT_ALLOWED_FORMAT, false, element.id ) ||
+						! validateShowErrorFileSize(file, UPLOAD_FILE_MAX_SIZE, LABEL_MAX_FILE_SIZE, false, element.id) ) {
+					valid = false;
+				}
+			}
+		});
+		
+		if ( valid ) {
+			$('.btn-disable-on-submit').prop('disabled', true);
+			setHiddenFormValues();
+			document.getElementById("recordForm").submit();
+		}
+		return valid;
 	}
 	
 	function setHiddenFormValues(){
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
diff -u -rf0769c3a0dcf5d87ba30a8026c27271d88fdd7a6 -rb99c1a3c6fbea3d9a4190f69b95381f14561ffe1
--- lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision f0769c3a0dcf5d87ba30a8026c27271d88fdd7a6)
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision b99c1a3c6fbea3d9a4190f69b95381f14561ffe1)
@@ -159,15 +159,19 @@
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
-							<html:file styleId="file-${fileNumber+1}" property="file[${fileNumber}]" size="50"/>
+							<lams:FileUpload fileFieldId="file-${fileNumber+1}" fileFieldname="file[${fileNumber}]" 
+								fileInputMessageKey="label.authoring.basic.file" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"
+								fileButtonBrowse="fileButtonBrowse-${fileNumber+1}" fileInputNameFieldname="fileInputName-${fileNumber+1}" errorMsgDiv="fileerror-${fileNumber+1}"/>
 							<c:set var="fileNumber" value="${fileNumber+1}" />
 						</c:when>
-						<c:when test="${question.type==6}"><%-- Image --%>
+						<c:when test="${question.type==6}"><%-- Image --%>  
 							<div class="hint"><fmt:message key="label.learning.image.hint" /></div>
 							<c:if test="${horizontal}">
 								</td><td style="vertical-align: middle;">
 							</c:if>
-							<html:file styleId="file-${fileNumber+1}" property="file[${fileNumber}]" size="50" />
+							<lams:FileUpload fileFieldId="file-${fileNumber+1}" fileFieldname="file[${fileNumber}]" 
+								fileInputMessageKey="label.authoring.basic.image" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"
+								fileButtonBrowse="fileButtonBrowse-${fileNumber+1}" fileInputNameFieldname="fileInputName-${fileNumber+1}" errorMsgDiv="imageerror-${fileNumber+1}"/>
 							<c:set var="fileNumber" value="${fileNumber+1}" />
 						</c:when>
 						<c:when test="${question.type==7}"><%-- Radio buttons  --%>
@@ -246,7 +250,7 @@
 		</table>
 
 		<c:if test="${mode != 'teacher'}">
-			<button onclick="javascript:saveOrUpdateRecord()" class="btn btn-sm btn-default btn-disable-on-submit voffset5 pull-left"><i class="fa fa-plus"></i> <fmt:message key="label.learning.add" /></button>
+			<button type="submit" onclick="return saveOrUpdateRecord();" class="btn btn-sm btn-default btn-disable-on-submit voffset5 pull-left"><i class="fa fa-plus"></i> <fmt:message key="label.learning.add" /></button>
 		</c:if>
 	</html:form>
 </div>
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -rf0769c3a0dcf5d87ba30a8026c27271d88fdd7a6 -rb99c1a3c6fbea3d9a4190f69b95381f14561ffe1
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision f0769c3a0dcf5d87ba30a8026c27271d88fdd7a6)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b99c1a3c6fbea3d9a4190f69b95381f14561ffe1)
@@ -1,12 +1,18 @@
 <!DOCTYPE html>
-        
-
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.daco.DacoConstants"%>
+<%@ 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" scope="request"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE))%></c:set>
+<c:set var="EXE_STRING"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set>
+
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
+	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>		
 	
 	<c:if test="${not empty param.sessionMapID}">
 		<c:set var="sessionMapID" value="${param.sessionMapID}" />
@@ -37,6 +43,18 @@
 	 	var finishUrl = '<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&displayedRecordNumber=${displayedRecordNumber}"/>';
 	 	var continueReflectUrl = '<c:url value="/learning/startReflection.do?sessionMapID=${sessionMapID}&displayedRecordNumber=${displayedRecordNumber}"/>';
 	 	var refreshQuestionSummariesUrl = '<c:url value="/learning/refreshQuestionSummaries.do"/>';
+		var UPLOAD_FILE_MAX_SIZE = '${UPLOAD_FILE_MAX_SIZE}';
+	 	var EXE_STRING = '${EXE_STRING}';
+	 	
+		<fmt:message key="errors.maxfilesize" var="LABEL_MAX_FILE_SIZE_VAR"><param>{0}</param></fmt:message>
+		var LABEL_MAX_FILE_SIZE = '<c:out value="${LABEL_MAX_FILE_SIZE_VAR}" />';
+		
+		<fmt:message key="error.attachment.executable" var="LABEL_NOT_ALLOWED_EXE_VAR"/>
+		var LABEL_NOT_ALLOWED_EXE = '<c:out value="${LABEL_NOT_ALLOWED_EXE_VAR}" />';	
+
+		<fmt:message key="error.attachment.must.be.image" var="LABEL_NOT_ALLOWED_FORMAT_VAR"/>
+		var LABEL_NOT_ALLOWED_FORMAT = '<c:out value="${LABEL_NOT_ALLOWED_FORMAT_VAR}" />';	
+
     </script>
     <script type="text/javascript" src="<html:rewrite page='/includes/javascript/dacoLearning.js'/>"></script>
 </lams:head>