Index: lams_tool_pixlr/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r3b4e8ba4dc2194067463880c844cc07f01a76547 -r3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b
--- lams_tool_pixlr/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3b4e8ba4dc2194067463880c844cc07f01a76547)
+++ lams_tool_pixlr/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b)
@@ -104,6 +104,8 @@
 message.no.reflection.available  =No notebook entry has been added.
 label.image.options  =Image options
 label.activity.completion  =End of activity
+errors.maxfilesize  =Uploaded file exceeded maximum size of {0}
+label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
 
 
 #======= End labels: Exported 98 labels for en AU =====
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rb5ab72c783a98abeb08431bafb067ad4b9edf1df -r3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b5ab72c783a98abeb08431bafb067ad4b9edf1df)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b)
@@ -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_pixlr/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/FileUpload.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/FileUpload.tag	(revision 3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b)
@@ -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_pixlr/web/WEB-INF/tags/WaitingSpinner.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/WaitingSpinner.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/WaitingSpinner.tag	(revision 3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b)
@@ -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_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r1f99d03199a3995cfffe0cb1536c08f0220e88b0 -r3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1f99d03199a3995cfffe0cb1536c08f0220e88b0)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b)
@@ -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_pixlr/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4 -r3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b
--- lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
+++ lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b)
@@ -1,7 +1,32 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.pixlr.util.PixlrConstants"%>
+<%@ 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_LARGE_MAX_SIZE" scope="request"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
+<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING" scope="request"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set>
 
-<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
+<script type="text/javascript">
+	function validate() {
+		// Get the selected files from the input.
+		var files = document.getElementById('file').files;
+		if (files.length == 0) {
+			clearFileError();
+			showFileError('<fmt:message key="error.resource.item.file.blank"/>');
+			return false;
+		}
+		var file = files[0];
+		if ( validateShowErrorImageType(file, '<fmt:message key="error.resource.image.not.alowed.format"/>', false) 
+					&& validateShowErrorFileSize(file, ${UPLOAD_FILE_LARGE_MAX_SIZE}, '<fmt:message key="errors.maxfilesize"><param>{0}</param></fmt:message>', false) ) {
+			document.getElementById("imageAttachmentDiv_Busy").style.display = '';
+			return true;
+		} else {
+			return false;
+		}		
+	}
+</script>	
+
+<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data" onsubmit="return validate();">
 	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
 	<c:set var="defineLater" value="no" />
Index: lams_tool_pixlr/web/pages/authoring/basic.jsp
===================================================================
diff -u -r7c09c69c0428d1566f8797675855ae20643fede8 -r3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b
--- lams_tool_pixlr/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7c09c69c0428d1566f8797675855ae20643fede8)
+++ lams_tool_pixlr/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b)
@@ -50,10 +50,11 @@
 					</div>
 				</c:when>
 				<c:otherwise>
-					<label for="file">
-				    	<fmt:message key="label.authoring.basic.add.image"/>
-				    </label>
-					<input type="file" name="file" />
+				    <lams:FileUpload fileFieldname="file" fileInputMessageKey="label.authoring.basic.add.image" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
 				</c:otherwise>
 			</c:choose>
 </div>
+
+
+<lams:WaitingSpinner id="imageAttachmentDiv_Busy"/>
+
Index: lams_tool_pixlr/web/pages/authoring/headItems.jsp
===================================================================
diff -u -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4 -r3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b
--- lams_tool_pixlr/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
+++ lams_tool_pixlr/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 3765e0fe6f3b1bfa7c071328c3c1bd1673c0fe9b)
@@ -8,3 +8,4 @@
 
 <script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
 <script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>