Index: lams_admin/web/WEB-INF/tags/FileUpload.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Attic/FileUpload.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_admin/web/WEB-INF/tags/FileUpload.tag	27 Feb 2017 09:58:10 -0000	1.1.2.1
+++ lams_admin/web/WEB-INF/tags/FileUpload.tag	1 Mar 2017 12:09:14 -0000	1.1.2.2
@@ -3,17 +3,34 @@
 <%@ 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>
@@ -30,25 +47,36 @@
 	<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>
+<c:if test="${uploadInfoMessageKey ne '-'}">
 <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>			
+</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('${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_gradebook/web/WEB-INF/tags/FileUpload.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/Attic/FileUpload.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_gradebook/web/WEB-INF/tags/FileUpload.tag	27 Feb 2017 09:58:42 -0000	1.1.2.1
+++ lams_gradebook/web/WEB-INF/tags/FileUpload.tag	1 Mar 2017 12:18:57 -0000	1.1.2.2
@@ -3,17 +3,34 @@
 <%@ 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>
@@ -30,25 +47,36 @@
 	<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>
+<c:if test="${uploadInfoMessageKey ne '-'}">
 <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>			
+</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('${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_learning/web/WEB-INF/tags/FileUpload.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/FileUpload.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_learning/web/WEB-INF/tags/FileUpload.tag	27 Feb 2017 09:58:20 -0000	1.1.2.1
+++ lams_learning/web/WEB-INF/tags/FileUpload.tag	1 Mar 2017 12:18:59 -0000	1.1.2.2
@@ -3,17 +3,34 @@
 <%@ 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>
@@ -30,25 +47,36 @@
 	<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>
+<c:if test="${uploadInfoMessageKey ne '-'}">
 <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>			
+</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('${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_monitoring/web/WEB-INF/tags/FileUpload.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/FileUpload.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_monitoring/web/WEB-INF/tags/FileUpload.tag	27 Feb 2017 09:58:35 -0000	1.1.2.1
+++ lams_monitoring/web/WEB-INF/tags/FileUpload.tag	1 Mar 2017 12:18:58 -0000	1.1.2.2
@@ -3,17 +3,34 @@
 <%@ 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>
@@ -30,25 +47,36 @@
 	<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>
+<c:if test="${uploadInfoMessageKey ne '-'}">
 <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>			
+</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('${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(/^.*\\/, "");
 	});