Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -rfd2cfeef7d955498a1b1a3fe7f2a37c9f9b8b154 -r73f88e6a635cb095a73df2b86fd67d6a2e6e1301
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision fd2cfeef7d955498a1b1a3fe7f2a37c9f9b8b154)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 73f88e6a635cb095a73df2b86fd67d6a2e6e1301)
@@ -1,16 +1,23 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<c:set var="UPLOAD_FILE_LARGE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
 
 <lams:html>
 	<lams:head>
 		<%@ include file="addheader.jsp"%>
 		<script type="text/javascript">
+			var UPLOAD_FILE_LARGE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_LARGE_MAX_SIZE}"/>';
+			
 			$(document).ready(function(){
 				$('#title').focus();
 			});
-			
+
+						
 	 		$( "#resourceItemForm" ).validate({
-				errorClass: "text-danger loffset5",
+	 			ignore: [],
+				errorClass: "text-danger",
 				wrapper: "span",
 	 			rules: {
 	 				file: {
@@ -52,12 +59,11 @@
 	
 				<div class="form-group">
 				   	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>:
-					<html:text styleId="title" property="title" size="55" styleClass="form-control form-control-inline" />
+					<html:text styleId="title" property="title" styleClass="form-control" />
 			  	</div>	
 			  
 
 				<div class="form-group">
-					<label for="file"><fmt:message key="label.authoring.basic.resource.file.input" /></label>:
 					<c:set var="itemAttachment" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 					<span id="itemAttachmentArea">
 					<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -rfd2cfeef7d955498a1b1a3fe7f2a37c9f9b8b154 -r73f88e6a635cb095a73df2b86fd67d6a2e6e1301
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision fd2cfeef7d955498a1b1a3fe7f2a37c9f9b8b154)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision 73f88e6a635cb095a73df2b86fd67d6a2e6e1301)
@@ -1,26 +1,45 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<c:set var="UPLOAD_FILE_LARGE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
+
 <lams:html>
 	<lams:head>
 		<%@ include file="addheader.jsp"%>
 		<script type="text/javascript">
-			$(document).ready(function(){
+		  var UPLOAD_FILE_LARGE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_LARGE_MAX_SIZE}"/>';
+
+		  $(document).ready(function(){
 				$('#title').focus();
 			});		
+		  
+			$.validator.addMethod("fileType", function(value, element) {
+				return this.optional(element) || (element.files[0].type == 'application/zip')
+			});
+			
+			$.validator.addMethod('filesize', function (value, element, param) {
+			    return this.optional(element) || (element.files[0].size <= param)
+			}, '<fmt:message key="errors.maxfilesize"><fmt:param>{0}</fmt:param></fmt:message>');
+		  
 	 		$( "#resourceItemForm" ).validate({
-				errorClass: "text-danger loffset5",
+	 			ignore: [],
+				errorClass: "text-danger",
 				wrapper: "span",
 	 			rules: {
 	 				file: {
-	 			    	required: true
+	 			    	required: true,
+	 			    	fileType: true,
+	 			    	filesize: UPLOAD_FILE_LARGE_MAX_SIZE,	 			    	
 	 			    },
 				    title: {
 				    	required: true
 				    }
 	 			},
 				messages : {
 					file : {
-						required : '<fmt:message key="error.resource.item.file.blank"/> '
+						required : '<fmt:message key="error.resource.item.file.blank"/> ',
+						fileType: 'File type incorrect?'
 					},
 					title : {
 						required : '<fmt:message key="error.resource.item.title.blank"/> '
@@ -49,13 +68,13 @@
 				<html:hidden property="itemIndex" />
 	
 				<div class="form-group">
-				   	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>
-					<html:text property="title" styleId="title" size="55" styleClass="form-control form-control-inline" />
+				   	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>:
+					<html:text property="title" styleId="title" styleClass="form-control" />
 			  	</div>	
 			  
 
 				<div class="form-group">
-					<label for="file"><fmt:message key="label.authoring.basic.resource.zip.file.input" /></label>
+					<!-- <label for="file"><fmt:message key="label.authoring.basic.resource.zip.file.input" /></label> -->
 					<c:set var="itemAttachment" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 					<span id="itemAttachmentArea">
 					<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -rfd2cfeef7d955498a1b1a3fe7f2a37c9f9b8b154 -r73f88e6a635cb095a73df2b86fd67d6a2e6e1301
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision fd2cfeef7d955498a1b1a3fe7f2a37c9f9b8b154)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 73f88e6a635cb095a73df2b86fd67d6a2e6e1301)
@@ -9,7 +9,7 @@
 				$('#title').focus();
 			});		
 	 		$( "#resourceItemForm" ).validate({
-				errorClass: "text-danger loffset5",
+				errorClass: "text-danger",
 				wrapper: "span",
 	 			rules: {
 	 				url: {
@@ -53,13 +53,13 @@
 
 				<div class="form-group">
 			    	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>:
-					<html:text property="title" styleId="title" size="55" styleClass="form-control form-control-inline" />
+					<html:text property="title" styleId="title" styleClass="form-control" />
 			  	</div>	
 			  
 				<div class="form-group">
 					<label for="url"><fmt:message key="label.authoring.basic.resource.url.input" /></label>:
-					<html:text styleId="url" property="url" size="55" styleClass="form-control form-control-inline"/>
-					&nbsp;<html:checkbox property="openUrlNewWindow" styleId="openUrlNewWindow" styleClass="loffset5"/>
+					<html:text styleId="url" property="url"  styleClass="form-control"/>
+					<br/><html:checkbox property="openUrlNewWindow" styleId="openUrlNewWindow" styleClass="loffset5"/>
 					&nbsp;<label for="openUrlNewWindow"><fmt:message key="open.in.new.window" /></label>
 				</div>
 
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -rfd2cfeef7d955498a1b1a3fe7f2a37c9f9b8b154 -r73f88e6a635cb095a73df2b86fd67d6a2e6e1301
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision fd2cfeef7d955498a1b1a3fe7f2a37c9f9b8b154)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision 73f88e6a635cb095a73df2b86fd67d6a2e6e1301)
@@ -1,26 +1,45 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<c:set var="UPLOAD_FILE_LARGE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
+
 <lams:html>
-	<lams:head>
+	<lams:head>		
 		<%@ include file="addheader.jsp"%>
 		<script type="text/javascript">
+		  var UPLOAD_FILE_LARGE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_LARGE_MAX_SIZE}"/>';
+		  
 			$(document).ready(function(){
 				$('#title').focus();
-			});		
+			});	
+						
+			$.validator.addMethod("fileType", function(value, element) {
+				return this.optional(element) || (element.files[0].type == 'application/zip')
+			});
+			
+			$.validator.addMethod('filesize', function (value, element, param) {
+			    return this.optional(element) || (element.files[0].size <= param)
+			}, '<fmt:message key="errors.maxfilesize"><fmt:param>{0}</fmt:param></fmt:message>');
+			
 	 		$( "#resourceItemForm" ).validate({
-				errorClass: "text-danger loffset5",
+	 			ignore: [],
+				errorClass: "text-danger",
 				wrapper: "span",
 	 			rules: {
 	 				file: {
-	 			    	required: true
+	 			    	required: true,
+	 			    	fileType: true,
+	 			    	filesize: UPLOAD_FILE_LARGE_MAX_SIZE,
 	 			    },
 				    title: {
 				    	required: true
 				    }
 	 			},
 				messages : {
 					file : {
-						required : '<fmt:message key="error.resource.item.file.blank"/> '
+						required : '<fmt:message key="error.resource.item.file.blank"/> ',
+						fileType: 'File type incorrect?'
 					},
 					title : {
 						required : '<fmt:message key="error.resource.item.title.blank"/> '
@@ -50,13 +69,13 @@
 				<html:hidden property="itemIndex" />
 	
 				<div class="form-group">
-				   	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>
-					<html:text property="title" styleId="title" size="55" styleClass="form-control form-control-inline" />
+				   	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>:
+					<html:text property="title" styleId="title"  styleClass="form-control" />
 			  	</div>	
 			  
 
 				<div class="form-group">
-					<label for="file"><fmt:message key="label.authoring.basic.resource.zip.file.input" /></label>
+					<!--  <label for="file"><fmt:message key="label.authoring.basic.resource.zip.file.input" /></label>: -->
 					<c:set var="itemAttachment" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 					<span id="itemAttachmentArea">
 					<%@ include file="/pages/authoring/parts/itemattachment.jsp"%>
Index: lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp
===================================================================
diff -u -rb3fe40cd67fc779a6eee8320fadc3a489565a557 -r73f88e6a635cb095a73df2b86fd67d6a2e6e1301
--- lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision b3fe40cd67fc779a6eee8320fadc3a489565a557)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemattachment.jsp	(.../itemattachment.jsp)	(revision 73f88e6a635cb095a73df2b86fd67d6a2e6e1301)
@@ -2,10 +2,34 @@
 <c:choose>
 	<c:when test="${itemAttachment.hasFile}">
 		<c:out value="${itemAttachment.fileName}" /> &nbsp;
-		<a href="#" onclick="removeItemAttachment(${itemAttachment.itemIndex})" class="btn btn-default btn-sm"> <fmt:message key="label.delete" /> </a>
+		<a href="#nogo" onclick="removeItemAttachment(${itemAttachment.itemIndex})" class="btn btn-danger btn-sm"><i class="fa fa-trash-o"></i> <fmt:message key="label.delete" /> </a>
 	</c:when>
 	<c:otherwise>
-		<input type="file" name="file" class="form-control form-control-inline" style="display:inline"/>
+
+		<div class="input-group">
+	    <span class="input-group-btn" style="font-size:inherit;">
+				<button id="fileButtonBrowse" type="button" class="btn btn-sm btn-default">
+					<i class="fa fa-upload"></i> <fmt:message key="label.authoring.basic.resource.file.input"/>
+				</button>
+			</span>
+			<input type="file" id="fileSelector" name="file" style="display:none"> 
+			<input type="text" id="fileInputName" style="display:none;" disabled="disabled" placeholder="File not selected" class="form-control input-sm">
+		</div>
+
+		<script type="text/javascript">
+			// Fake file upload
+			document.getElementById('fileButtonBrowse').addEventListener('click', function() {
+				document.getElementById('fileSelector').click();
+			});
+			
+			document.getElementById('fileSelector').addEventListener('change', function() {
+				$('#fileInputName').show();
+				document.getElementById('fileInputName').value = this.value.replace(/^.*\\/, "");
+				
+			});
+		</script>    
+
+		
 	</c:otherwise>
 </c:choose>
 <input type="hidden" name="hasFile" value="${itemAttachment.hasFile}" />
