Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2062745d4734a2543b83d689762d932d7dcbc0db -r5a724cb4b6c1d9ac1c533e5128b37d00143f1f85
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2062745d4734a2543b83d689762d932d7dcbc0db)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5a724cb4b6c1d9ac1c533e5128b37d00143f1f85)
@@ -95,7 +95,7 @@
 admin.user.actions  =Actions
 admin.user.import  =Import users
 admin.list.disabled.users  =List disabled accounts
-label.excel.spreadsheet  =Upload spreadsheet
+label.excel.spreadsheet  =File
 label.spreadsheet  =spreadsheet
 label.download.template  =Download the template
 role.AUTHOR  =Author
@@ -528,6 +528,8 @@
 admin.user.changePassword  =Change password
 config.show.timezone.warning  =Show warning when user's LAMS timezone does not match their computer/device.
 label.password.must.lcase  =at least 1 lower case letter
-
-
+button.select.importfile  =Select file to import
+label.upload.info  =Uploaded file must be an Excel file and not exceed size of {0}
+errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
+error.attachment.not.xls  =File is not an Excel .xls file.
 #======= End labels: Exported 527 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20 -r5a724cb4b6c1d9ac1c533e5128b37d00143f1f85
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5a724cb4b6c1d9ac1c533e5128b37d00143f1f85)
@@ -95,7 +95,7 @@
 admin.user.actions  =Actions
 admin.user.import  =Import users
 admin.list.disabled.users  =List disabled accounts
-label.excel.spreadsheet  =Upload spreadsheet
+label.excel.spreadsheet  =File
 label.spreadsheet  =spreadsheet
 label.download.template  =Download the template
 role.AUTHOR  =Author
Index: lams_admin/web/import/importGroups.jsp
===================================================================
diff -u -rb37f7b42698f0aa6bd5b346a8e9bb4085964c0a7 -r5a724cb4b6c1d9ac1c533e5128b37d00143f1f85
--- lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision b37f7b42698f0aa6bd5b346a8e9bb4085964c0a7)
+++ lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 5a724cb4b6c1d9ac1c533e5128b37d00143f1f85)
@@ -2,22 +2,43 @@
 <%@ page import="org.lamsfoundation.lams.admin.service.IImportService" %>
 <%@ page import="java.util.List" %>
 <%@ page import="org.lamsfoundation.lams.usermanagement.OrganisationType" %>
+<%@ page import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> 
 
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/prototype.js"></script>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<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> 
+
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
+ 
 <script language="javascript" type="text/JavaScript">
-function loading(){
-	document.getElementById('loading').style.display="";
-	document.getElementById('main-page').style.display="none";
-}
-</script>
+	
+	function verifyAndSubmit() {
+		if ( "undefined" === typeof bCancel || ! bCancel ) {
+			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 ( ! validateShowErrorSpreadsheetType(file, '<fmt:message key="error.attachment.not.xls"/>', false)
+						 || ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<fmt:message key="errors.maxfilesize"/>') ) {
+					return false;
+				}
+			}
+		document.getElementById('fileUpload_Busy').style.display = '';
+		}
+	}
+ </script>
 
 <p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<div id="loading" style="display:none">
-	<h4><fmt:message key="msg.please.wait"/></h4>
-	<p class="text-center"><i class="fa fa-refresh fa-spin fa-2x fa-fw"></i></p>
-</div>
-
 <div id="main-page">
 
 <logic:notEmpty name="results">
@@ -68,15 +89,12 @@
 </p>
 <p><fmt:message key="msg.import.conclusion"/></p>
 
-<html:form action="/importgroups.do" method="post" enctype="multipart/form-data" onsubmit="loading();">
+<html:form action="/importgroups.do" method="post" enctype="multipart/form-data" onsubmit="return verifyAndSubmit();">
 <html:hidden property="orgId" />
 
-<table>
-	<tr>
-		<td align="right"><fmt:message key="label.excel.spreadsheet" />:&nbsp;</td>
-		<td><html:file property="file" styleClass="form-control"/></td>
-	</tr>
-</table>
+<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.excel.spreadsheet" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/> 
+	<lams:WaitingSpinner id="fileUpload_Busy"/> 
+
 <div class="pull-right">
 <html:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html:cancel>
 <html:submit styleId="importButton" styleClass="btn btn-primary loffset5"><fmt:message key="label.import"/></html:submit> &nbsp; 	
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -rb4832c8bcb4683af57e8aaad5612e193af6f3ef0 -r5a724cb4b6c1d9ac1c533e5128b37d00143f1f85
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision b4832c8bcb4683af57e8aaad5612e193af6f3ef0)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 5a724cb4b6c1d9ac1c533e5128b37d00143f1f85)
@@ -2,18 +2,46 @@
 <%@ page import="org.lamsfoundation.lams.admin.service.IImportService"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
+<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> 
 
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
 <c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
 <c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
 <c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
 <c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
 <c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
 
+<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> 
+
+
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
+ 
 <script language="javascript" type="text/JavaScript">
+	
 	function goToStatus() {
+		if ( "undefined" === typeof bCancel || ! bCancel ) {
+			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 ( ! validateShowErrorSpreadsheetType(file, '<fmt:message key="error.attachment.not.xls"/>', false)
+						 || ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<fmt:message key="errors.maxfilesize"/>') ) {
+					return false;
+				}
+			}
+			document.getElementById('fileUpload_Busy').style.display = '';
+		}
 		document.location = '<lams:LAMSURL/>/admin/import/status.jsp';
 	}
-</script>
+ </script>
 
 <p>
 	<a href="<lams:LAMSURL/>/admin/sysadminstart.do"
@@ -72,15 +100,12 @@
 </p>
 
 <html:form action="/importexcelsave.do" method="post"
-	enctype="multipart/form-data" onsubmit="goToStatus();">
+	enctype="multipart/form-data" onsubmit="return goToStatus();">
 	<html:hidden property="orgId" />
 
-	<table>
-		<tr>
-			<td align="right"><fmt:message key="label.excel.spreadsheet" />:&nbsp;</td>
-			<td><html:file property="file" styleClass="form-control" /></td>
-		</tr>
-	</table>
+	<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.excel.spreadsheet" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/> 
+	<lams:WaitingSpinner id="fileUpload_Busy"/> 
+
 	<div class="pull-right">
 		<html:cancel styleId="cancelButton" styleClass="btn btn-default">
 			<fmt:message key="admin.cancel" />
Index: lams_admin/web/import/status.jsp
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r5a724cb4b6c1d9ac1c533e5128b37d00143f1f85
--- lams_admin/web/import/status.jsp	(.../status.jsp)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_admin/web/import/status.jsp	(.../status.jsp)	(revision 5a724cb4b6c1d9ac1c533e5128b37d00143f1f85)
@@ -5,36 +5,26 @@
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
-	<html:base/>
 	<lams:css/>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 </lams:head>
 
-<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/prototype.js"></script>
 <script language="javascript" type="text/JavaScript">
 	<% if (SessionManager.getSession().getAttribute("results") != null) { %>
-			document.location = '<lams:LAMSURL/>/admin/importuserresult.do';
+			document.location = '<lams:LAMSURL/>admin/importuserresult.do';
 	<% } %>
+
+	$(document).ready(function(){
+		document.getElementById('fileUpload_Busy').style.display = '';
+	});
+	
 	function refresh() {
-		document.location = '<lams:LAMSURL/>/admin/import/status.jsp';
+		document.location = '<lams:LAMSURL/>admin/import/status.jsp';
 	}
 	window.setInterval("refresh()",5000);
 </script>
 
-<body class="stripes">
-<div id="page">
-	<div id="content">
-		<h2>
-			<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
-			: <fmt:message key="admin.user.import" />
-		</h2>
-
-		<lams:help style="no-tabs" page="<%= IImportService.IMPORT_HELP_PAGE %>"/>
-
-		<p>&nbsp;</p>
-
-		<div align="center">	
-			<h3><fmt:message key="msg.please.wait"/></h3>
-			<p><i class="fa fa-refresh fa-spin fa-3x fa-fw"></i></p>
+<c:set var="progressMessage">
 <%
 	Integer importTotal = (Integer)SessionManager.getSession().getAttribute(IImportService.STATUS_IMPORT_TOTAL);
 	Integer imported = (Integer)SessionManager.getSession().getAttribute(IImportService.STATUS_IMPORTED);
@@ -44,12 +34,22 @@
 		progress = (new Float(percent)).toString();
 		progress = (progress.length() >= 5 ? progress.substring(0,5) : progress);
 	} catch (Exception e) {}
-	if (progress.length()>0) out.println(progress+" % completed...");
+	out.println((progress.length()>0?progress:"0")+"% completed...");
 %>
-		</div>
-		
+</c:set>	
+
+<body class="stripes">
+<c:set var="title"><fmt:message key="admin.user.import" /></c:set>
+<lams:Page type="admin" title="${title}">
+
+	<div align="center">	
+		<h3><fmt:message key="msg.please.wait"/></h3>
+		<p>${progressMessage}</p>
 	</div>
-</div>
+		
+	<lams:WaitingSpinner id="fileUpload_Busy"/> 
+	
+</lams:Page>
 </body>
 
 </lams:html>
\ No newline at end of file