Index: lams_central/web/toolcontent/import.jsp
===================================================================
diff -u -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r37ecd2fb49ed11a7f9e1d6fc4df7a5cad551868b
--- lams_central/web/toolcontent/import.jsp	(.../import.jsp)	(revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_central/web/toolcontent/import.jsp	(.../import.jsp)	(revision 37ecd2fb49ed11a7f9e1d6fc4df7a5cad551868b)
@@ -4,49 +4,119 @@
 <%@ 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>
 <c:set var="ANTIVIRUS_ENABLE"><%=Configuration.get(ConfigurationKeys.ANTIVIRUS_ENABLE)%></c:set>
+<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 
 <lams:html>
 	<lams:head>
 		<title><fmt:message key="title.import" /></title>
 		
 		<lams:css />
+		<link href="/lams/css/uppy.min.css" rel="stylesheet" type="text/css" />
 		
+		<script type="text/javascript" src="/lams/includes/javascript/uppy/uppy.min.js"></script>
+		<c:choose>
+			<c:when test="${language eq 'es'}">
+				<script type="text/javascript" src="/lams/includes/javascript/uppy/es_ES.min.js"></script>
+			</c:when>
+			<c:when test="${language eq 'fr'}">
+				<script type="text/javascript" src="/lams/includes/javascript/uppy/fr_FR.min.js"></script>
+			</c:when>
+			<c:when test="${language eq 'el'}">
+				<script type="text/javascript" src="/lams/includes/javascript/uppy/el_GR.min.js"></script>
+			</c:when>
+		</c:choose>
+		
 		<script type="text/javascript" src="/lams/includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="/lams/includes/javascript/bootstrap.min.js"></script>
- 		<script type="text/javascript" src="/lams/includes/javascript/upload.js"></script>
  	
 		<script type="text/javascript">
+			var LAMS_URL = '<lams:LAMSURL/>',
+		 		UPLOAD_FILE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_MAX_SIZE}"/>',
+				// convert Java syntax to JSON
+		       EXE_FILE_TYPES = JSON.parse("[" + "${EXE_FILE_TYPES}".replace(/\.\w+/g, '"$&"') + "]"),
+		       EXE_FILE_ERROR = '<fmt:message key="error.attachment.executable"/>';
+				
+		       
 			function closeWin(){
 				window.close();
 			}
 			
-			function verifyAndSubmit() {
-				var importButton = $('#importButton');
-				importButton.button('loading');
-				
-				var fileSelect = document.getElementById('UPLOAD_FILE');
-				var files = fileSelect.files;
- 				if (files.length == 0) {
-					clearFileError();
-					showFileError('<fmt:message key="button.select.importfile"/>');
-					importButton.button('reset');
-					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"/>') ) {
-						importButton.button('reset');
-						return false;
-					}
-				}
-
- 				document.getElementById('itemAttachment_Busy').style.display = '';
-				document.getElementById('importForm').submit();
+			/**
+			 * Initialised Uppy as the file upload widget
+			 */
+			function initFileUpload(tmpFileUploadId, language) {
+				  var uppyProperties = {
+					  // upload immediately 
+					  autoProceed: true,
+					  allowMultipleUploads: true,
+					  debug: false,
+					  restrictions: {
+						// taken from LAMS configuration
+					    maxFileSize: +UPLOAD_FILE_MAX_SIZE,
+					    maxNumberOfFiles: 1
+					  },
+					  meta: {
+						  // all uploaded files go to this subdir in LAMS tmp dir
+						  // its format is: upload_<userId>_<timestamp>
+						  'tmpFileUploadId' : tmpFileUploadId,
+						  'largeFilesAllowed' : false
+					  },
+					  locale: {
+					    strings: {
+					    	  'dropPasteImportFiles' : 'Drop files here, paste or %{browseFiles}'
+					    }
+					  },
+					  onBeforeFileAdded: function(currentFile, files) {
+						  var name = currentFile.data.name,
+						  	  extensionIndex = name.lastIndexOf('.'),
+						  	  valid = extensionIndex < 0 || !EXE_FILE_TYPES.includes(name.substring(extensionIndex).trim());
+						  if (!valid) {
+							  uppy.info(EXE_FILE_ERROR, 'error', 10000);
+						  }
+						  
+						  return valid;
+					    }
+				  };
+				  
+				  switch(language) {
+				  	case 'es' : uppyProperties.locale = Uppy.locales.es_ES; break; 
+					case 'fr' : uppyProperties.locale = Uppy.locales.fr_FR; break; 
+					case 'el' : uppyProperties.locale = Uppy.locales.el_GR; break; 
+				  }
+				  
+				  
+				  // global variable
+				  uppy = Uppy.Core(uppyProperties);
+				  // upload using Ajax
+				  uppy.use(Uppy.XHRUpload, {
+					  endpoint: LAMS_URL + 'tmpFileUpload',
+					  fieldName : 'file',
+					  // files are uploaded one by one
+					  limit : 1
+				  });
+				  
+				  uppy.use(Uppy.DragDrop, {
+					  target: '#image-upload-area',
+					  inline: true,
+					  height: 150,
+					  width: '100%'
+					});
+				  
+				  uppy.use(Uppy.StatusBar, {
+					  target: '#image-upload-area',
+					  hideAfterFinish: false,
+					  hideUploadButton: true,
+					  hideRetryButton: true,
+					  hidePauseResumeButton: true,
+					  hideCancelButton: true
+					});
 			}
 			
+			$(document).ready(function(){
+				initFileUpload('${tmpFileUploadId}', '<lams:user property="localeLanguage"/>');
+			});		
 		</script>
 	</lams:head>
 
@@ -67,16 +137,16 @@
 
 				<form action="<c:url value="/authoring/importToolContent.do"/>" method="post" enctype="multipart/form-data" id="importForm">
 					<div>
-						<label for="UPLOAD_FILE"><fmt:message key="label.ld.zip.file" /></label>
+						<label for="image-upload-area"><fmt:message key="label.ld.zip.file" /></label>
 						<input type="hidden" name="customCSV" id="customCSV" value="${customCSV}" />
 					</div>
 					
- 					<lams:FileUpload fileFieldname="UPLOAD_FILE" fileInputMessageKey="label.file" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
-					<lams:WaitingSpinner id="itemAttachment_Busy"/>
-
+					<input type="hidden" id="tmpFileUploadId" name="tmpFileUploadId"
+						   value="${tmpFileUploadId}" />
+					<div id="image-upload-area" class="voffset20"></div>
+		
 					<div class="pull-right voffset10">
- 						<button id="importButton" class="btn btn-primary" onclick="javascript:verifyAndSubmit();"
- 								data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key='button.import' /></span>">
+ 						<button id="importButton" class="btn btn-primary" type="submit">
  							<fmt:message key="button.import" />
  						</button>
  					</div>