Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r19b542142aa60e2410055b83faecc18681909af4 -ra134c46269a178953fd900aa428cfc77c1a0e008
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 19b542142aa60e2410055b83faecc18681909af4)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a134c46269a178953fd900aa428cfc77c1a0e008)
@@ -241,6 +241,7 @@
 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.
+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
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rb5ab72c783a98abeb08431bafb067ad4b9edf1df -ra134c46269a178953fd900aa428cfc77c1a0e008
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b5ab72c783a98abeb08431bafb067ad4b9edf1df)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a134c46269a178953fd900aa428cfc77c1a0e008)
@@ -123,7 +123,7 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleId="saveButton" styleClass="btn btn-primary pull-right">
+		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
Index: lams_tool_assessment/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/FileUpload.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/FileUpload.tag	(revision a134c46269a178953fd900aa428cfc77c1a0e008)
@@ -0,0 +1,56 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%@ attribute name="fileFieldname" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileInputNameFieldname" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileInputMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="uploadInfoMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="maxFileSize" required="true" rtexprvalue="true"%> 
+<%@ attribute name="tabindex" required="false" rtexprvalue="true"%>
+			
+<c:if test="${empty fileFieldname}">
+	<c:set var="fileFieldname" value="fileSelector" />
+</c:if>
+
+<c:if test="${empty fileInputNameFieldname}">
+	<c:set var="fileInputNameFieldname" value="fileInputName" />
+</c:if>
+
+<c:if test="${empty fileInputMessageKey}">
+	<c:set var="fileInputMessageKey" value="label.authoring.basic.resource.file.input" />
+</c:if>
+
+<c:if test="${empty uploadInfoMessageKey}">
+	<c:set var="uploadInfoMessageKey" value="label.upload.info" />
+</c:if>
+
+<c:if test="${not empty tabindex}">
+	<c:set var="tabindexString" value="tabindex='${tabindex}'" />
+</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">
+			<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="text" id="${fileInputNameFieldname}" style="display:none" disabled="disabled" placeholder="File not selected" class="form-control file-input-name">
+</div>
+<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>			
+
+<script type="text/javascript">
+	// Fake file upload
+	document.getElementById('fileButtonBrowse').addEventListener('click', function() {
+		document.getElementById('${fileFieldname}').click();
+	});
+	
+	document.getElementById('${fileFieldname}').addEventListener('change', function() {
+		$('#${fileInputNameFieldname}').show();
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_assessment/web/WEB-INF/tags/WaitingSpinner.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/WaitingSpinner.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/WaitingSpinner.tag	(revision a134c46269a178953fd900aa428cfc77c1a0e008)
@@ -0,0 +1,17 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="showInline" required="false" rtexprvalue="true"%>
+			
+<c:if test="${not empty id}">
+	<c:set var="idString">id="${id}"</c:set>
+</c:if>
+
+<c:choose>
+<c:when test="${showInline}">
+<i class="fa fa-refresh fa-spin fa-fw text-primary" style="display:none" ${idString} /></i>
+</c:when>
+<c:otherwise>
+<div class="text-center" style="display:none" ${idString} ><i class="fa fa-refresh fa-spin fa-2x fa-fw text-primary" /></i></div>
+</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r1f99d03199a3995cfffe0cb1536c08f0220e88b0 -ra134c46269a178953fd900aa428cfc77c1a0e008
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1f99d03199a3995cfffe0cb1536c08f0220e88b0)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision a134c46269a178953fd900aa428cfc77c1a0e008)
@@ -529,5 +529,13 @@
        <name>CommentsAuthor</name>
        <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
+   	<tag-file>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_assessment/web/pages/authoring/importQuestions.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -ra134c46269a178953fd900aa428cfc77c1a0e008
--- lams_tool_assessment/web/pages/authoring/importQuestions.jsp	(.../importQuestions.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/authoring/importQuestions.jsp	(.../importQuestions.jsp)	(revision a134c46269a178953fd900aa428cfc77c1a0e008)
@@ -14,18 +14,34 @@
 		}
 			
 		function verifyAndSubmit() {
-			if (document.getElementById("UPLOAD_FILE").value.length == 0) {
+			debugger;
+			var filename = document.getElementById("UPLOAD_FILE").value;
+			if (filename.length == 0) {
 				var msg = "<fmt:message key="button.select.importfile"/>";
 				alert(msg);
 				return (false);
 			} else {
-    	    	var options = { 
-	    	    	target:  parent.jQuery('#questionListArea'), 
-	    		   	success: afterRatingSubmit  // post-submit callback
-	    		}; 				
-		    		    				
-	    		$('#importForm').ajaxSubmit(options);
+				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 options = { 
+	    	   	target:  parent.jQuery('#questionListArea'), 
+	    	   	success: afterRatingSubmit  // post-submit callback
+	    	}; 							
+    		$('#importForm').ajaxSubmit(options);
 		}
 		// post-submit callback 
    		function afterRatingSubmit(responseText, statusText) { 
@@ -52,16 +68,15 @@
 			</p>
 				
 			<form action="<c:url value="/authoring/importQuestions.do"/>?sessionMapID=${sessionMapID}" method="post" enctype="multipart/form-data" id="importForm">	
-				<div class="form-group">
-				    <label for="UPLOAD_FILE">
-				    	<fmt:message key="label.import.file" />
-				    </label>
-					<input type="file" name="UPLOAD_FILE" id="UPLOAD_FILE"/>
-				</div>
+				<input type="file" name="UPLOAD_FILE" id="UPLOAD_FILE"/>
 						
-				<a href="#nogo" class="btn btn-primary pull-right" onclick="javascript:verifyAndSubmit();">
-					<fmt:message key="button.import" />
-				</a>
+				<div class="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>