Index: lams_central/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u -r81d7a938d96e090ff24c1bc662481cacc30f2f7a -re6583c4c5d7e77ce169fec274887e0ef2d107958
--- lams_central/web/WEB-INF/tags/FileUpload.tag	(.../FileUpload.tag)	(revision 81d7a938d96e090ff24c1bc662481cacc30f2f7a)
+++ lams_central/web/WEB-INF/tags/FileUpload.tag	(.../FileUpload.tag)	(revision e6583c4c5d7e77ce169fec274887e0ef2d107958)
@@ -3,17 +3,32 @@
 <%@ 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>
@@ -30,25 +45,34 @@
 	<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">
+		<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="${fileFieldname}" name="${fileFieldname}" style="display:none" class="fileUpload"> 
+	<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="file-error-msg" class="text-danger" style="display:none"></div>			
+<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('${fileFieldname}').click();
+	document.getElementById('${fileButtonBrowse}').addEventListener('click', function() {
+		document.getElementById('${fileFieldId}').click();
 	});
 	
-	document.getElementById('${fileFieldname}').addEventListener('change', function() {
+	document.getElementById('${fileFieldId}').addEventListener('change', function() {
 		$('#${fileInputNameFieldname}').show();
 		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
 	});
Index: lams_central/web/includes/javascript/upload.js
===================================================================
diff -u -r81d7a938d96e090ff24c1bc662481cacc30f2f7a -re6583c4c5d7e77ce169fec274887e0ef2d107958
--- lams_central/web/includes/javascript/upload.js	(.../upload.js)	(revision 81d7a938d96e090ff24c1bc662481cacc30f2f7a)
+++ lams_central/web/includes/javascript/upload.js	(.../upload.js)	(revision e6583c4c5d7e77ce169fec274887e0ef2d107958)
@@ -1,10 +1,10 @@
 // LAMS Helper methods to validate file upload
 
 // returns true if not an executable, shows error message if not valid
-function validateShowErrorNotExecutable(file, errorMessage, showFilename, exeListStr) {
-	clearFileError();
+function validateShowErrorNotExecutable(file, errorMessage, showFilename, exeListStr, errDivId) {
+	clearFileError(errDivId);
 	if ( ! validateNotExecutable( file, exeListStr) ) {
-		showFileError(showFilename ? filename + ": " + errorMessage: errorMessage);
+		showFileError(showFilename ? file.name + ": " + errorMessage: errorMessage, errDivId);
 		return false;
 	}
 	return true;
@@ -33,11 +33,11 @@
 }
 
 // returns false if not an image type, shows error message if not valid
-function validateShowErrorImageType(file, errorMessage, showFilename, exeTypes) {
+function validateShowErrorImageType(file, errorMessage, showFilename, errDivId) {
     // Check the file type.
-	clearFileError();
+	clearFileError(errDivId);
 	if (file.type != 'image/png' && file.type != 'image/jpg' && file.type != 'image/gif' && file.type != 'image/jpeg' ) {
-		showFileError(showFilename ? file.name + ": " + errorMessage: errorMessage);
+		showFileError(showFilename ? file.value + ": " + errorMessage: errorMessage, errDivId);
 		return false;
 	} 
     return true;
@@ -47,10 +47,10 @@
 // maxSize: maximum size allowed in bytes
 // rawErrorMessage: message text from I18N files. Must contain '{0}' which will be replaced by the size and the units
 //  e.g. 'Uploaded file exceeded maximum size: {0}'
-function validateShowErrorFileSize(file, maxSize, errorMessage, showFilename) {
+function validateShowErrorFileSize(file, maxSize, errorMessage, showFilename, errDivId) {
 	if ( file.size > maxSize ) {
 		var updatedErrorMessage = errorMessage.replace('{0}', formatBytesForMessage(maxSize) )
-		showFileError(showFilename ? file.name + ": " + updatedErrorMessage: updatedErrorMessage);
+		showFileError(showFilename ? file.value + ": " + updatedErrorMessage: updatedErrorMessage, errDivId);
 		return false;
 	} 
 	return true;
@@ -79,13 +79,19 @@
 	return parseFloat(sizeinBytes).toFixed(1) + unit;
 }
 
-function clearFileError() {
-	var errDiv = $("#file-error-msg");
+function clearFileError(errDivId) {
+	if ( ! errDivId || errDivId.length == 0 ) {
+		errDivId = 'file-error-msg';
+	}
+	var errDiv = $('#'+errDivId);
 	errDiv.empty();
 	errDiv.css( "display", "none" );
 }
-function showFileError(error) {
-	var errDiv = $("#file-error-msg");
+function showFileError(error, errDivId) {
+	if ( ! errDivId || errDivId.length == 0 ) {
+		errDivId = 'file-error-msg';
+	}
+	var errDiv = $('#'+errDivId);
 	if ( errDiv.size() > 0 ) {
 		errDiv.append(error);
 		errDiv.css( "display", "block" );