Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra134c46269a178953fd900aa428cfc77c1a0e008 -r297ca6b046fae0561e4ba95ddf1b6d5d810218f8
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a134c46269a178953fd900aa428cfc77c1a0e008)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 297ca6b046fae0561e4ba95ddf1b6d5d810218f8)
@@ -240,7 +240,7 @@
 authoring.title.import  =Import questions
 authoring.import.instruction  =Please choose questions to import.
 button.select.importfile  =Select file to import
-msg.import.file.format  =The import file must be .xml file exported from assessment tool.
+msg.import.file.format  =The import file must be .xml file exported from assessment tool and not exceed size of {0}
 error.import.file.format  =The import file is not an .xml file.
 label.import.file  =Import xml file
 button.import  =Import
@@ -297,6 +297,6 @@
 label.waiting.for.leader.launch.time.limit  =Leader has not started the activity. Please wait until he/she commences it.
 label.waiting.for.leader.finish  =Time limit set by teacher is over. Please wait until a group leader finishes the activity.
 warn.mark.hedging.wrong.justification  =Justification cannot be left blank
-
-
+label.file=File
+errors.maxfilesize=File exceeds maximum file size {0}
 #======= End labels: Exported 290 labels for en AU =====
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r19b542142aa60e2410055b83faecc18681909af4 -r297ca6b046fae0561e4ba95ddf1b6d5d810218f8
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 19b542142aa60e2410055b83faecc18681909af4)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 297ca6b046fae0561e4ba95ddf1b6d5d810218f8)
@@ -240,7 +240,8 @@
 authoring.title.import  =Import questions
 authoring.import.instruction  =Please choose questions to import.
 button.select.importfile  =Select file to import
-msg.import.file.format  =The import file must be .xml file exported from assessment tool.
+msg.import.file.format  =The import file must be .xml file exported from assessment tool and not exceed size of {0}
+error.import.file.format  =The import file is not an .xml file.
 label.import.file  =Import xml file
 button.import  =Import
 label.authoring.basic.import.questions  =Import
@@ -296,6 +297,6 @@
 label.waiting.for.leader.launch.time.limit  =Leader has not started the activity. Please wait until he/she commences it.
 label.waiting.for.leader.finish  =Time limit set by teacher is over. Please wait until a group leader finishes the activity.
 warn.mark.hedging.wrong.justification  =Justification cannot be left blank
-
-
+label.file=File
+errors.maxfilesize=File exceeds maximum file size {0}
 #======= End labels: Exported 290 labels for en AU =====
Index: lams_tool_assessment/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u -ra134c46269a178953fd900aa428cfc77c1a0e008 -r297ca6b046fae0561e4ba95ddf1b6d5d810218f8
--- lams_tool_assessment/web/WEB-INF/tags/FileUpload.tag	(.../FileUpload.tag)	(revision a134c46269a178953fd900aa428cfc77c1a0e008)
+++ lams_tool_assessment/web/WEB-INF/tags/FileUpload.tag	(.../FileUpload.tag)	(revision 297ca6b046fae0561e4ba95ddf1b6d5d810218f8)
@@ -3,17 +3,34 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
+<%-- Usually fileFieldname and fileFieldId are the same, but DACO needs them to be different.
+ If they can be the same, set  fileFieldname and  fileFieldId will be set to the same. 
+ If you need them different, then define both. 
+ If you define neither, fileFieldname = fileFieldId = "fileSelector" --%>
 <%@ attribute name="fileFieldname" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileFieldId" required="false" rtexprvalue="true"%>
+
 <%@ attribute name="fileInputNameFieldname" required="false" rtexprvalue="true"%>
 <%@ attribute name="fileInputMessageKey" required="false" rtexprvalue="true"%>
+
+<%-- Set uploadInfoMessageKey to '-' to NOT show the "not exe and max file size" type message. Leave it blank for the default key  label.upload.info --%>
 <%@ attribute name="uploadInfoMessageKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="maxFileSize" required="true" rtexprvalue="true"%> 
 <%@ attribute name="tabindex" required="false" rtexprvalue="true"%>
+
+<%-- Only set if you have more than one file field on the screen (such as DACO) --%>			
+<%@ attribute name="errorMsgDiv" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileButtonBrowse" required="false" rtexprvalue="true"%>
+
 			
 <c:if test="${empty fileFieldname}">
 	<c:set var="fileFieldname" value="fileSelector" />
 </c:if>
 
+<c:if test="${empty fileFieldId}">
+	<c:set var="fileFieldId" value="${fileFieldname}" />
+</c:if>
+
 <c:if test="${empty fileInputNameFieldname}">
 	<c:set var="fileInputNameFieldname" value="fileInputName" />
 </c:if>
@@ -30,25 +47,36 @@
 	<c:set var="tabindexString" value="tabindex='${tabindex}'" />
 </c:if>
 
+<c:if test="${empty errorMsgDiv}">
+	<c:set var="errorMsgDiv" value="file-error-msg" />
+</c:if>
+
+<c:if test="${empty fileButtonBrowse}">
+	<c:set var="fileButtonBrowse" value="fileButtonBrowse" />
+</c:if>
+
+
 <div class="input-group" id="addfile">
 	<span class="input-group-btn" style="font-size:inherit"> <%-- font-size:inherit needed for Share Resources authoring or the button is too small --%>
-		<button id="fileButtonBrowse" ${tabindexString} type="button" class="btn btn-default">
+		<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-default">
 			<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
 		</button>
 	</span>
-	<input type="file" id="${fileFieldname}" name="${fileFieldname}" style="display:none" class="fileUpload"> 
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" style="display:none" class="fileUpload"> 
 	<input type="text" id="${fileInputNameFieldname}" style="display:none" disabled="disabled" placeholder="File not selected" class="form-control file-input-name">
 </div>
+<c:if test="${uploadInfoMessageKey ne '-'}">
 <p class="help-block"><fmt:message key="${uploadInfoMessageKey}"><fmt:param>${maxFileSize}</fmt:param></fmt:message></p>					
-<div id="file-error-msg" class="text-danger" style="display:none"></div>			
+</c:if>
+<div id="${errorMsgDiv}" class="text-danger" style="display:none"></div>			
 
 <script type="text/javascript">
 	// Fake file upload
-	document.getElementById('fileButtonBrowse').addEventListener('click', function() {
-		document.getElementById('${fileFieldname}').click();
+	document.getElementById('${fileButtonBrowse}').addEventListener('click', function() {
+		document.getElementById('${fileFieldId}').click();
 	});
 	
-	document.getElementById('${fileFieldname}').addEventListener('change', function() {
+	document.getElementById('${fileFieldId}').addEventListener('change', function() {
 		$('#${fileInputNameFieldname}').show();
 		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
 	});
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -r39e99fe2098aa97d2395120e1ff22b290ec94766 -r297ca6b046fae0561e4ba95ddf1b6d5d810218f8
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 39e99fe2098aa97d2395120e1ff22b290ec94766)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 297ca6b046fae0561e4ba95ddf1b6d5d810218f8)
@@ -133,7 +133,7 @@
 	
     function importQTI(){
     	window.open('<lams:LAMSURL/>questions/questionFile.jsp',
-    			    'QuestionFile','width=500,height=200,scrollbars=yes');
+    			    'QuestionFile','width=500,height=240,scrollbars=yes');
     }
 	
     function saveQTI(formHTML, formName) {
Index: lams_tool_assessment/web/pages/authoring/importQuestions.jsp
===================================================================
diff -u -r91ec1f038d10b366f0126cc111ba7759bc3de9ec -r297ca6b046fae0561e4ba95ddf1b6d5d810218f8
--- lams_tool_assessment/web/pages/authoring/importQuestions.jsp	(.../importQuestions.jsp)	(revision 91ec1f038d10b366f0126cc111ba7759bc3de9ec)
+++ lams_tool_assessment/web/pages/authoring/importQuestions.jsp	(.../importQuestions.jsp)	(revision 297ca6b046fae0561e4ba95ddf1b6d5d810218f8)
@@ -1,47 +1,62 @@
-<%@ page language="java"  pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %>
+<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
+<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set>
+<c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set>
 
-<!DOCTYPE html>
 <lams:html>
 <lams:head>
 	<title><fmt:message key="authoring.title.import" /></title>
 	<%@ include file="/common/header.jsp"%>
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/upload.js"></script>
 	<script type="text/javascript">
 		function closeWin() {
 			window.close();
 		}
-			
+
+		function isXML(filename) {
+			var extname = filename.substr((~-filename.lastIndexOf(".") >>> 0) + 2);
+			if ( extname.length > 0 ) {
+				extname = extname.toUpperCase();
+				extname = "." + extname;
+				return '.XML' === extname;
+			}
+			return false;
+		}
+		
 		function verifyAndSubmit() {
-			var filename = document.getElementById("UPLOAD_FILE").value;
-			if (filename.length == 0) {
-				var msg = "<fmt:message key="button.select.importfile"/>";
-				alert(msg);
-				return (false);
+			var fileSelect = document.getElementById('UPLOAD_FILE');
+			var files = fileSelect.files;
+			if (files.length == 0) {
+				clearFileError();
+				showFileError('<fmt:message key="button.select.importfile"/>');
+				return;
 			} else {
-				if ( filename ) {
-					var msg = '<fmt:message key="error.import.file.format"/>';
-					var extname = filename.substr((~-filename.lastIndexOf(".") >>> 0) + 2);
-					if ( extname.length == 0) {
-						alert(msg);
-						return (false);
-					} else {
-						extname = extname.toUpperCase();
-						if ( "XML" != extname) {
-							alert(msg);
-							return (false);
-						}
-					}
+				var file = files[0];
+				clearFileError();
+				if  ( ! isXML(file.name) ) {
+					showFileError('<fmt:message key="error.import.file.format"/>');
+					return;
+				} 
+				if ( ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<fmt:message key="errors.maxfilesize"/>') ) {
+					return;
 				}
-				
 			}
+
+			document.getElementById('itemAttachment_Busy').style.display = '';
 			var options = { 
-	    	   	target:  parent.jQuery('#questionListArea'), 
-	    	   	success: afterRatingSubmit  // post-submit callback
+		    	   	target:  parent.jQuery('#questionListArea'), 
+		    	   	success: afterRatingSubmit  // post-submit callback
 	    	}; 							
-    		$('#importForm').ajaxSubmit(options);
+	    	$('#importForm').ajaxSubmit(options);
+
 		}
+
 		// post-submit callback 
    		function afterRatingSubmit(responseText, statusText) { 
    			self.parent.refreshThickbox();
@@ -62,22 +77,20 @@
 			
 		<div class="panel-body">
 				
-			<p>
-				<fmt:message key="msg.import.file.format"/>
-			</p>
-				
 			<form action="<c:url value="/authoring/importQuestions.do"/>?sessionMapID=${sessionMapID}" method="post" enctype="multipart/form-data" id="importForm">	
-				<input type="file" name="UPLOAD_FILE" id="UPLOAD_FILE"/>
-						
-				<div class="voffset10" id="buttonsDiv">
+				<lams:FileUpload fileFieldname="UPLOAD_FILE" fileInputMessageKey="label.file" 
+					uploadInfoMessageKey="msg.import.file.format" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
+				<lams:WaitingSpinner id="itemAttachment_Busy"/>
+			
+				<div class="pull-right voffset10" id="buttonsDiv">
 					<input class="btn btn-sm btn-default" value='<fmt:message key="label.authoring.cancel.button"/>' type="button"
 						onClick="javascript:self.parent.tb_remove();" />
 					<a href="#nogo" class="btn btn-sm btn-primary" onclick="javascript:verifyAndSubmit();">
 						<i class="fa fa-sm fa-upload"></i>&nbsp;<fmt:message key="button.import" />
 					</a>
 				</div>
 			</form>
-
+			
 		</div>
 		<!--closes content-->