Index: lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js,v
diff -u -r1.13.2.1 -r1.13.2.2
--- lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js	19 May 2016 04:22:36 -0000	1.13.2.1
+++ lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js	2 Dec 2016 09:14:19 -0000	1.13.2.2
@@ -97,6 +97,16 @@
 	function submitResourceItem(){
 		//prepare lams_textarea value to Ajax submit and add instructions to form
 		$('textarea').trigger('change');
+		
+		// validation will fail with spaces
+		var urlField = document.getElementById("url");
+		if ( urlField ) {
+			urlField.value = urlField.value.trim();
+		}
+		
+		if ( ! $("#resourceItemForm").valid() ) 
+			return false;
+
 		document.getElementById("instructionList").value = $("#instructionForm").serialize();
 		var formData = new FormData(document.getElementById("resourceItemForm"));
 
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp,v
diff -u -r1.21.2.4 -r1.21.2.5
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	13 Sep 2016 09:24:26 -0000	1.21.2.4
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	2 Dec 2016 09:14:19 -0000	1.21.2.5
@@ -4,14 +4,29 @@
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<lams:css/>
-
+		<%@ include file="addheader.jsp"%>
 		<script type="text/javascript">
-		   <%-- user for  rsrcresourceitem.js --%>
-		   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
-	       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
-	       var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
+	 		$( "#resourceItemForm" ).validate({
+				errorClass: "text-danger loffset5",
+				wrapper: "span",
+	 			rules: {
+	 				file: {
+	 			    	required: true
+	 			    },
+				    title: {
+				    	required: true
+				    }
+	 			},
+				messages : {
+					file : {
+						required : '<fmt:message key="error.resource.item.file.blank"/> ',
+					},
+					title : {
+						required : '<fmt:message key="error.resource.item.title.blank"/> '
+					}
+				}
+			});
+
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 	</lams:head>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp,v
diff -u -r1.18.2.4 -r1.18.2.5
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	13 Sep 2016 09:24:34 -0000	1.18.2.4
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	2 Dec 2016 09:14:19 -0000	1.18.2.5
@@ -4,13 +4,28 @@
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<lams:css/>
+		<%@ include file="addheader.jsp"%>
 		<script type="text/javascript">
-		   <%-- user for  rsrcresourceitem.js --%>
-		   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
-	       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
-	       var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
+	 		$( "#resourceItemForm" ).validate({
+				errorClass: "text-danger loffset5",
+				wrapper: "span",
+	 			rules: {
+	 				file: {
+	 			    	required: true
+	 			    },
+				    title: {
+				    	required: true
+				    }
+	 			},
+				messages : {
+					file : {
+						required : '<fmt:message key="error.resource.item.file.blank"/> '
+					},
+					title : {
+						required : '<fmt:message key="error.resource.item.title.blank"/> '
+					}
+				}
+			});	 		
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp,v
diff -u -r1.24.2.5 -r1.24.2.6
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	13 Sep 2016 09:24:41 -0000	1.24.2.5
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	2 Dec 2016 09:14:19 -0000	1.24.2.6
@@ -4,12 +4,31 @@
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<lams:css/>
-		<%-- user for  rsrcresourceitem.js --%>
+		<%@ include file="addheader.jsp"%>
 		<script type="text/javascript">
-			var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
-    		var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+	 		$( "#resourceItemForm" ).validate({
+				errorClass: "text-danger loffset5",
+				wrapper: "span",
+	 			rules: {
+	 				url: {
+	 			    	required: true,
+	 			    	url: true
+	 			    },
+				    title: {
+				    	required: true
+				    }
+	 			},
+				messages : {
+					url : {
+						required : '<fmt:message key="error.resource.item.url.blank"/> ',
+						url : '<fmt:message key="error.resource.item.invalid.url"/> ',
+					},
+					title : {
+						required : '<fmt:message key="error.resource.item.title.blank"/> '
+					}
+				}
+			});
+
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 	</lams:head>
@@ -35,10 +54,9 @@
 					<html:text property="title" size="55" styleClass="form-control form-control-inline" />
 			  	</div>	
 			  
-
 				<div class="form-group">
 					<label for="url"><fmt:message key="label.authoring.basic.resource.url.input" /></label>
-					<html:text property="url" size="55" styleClass="form-control form-control-inline"/>
+					<html:text styleId="url" property="url" size="55" styleClass="form-control form-control-inline"/>
 					&nbsp;<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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp,v
diff -u -r1.18.2.4 -r1.18.2.5
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	13 Sep 2016 09:24:48 -0000	1.18.2.4
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	2 Dec 2016 09:14:19 -0000	1.18.2.5
@@ -4,13 +4,28 @@
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<lams:css/>
+		<%@ include file="addheader.jsp"%>
 		<script type="text/javascript">
-		   <%-- user for  rsrcresourceitem.js --%>
-		   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
-	       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
-	       var removeItemAttachmentUrl = "<c:url value='/authoring/removeItemAttachment.do'/>";
+	 		$( "#resourceItemForm" ).validate({
+				errorClass: "text-danger loffset5",
+				wrapper: "span",
+	 			rules: {
+	 				file: {
+	 			    	required: true
+	 			    },
+				    title: {
+				    	required: true
+				    }
+	 			},
+				messages : {
+					file : {
+						required : '<fmt:message key="error.resource.item.file.blank"/> '
+					},
+					title : {
+						required : '<fmt:message key="error.resource.item.title.blank"/> '
+					}
+				}
+			});
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrcresourceitem.js'/>"></script>
 
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addfile.jsp,v
diff -u -r1.17.2.2 -r1.17.2.3
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	16 Mar 2016 01:57:43 -0000	1.17.2.2
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	2 Dec 2016 09:14:19 -0000	1.17.2.3
@@ -22,7 +22,7 @@
 
  		<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"/>
+	    	<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>
@@ -42,7 +42,27 @@
 	</html:form>
 	
 	<script type="text/javascript">
-	$('#resourceItemForm').submit(submitResourceForm);
+		$('#resourceItemForm').submit(submitResourceForm);
+		$('#resourceItemForm').validate({
+			errorClass: "text-danger loffset5",
+			wrapper: "span",
+			rules: {
+				file: {
+			    	required: true,
+			    },
+			    title: {
+			    	required: true
+			    }
+			},
+			messages : {
+				file : {
+					required : '<fmt:message key="error.resource.item.file.blank"/> '
+				},
+				title : {
+					required : '<fmt:message key="error.resource.item.title.blank"/> '
+				}
+			},
+		});	
 	</script>
 	
 </div>
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addurl.jsp,v
diff -u -r1.18.4.2 -r1.18.4.3
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	16 Mar 2016 01:57:43 -0000	1.18.4.2
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	2 Dec 2016 09:14:19 -0000	1.18.4.3
@@ -42,7 +42,29 @@
 	</html:form>
 	
 	<script type="text/javascript">
-	$('#resourceItemForm').submit(submitResourceForm);
+		$('#resourceItemForm').submit(submitResourceForm);
+		$('#resourceItemForm').validate({
+			errorClass: "text-danger loffset5",
+			wrapper: "span",
+ 			rules: {
+ 				url: {
+ 			    	required: true,
+ 			    	url: true
+ 			    },
+			    title: {
+			    	required: true
+			    }
+ 			},
+			messages : {
+				url : {
+					required : '<fmt:message key="error.resource.item.url.blank"/> ',
+					url : '<fmt:message key="error.resource.item.invalid.url"/> '
+				},
+				title : {
+					required : '<fmt:message key="error.resource.item.title.blank"/> '
+				}
+			},
+		});
 	</script>
 	
 </div>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v
diff -u -r1.53.2.6 -r1.53.2.7
--- lams_tool_larsrc/web/pages/learning/learning.jsp	20 Aug 2016 06:50:06 -0000	1.53.2.6
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	2 Dec 2016 09:14:19 -0000	1.53.2.7
@@ -22,51 +22,18 @@
 	<c:set var="resource" value="${sessionMap.resource}" />
 	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="/lams/includes/javascript/jquery.validate.js"></script>
+	
 	<script type="text/javascript">
 	
 		$(document).ready(function(){
 			cancel();
 		});
 
-		function validateForm(itemType) {
-			var error = "";
-			var title = $("#resourcetitle").val();
-			if ( ! title || title == "" ) {
-				error='<fmt:message key="error.resource.item.title.blank" />';
-			}
-			if ( itemType == '1') {
-				var url = $("#url").val();
-				if ( ! url || url == "" ) {
-					if ( error == "" ) {
-						error='<fmt:message key="error.resource.item.url.blank" />';
-					} else {
-						error+='\n<fmt:message key="error.resource.item.url.blank" />';
-					}
-				}
-			}
-			if ( itemType == '2') {
-				var file = $("#file").val();
-				if ( ! file || file == "" ) {
-					if ( error == "" ) {
-						error='<fmt:message key="error.resource.item.file.blank" />';
-					} else {
-						error+='\n<fmt:message key="error.resource.item.file.blank" />';
-					}
-				}
-			}
-			if ( error != "" ) {
-				alert(error);
-				return false;
-			} else { 
-				return true;
-			}
-		}
-		
  		function submitResourceForm() {
-			var itemType = $("#itemType").val();
-			<%-- Firefox is sending an empty string rather than nothing when there isn't a file, which breaks Struts. So validate to avoid. --%>
-			if ( validateForm(itemType)) {
+ 			debugger;
+			if ( $(this).valid() ) {
 				var formData = new FormData(this);
 			    $.ajax({ // create an AJAX call...
 			        data: formData,