Index: lams_tool_imscc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rfe3ef9c904f3491488a8059856bd73abca666168 -r2206a0e278b26581a3a3c7d266e184551367851f
--- lams_tool_imscc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision fe3ef9c904f3491488a8059856bd73abca666168)
+++ lams_tool_imscc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2206a0e278b26581a3a3c7d266e184551367851f)
@@ -131,6 +131,9 @@
 label.monitoring.heading  =Common Cartridge Monitoring
 label.resource.options  =Resource options
 label.activity.completion  =End of activity
+errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
+error.attachment.executable  =Uploaded file is executable
+label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
 
 
 #======= End labels: Exported 125 labels for en AU =====
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rb5ab72c783a98abeb08431bafb067ad4b9edf1df -r2206a0e278b26581a3a3c7d266e184551367851f
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b5ab72c783a98abeb08431bafb067ad4b9edf1df)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 2206a0e278b26581a3a3c7d266e184551367851f)
@@ -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_imscc/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/FileUpload.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/FileUpload.tag	(revision 2206a0e278b26581a3a3c7d266e184551367851f)
@@ -0,0 +1,84 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%-- Usually fileFieldname and fileFieldId are the same, but DACO needs them to be different.
+ If they can be the same, set  fileFieldname and  fileFieldId will be set to the same. 
+ If you need them different, then define both. 
+ If you define neither, fileFieldname = fileFieldId = "fileSelector" --%>
+<%@ attribute name="fileFieldname" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileFieldId" required="false" rtexprvalue="true"%>
+
+<%@ attribute name="fileInputNameFieldname" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileInputMessageKey" required="false" rtexprvalue="true"%>
+
+<%-- Set uploadInfoMessageKey to '-' to NOT show the "not exe and max file size" type message. Leave it blank for the default key  label.upload.info --%>
+<%@ attribute name="uploadInfoMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="maxFileSize" required="true" rtexprvalue="true"%> 
+<%@ attribute name="tabindex" required="false" rtexprvalue="true"%>
+
+<%-- Only set if you have more than one file field on the screen (such as DACO) --%>			
+<%@ attribute name="errorMsgDiv" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileButtonBrowse" required="false" rtexprvalue="true"%>
+
+			
+<c:if test="${empty fileFieldname}">
+	<c:set var="fileFieldname" value="fileSelector" />
+</c:if>
+
+<c:if test="${empty fileFieldId}">
+	<c:set var="fileFieldId" value="${fileFieldname}" />
+</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>
+
+<c:if test="${empty errorMsgDiv}">
+	<c:set var="errorMsgDiv" value="file-error-msg" />
+</c:if>
+
+<c:if test="${empty fileButtonBrowse}">
+	<c:set var="fileButtonBrowse" value="fileButtonBrowse" />
+</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="${fileFieldId}" 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>
+<c:if test="${uploadInfoMessageKey ne '-'}">
+<p class="help-block"><fmt:message key="${uploadInfoMessageKey}"><fmt:param>${maxFileSize}</fmt:param></fmt:message></p>					
+</c:if>
+<div id="${errorMsgDiv}" class="text-danger" style="display:none"></div>			
+
+<script type="text/javascript">
+	// Fake file upload
+	document.getElementById('${fileButtonBrowse}').addEventListener('click', function() {
+		document.getElementById('${fileFieldId}').click();
+	});
+	
+	document.getElementById('${fileFieldId}').addEventListener('change', function() {
+		$('#${fileInputNameFieldname}').show();
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_imscc/web/WEB-INF/tags/WaitingSpinner.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/WaitingSpinner.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/WaitingSpinner.tag	(revision 2206a0e278b26581a3a3c7d266e184551367851f)
@@ -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_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r1f99d03199a3995cfffe0cb1536c08f0220e88b0 -r2206a0e278b26581a3a3c7d266e184551367851f
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 1f99d03199a3995cfffe0cb1536c08f0220e88b0)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2206a0e278b26581a3a3c7d266e184551367851f)
@@ -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_imscc/web/pages/authoring/parts/addcommoncartridge.jsp
===================================================================
diff -u -r392e4ecb5a9c54f89d14b9a32b309280060e68c9 -r2206a0e278b26581a3a3c7d266e184551367851f
--- lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	(.../addcommoncartridge.jsp)	(revision 392e4ecb5a9c54f89d14b9a32b309280060e68c9)
+++ lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp	(.../addcommoncartridge.jsp)	(revision 2206a0e278b26581a3a3c7d266e184551367851f)
@@ -1,22 +1,47 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<%@ 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>
 	<%@ include file="/common/header.jsp"%>
-
+	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/commonCartridgeItem.js'/>"></script>
+	
+	<script type="text/javascript">
+		function verifyAndSubmit() {
+			var fileSelect = document.getElementById('file');
+			var files = fileSelect.files;
+			if (files.length == 0) {
+				clearFileError();
+				showFileError('<fmt:message key="error.resource.item.file.blank"/>');
+				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;
+				}
+			}
+			return true;
+		}
+	</script>
+	
 </lams:head>
 	
 <body class="stripes">
-	<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="commonCartridgeItemForm" enctype="multipart/form-data">
+	<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="commonCartridgeItemForm" enctype="multipart/form-data" onsubmit="return verifyAndSubmit()">
 		<c:set var="itemAttachment" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	
 		<c:set var="title"><fmt:message key="label.authoring.basic.upload.common.cartridge" /></c:set>
 		<lams:Page title="${title}" type="learner">
 
 			<%@ include file="/common/messages.jsp"%>
-			
 			<html:hidden property="sessionMapID" />
 			<input type="hidden" name="itemType" id="itemType" value="2" />
 			<html:hidden property="itemIndex" />
@@ -27,7 +52,7 @@
 				</div>
 			</div>		
 		
-			<div class="voffset10 pull-right">
+			<div class="voffset10">
 				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" /> 
 				</a>
Index: lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp
===================================================================
diff -u -ra95a149633c884052a9d1a916f6d0fb2039dc503 -r2206a0e278b26581a3a3c7d266e184551367851f
--- lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision a95a149633c884052a9d1a916f6d0fb2039dc503)
+++ lams_tool_imscc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision 2206a0e278b26581a3a3c7d266e184551367851f)
@@ -23,6 +23,10 @@
 	</c:when>
 	
 	<c:otherwise>
-		<input type="file" name="file" />
+		<div class="input-group" id="addfile">
+			<input type="file" name="file" id="file" />
+		</div>
+		<p class="help-block"><fmt:message key="label.upload.info"><fmt:param>${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}</fmt:param></fmt:message></p>					
+		<div id="file-error-msg" class="text-danger" style="display:none"></div>			
 	</c:otherwise>
 </c:choose>