Index: lams_admin/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_gradebook/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_gradebook/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_gradebook/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_learning/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_monitoring/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_monitoring/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_monitoring/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_assessment/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_chat/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_daco/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_doku/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_forum/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_gmap/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_images/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_imscc/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_lamc/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_laqa/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_larsrc/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_leader/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_mindmap/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_nb/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_notebook/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_pixlr/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_preview/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_preview/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_sbmt/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_scratchie/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_scribe/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_survey/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_task/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_vote/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_whiteboard/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_whiteboard/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_whiteboard/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_wiki/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_tool_zoom/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_tool_zoom/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_tool_zoom/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
Index: lams_www/web/WEB-INF/tags/FileUpload5.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/FileUpload5.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/FileUpload5.tag	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -0,0 +1,82 @@
+<%@ 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="d-inline">
+	<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-outline-secondary">
+		<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+	</button>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" class="fileUpload d-none"> 
+	<input type="text" id="${fileInputNameFieldname}" disabled="disabled" placeholder="File not selected" class="form-control d-none input-sm w-25 ms-1">
+</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}').removeClass('d-none').addClass("d-inline");
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r6a7abdf7fa2c5646e736550302dcc376397cd645
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6a7abdf7fa2c5646e736550302dcc376397cd645)
@@ -368,6 +368,10 @@
 	    <name>Alert5</name>
 		<path>/WEB-INF/tags/Alert5.tag</path>
    	</tag-file>  
+   	<tag-file>
+       <name>FileUpload5</name>
+       <path>/WEB-INF/tags/FileUpload5.tag</path>
+   	</tag-file>
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>