Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re63e2792149fe13694cbdf273d181cc8e5694565 -r9d32ea79b82981feef6c0b1c098101827d734c87
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e63e2792149fe13694cbdf273d181cc8e5694565)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9d32ea79b82981feef6c0b1c098101827d734c87)
@@ -737,6 +737,9 @@
 tour.lesson.remove.content  =Remove the lesson completely. This is permanent - it cannot be undone.
 tour.end.title  =End Of Tour
 tour.end.content  =Thank you for taking the tour. To restart the tour, click the Tour button again.
+errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
+error.attachment.executable  =Uploaded file is executable
+label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
+label.file=File
 
-
 #======= End labels: Exported 731 labels for en AU =====
Index: lams_central/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u -re6583c4c5d7e77ce169fec274887e0ef2d107958 -r9d32ea79b82981feef6c0b1c098101827d734c87
--- lams_central/web/WEB-INF/tags/FileUpload.tag	(.../FileUpload.tag)	(revision e6583c4c5d7e77ce169fec274887e0ef2d107958)
+++ lams_central/web/WEB-INF/tags/FileUpload.tag	(.../FileUpload.tag)	(revision 9d32ea79b82981feef6c0b1c098101827d734c87)
@@ -12,6 +12,8 @@
 
 <%@ 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"%>
@@ -63,7 +65,9 @@
 	<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>					
+</c:if>
 <div id="${errorMsgDiv}" class="text-danger" style="display:none"></div>			
 
 <script type="text/javascript">
Index: lams_central/web/questions/questionFile.jsp
===================================================================
diff -u -r18f003f2d251e6a970f9ca228553abfc6146dd21 -r9d32ea79b82981feef6c0b1c098101827d734c87
--- lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 18f003f2d251e6a970f9ca228553abfc6146dd21)
+++ lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 9d32ea79b82981feef6c0b1c098101827d734c87)
@@ -1,10 +1,15 @@
 <!DOCTYPE html>
-
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ 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>
 
 <lams:html>
 <lams:head>
@@ -17,23 +22,33 @@
 	margin-left: 10px;
 }
 
-#buttonsDiv {
-	padding: 15px 0px 15px 0px;
-}
-
 div#errorArea {
 	display: none;
 }
 </style>
 
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="/lams/includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="/lams/includes/javascript/upload.js"></script>
+
 	<script type="text/javascript">
-		$(document).ready(function() {
-			if ($.trim($('#errorArea').html()) != "") {
-				window.resizeTo(600, 350);
-				$('#errorArea').show();
+		function verifyAndSubmit() {
+			var fileSelect = document.getElementById('file');
+			var files = fileSelect.files;
+				if (files.length == 0) {
+				clearFileError();
+				showFileError('<fmt:message key="button.select.importfile"/>');
+				return false;
+			} else {
+				var file = files[0];
+				if ( ! validateShowErrorNotExecutable(file, '<fmt:message key="error.attachment.executable"/>', false, '${EXE_FILE_TYPES}')
+						 || ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<fmt:message key="errors.maxfilesize"/>') ) {
+					return false;
+				}
 			}
-		});
+
+			document.getElementById('itemAttachment_Busy').style.display = '';
+			return true;
+		}
 	</script>
 </lams:head>
 
@@ -43,28 +58,28 @@
 		<fmt:message key="label.questions.file.title" />
 	</c:set>
 	<lams:Page type="admin" title="${title}">
-		<div id="content">
 
-			<lams:Alert id="errorArea" type="danger" close="false">
-				<html:messages id="error">
-					<c:out value="${error}" escapeXml="false" />
-					<br />
-				</html:messages>
-			</lams:Alert>
+			<logic:messagesPresent>
+				<lams:Alert id="errorMessages" type="danger" close="false">
+				        <html:messages id="error">
+				            <c:out value="${error}" escapeXml="false"/><br/>
+				        </html:messages>
+				</lams:Alert>
+			</logic:messagesPresent>
 
-			<form id="questionForm" action="<lams:LAMSURL/>questions.do" enctype="multipart/form-data" method="post">
-				<input type="hidden" name="returnURL" value="${empty param.returnURL ? returnURL : param.returnURL}" /> <input
-					type="hidden" name="limitType" value="${empty param.limitType ? limitType : param.limitType}" /> <input
-					type="file" name="file" size="53" />
-				<div class="voffset10" id="buttonsDiv">
+			<form id="questionForm" action="<lams:LAMSURL/>questions.do" enctype="multipart/form-data" method="post" onsubmit="return verifyAndSubmit();">
+				<input type="hidden" name="returnURL" value="${empty param.returnURL ? returnURL : param.returnURL}" /> 
+				<input type="hidden" name="limitType" value="${empty param.limitType ? limitType : param.limitType}" /> 
+				<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.file" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
+				<lams:WaitingSpinner id="itemAttachment_Busy"/>
+				<div class="pull-right voffset5" id="buttonsDiv">
 					<input class="btn btn-sm btn-default" value='<fmt:message key="button.cancel"/>' type="button"
 						onClick="javascript:window.close()" />
 					<button class="btn btn-sm btn-primary" value='<fmt:message key="label.upload"/>' type="submit">
-						<i class="fa fa-sm fa-upload"></i>&nbsp;<fmt:message key="button.import" />
+						<fmt:message key="button.import" />
 					</button>
 				</div>
 			</form>
-
 			<div id="footer"></div>
 	</lams:Page>
 </body>
Index: lams_central/web/toolcontent/import.jsp
===================================================================
diff -u -r5725c3e52ad6b3767aa82f1c6be5769f115041aa -r9d32ea79b82981feef6c0b1c098101827d734c87
--- lams_central/web/toolcontent/import.jsp	(.../import.jsp)	(revision 5725c3e52ad6b3767aa82f1c6be5769f115041aa)
+++ lams_central/web/toolcontent/import.jsp	(.../import.jsp)	(revision 9d32ea79b82981feef6c0b1c098101827d734c87)
@@ -1,28 +1,45 @@
-<%@ page language="java"  pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<!DOCTYPE html>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ 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="title.import" /></title>
 		
 		<lams:css />
 		
+		<script type="text/javascript" src="/lams/includes/javascript/jquery.js"></script>
+ 		<script type="text/javascript" src="/lams/includes/javascript/upload.js"></script>
+ 	
 		<script type="text/javascript">
 			function closeWin(){
 				window.close();
 			}
 			
 			function verifyAndSubmit() {
-				if (document.getElementById("UPLOAD_FILE").value.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 false;
 				} else {
-					document.getElementById('importForm').submit();
+					var file = files[0];
+					if ( ! validateShowErrorNotExecutable(file, '<fmt:message key="error.attachment.executable"/>', false, '${EXE_FILE_TYPES}')
+							 || ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<fmt:message key="errors.maxfilesize"/>') ) {
+						return false;
+					}
 				}
+
+ 				document.getElementById('itemAttachment_Busy').style.display = '';
+				document.getElementById('importForm').submit();
 			}
 			
 		</script>
@@ -40,13 +57,17 @@
 				</div>
 
 				<form action="<c:url value="/authoring/importToolContent.do"/>" method="post" enctype="multipart/form-data" id="importForm">
-					<p>
+					<div>
 						<label for="UPLOAD_FILE"><fmt:message key="label.ld.zip.file" /></label>
 						<input type="hidden" name="customCSV" id="customCSV" value="${customCSV}" />
-						<input type="file" name="UPLOAD_FILE" id="UPLOAD_FILE"/>
-						<a href="javascript:;" class="btn btn-primary pull-right voffset10" onclick="verifyAndSubmit();"><fmt:message key="button.import" /> 
-						&nbsp;<i class="fa fa-sm fa-upload"></i></a>
-					</p>
+					</div>
+					
+ 					<lams:FileUpload fileFieldname="UPLOAD_FILE" fileInputMessageKey="label.file" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
+					<lams:WaitingSpinner id="itemAttachment_Busy"/>
+
+					<div class="pull-right voffset10">
+ 						<a href="javascript:;" class="btn btn-primary" onclick="javascript:verifyAndSubmit();"><fmt:message key="button.import" /></a>
+ 					</div>
 				</form>
 
 			</div>
