Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -r33c08844653d1db1980b7a57cd4d22f28e948167 -r0effae5377cf7d628757b74da04bd26e0ba60a59
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 33c08844653d1db1980b7a57cd4d22f28e948167)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 0effae5377cf7d628757b74da04bd26e0ba60a59)
@@ -1,4 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE)%></c:set>
 
 <!-- Add a File Form-->
 <div class="panel panel-default">
@@ -16,39 +19,70 @@
 		<html:hidden property="sessionMapID"/>
 	
 		<div class="form-group">
-	    	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>
-			<html:text property="title" size="50" tabindex="1" styleId="resourcetitle"/>
+	    	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>:
+			<html:text property="title" styleClass="form-control" tabindex="1" styleId="resourcetitle"/>
 	  	</div>	
 
- 		<div class="form-group" id="addfile">
-	    	<label for="file"><fmt:message key="label.authoring.basic.resource.file.input" /></label>
-	    	<html:file tabindex="3" property="file" styleId="file" style="display:inline"/>
-	        <label><html:checkbox property="openUrlNewWindow" tabindex="4" styleId="openUrlNewWindow" ></html:checkbox>&nbsp;
-			 <fmt:message key="open.in.new.window" /></label>
-	    </div>
+		<div class="input-group" id="addfile">
+	    <span class="input-group-btn" style="font-size:inherit;">
+				<button tabindex="2" 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>
 
-		<div class="form-group">
+		<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>    
+
+		<div class="form-group voffset10">
 	    	<label for="description"><fmt:message key="label.learning.comment.or.instruction" /></label>
-			<html:text property="description" tabindex="5" styleClass="text-area" maxlength="255" size="50" />
+			<html:text property="description" tabindex="3" styleClass="form-control" maxlength="255"/>
 	  	</div>	
 
- 		<html:button property="goback" onclick="javascript:cancel()" styleClass="btn btn-xs btn-default" styleId="cancelButton">
-			<fmt:message key="button.cancel" />
-		</html:button>&nbsp;
-		<html:submit styleClass="btn btn-xs btn-default" styleId="submitButton">
-		 	<fmt:message key="button.add" />
-		</html:submit>
+		<div id="buttons" class="pull-right">
+	 		<html:button property="goback" onclick="javascript:cancel()" styleClass="btn btn-sm btn-default" styleId="cancelButton">
+				<fmt:message key="button.cancel" />
+			</html:button>&nbsp;
+			<html:submit styleClass="btn btn-sm btn-default" styleId="submitButton">
+			 	<fmt:message key="button.add" />
+			</html:submit>
+		</div>
 	
 	</html:form>
 	
 	<script type="text/javascript">
+	  var UPLOAD_FILE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_MAX_SIZE}"/>';
+
+		$(document).ready(function(){
+			$('#title').focus();
+		});	
+					
+		$.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').submit(submitResourceForm);
 		$('#resourceItemForm').validate({
-			errorClass: "text-danger loffset5",
+			ignore: [],
+			errorClass: "text-danger",
 			wrapper: "span",
 			rules: {
 				file: {
 			    	required: true,
+			    	filesize: UPLOAD_FILE_MAX_SIZE, 
 			    },
 			    title: {
 			    	required: true
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
diff -u -r33c08844653d1db1980b7a57cd4d22f28e948167 -r0effae5377cf7d628757b74da04bd26e0ba60a59
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 33c08844653d1db1980b7a57cd4d22f28e948167)
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 0effae5377cf7d628757b74da04bd26e0ba60a59)
@@ -16,35 +16,42 @@
 		<html:hidden property="sessionMapID"/>
 	
 		<div class="form-group">
-	    	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>
-			<html:text property="title" size="50" tabindex="1" styleId="resourcetitle"/>
+	    	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>:
+			<html:text property="title" tabindex="1" styleClass="form-control" styleId="resourcetitle"/>
 	  	</div>	
 
 		<div class="form-group" id="addurl">
 	    	<label for="url"><fmt:message key="label.authoring.basic.resource.url.input" /></label>
-			<html:text property="url" size="50" tabindex="2" styleId="url"/>&nbsp;
+			<html:text property="url" styleClass="form-control" tabindex="2" styleId="url"/><br/>&nbsp;
 	        <label><html:checkbox property="openUrlNewWindow" tabindex="3" styleId="openUrlNewWindow" ></html:checkbox>&nbsp;
 			 <fmt:message key="open.in.new.window" /></label>
 	    </div>
 
 		<div class="form-group">
 	    	<label for="description"><fmt:message key="label.learning.comment.or.instruction" /></label>
-			<html:text property="description" tabindex="5" styleClass="text-area" maxlength="255" size="50" />
+			<html:text property="description" tabindex="5" maxlength="255" styleClass="form-control" />
 	  	</div>	
 
- 		<html:button property="goback" onclick="javascript:cancel()" styleClass="btn btn-xs btn-default" styleId="cancelButton">
-			<fmt:message key="button.cancel" />
-		</html:button>&nbsp;
-		<html:submit styleClass="btn btn-xs btn-default" styleId="submitButton">
-		 	<fmt:message key="button.add" />
-		</html:submit>
+		<div id="buttons" class="pull-right" >
+	 		<html:button property="goback" onclick="javascript:cancel()" styleClass="btn btn-sm btn-default" styleId="cancelButton">
+				<fmt:message key="button.cancel" />
+			</html:button>&nbsp;
+			<html:submit styleClass="btn btn-sm btn-default" styleId="submitButton">
+			 	<fmt:message key="button.add" />
+			</html:submit>
+		</div>
 	
 	</html:form>
 	
 	<script type="text/javascript">
+		$(document).ready(function(){
+			$('#url').attr("placeholder","<fmt:message key="label.authoring.basic.resource.url.input.placeholder" />");
+			$('#title').focus();
+		});		
+	
 		$('#resourceItemForm').submit(submitResourceForm);
 		$('#resourceItemForm').validate({
-			errorClass: "text-danger loffset5",
+			errorClass: "text-danger",
 			wrapper: "span",
  			rules: {
  				url: {