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>
