Index: lams_admin/web/register.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_admin/web/register.jsp	(.../register.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_admin/web/register.jsp	(.../register.jsp)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -1,13 +1,11 @@
-
 <%@ include file="/taglibs.jsp"%>
 
 <script src="<lams:LAMSURL/>/includes/javascript/jquery.js" type="text/javascript"></script>
-<script src="<lams:LAMSURL/>/includes/javascript/jquery.validate.pack.js" type="text/javascript"></script>
+<script src="<lams:LAMSURL/>/includes/javascript/jquery.validate.js" type="text/javascript"></script>
 
 <script type="text/javascript">
-<!--
-	
 	$().ready(function() {
+		
 		// validate signup form on keyup and submit
 		$("#RegisterForm").validate({
 			rules: {
@@ -26,13 +24,10 @@
 				email: '<font color="red"><i><fmt:message key="register.error.emailRequiredValid"/></i></font>'
 			}
 		});
+		
 	});
-//-->
 </script>
 
-
-
-
 <html:form action="/register" method="post" styleId="RegisterForm">
 	<html:hidden property="method" value="register" />
 	
Index: lams_central/web/css/defaultHTML_learner.css
===================================================================
diff -u -rff01a6c237cefc4a5186889bf46041152cfc37ae -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision ff01a6c237cefc4a5186889bf46041152cfc37ae)
+++ lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -344,19 +344,22 @@
 }
 
 .error {
-        color: #000000;
-        padding:8px 10px 10px 40px;
-        margin-top: 25px;
-        margin-left: auto;
-        margin-right: auto;
-        text-align: left;
-        font-weight: normal;
-        background: url('../images/css/error.png') no-repeat #ffffce 10px 8px;
-        width: 70%;
-        border: 1px solid #C0C0C0;
+	color: #000000;
+	margin-left: auto;
+	margin-right: auto;
+	text-align: left;
+	font-weight: normal;
 }
+input.error {
+	background-color: bisque;
+	padding:8px 2px 10px;
+}
+label.error {
+	margin-left: 10px;
+	background-color: #EFEFEF;
+	padding:8px 10px 10px;
+}
 
-
 .group-box {
 	padding:8px 10px 10px 40px;
 	margin-top: 20px;
Index: lams_central/web/css/defaultHTML_learner_mobile.css
===================================================================
diff -u -r926fb031069a02c3385dcf581ecc2fa5e861850e -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_central/web/css/defaultHTML_learner_mobile.css	(.../defaultHTML_learner_mobile.css)	(revision 926fb031069a02c3385dcf581ecc2fa5e861850e)
+++ lams_central/web/css/defaultHTML_learner_mobile.css	(.../defaultHTML_learner_mobile.css)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -186,17 +186,21 @@
 }
 
 .error {
-        color: #000000;
-        padding:8px 10px 10px 40px;
-        margin-top: 25px;
-        margin-left: auto;
-        margin-right: auto;
-        text-align: left;
-        font-weight: normal;
-        background: url('../images/css/error.png') no-repeat #ffffce 10px 8px;
-        width: 70%;
-        border: 1px solid #C0C0C0;
+	color: #000000;
+	margin-left: auto;
+	margin-right: auto;
+	text-align: left;
+	font-weight: normal;
 }
+input.error {
+	background-color: bisque;
+	padding:8px 2px 10px;
+}
+label.error {
+	margin-left: 10px;
+	background-color: #EFEFEF;
+	padding:8px 10px 10px;
+}
 
 .ui-finishbtn-right { float: right;padding-right: 40px; min-height: 30px;}
 
Index: lams_central/web/images/css/error.png
===================================================================
diff -u -r83c269c7e8167a1ea148da8efcfad5c20d3038bc -rbea46a36fe22e2d9a148ca895deb37a513349d52
Binary files differ
Fisheye: Tag bea46a36fe22e2d9a148ca895deb37a513349d52 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery.validate.pack.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/lamscommunity/lamscommunityLogin.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_central/web/lamscommunity/lamscommunityLogin.jsp	(.../lamscommunityLogin.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_central/web/lamscommunity/lamscommunityLogin.jsp	(.../lamscommunityLogin.jsp)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -13,20 +13,17 @@
 	<lams:css/>
 	
 	<script src="<lams:LAMSURL/>/includes/javascript/jquery.js" type="text/javascript"></script>
-	<script src="<lams:LAMSURL/>/includes/javascript/jquery.validate.pack.js" type="text/javascript"></script>
+	<script src="<lams:LAMSURL/>/includes/javascript/jquery.validate.js" type="text/javascript"></script>
 	<script language="JavaScript" type="text/javascript">
-		function submitForm()
-		{
+		function submitForm() {
 			var valid = $("#lamsCommunityLoginForm").valid();
 			
 			if (valid) {
 				document.getElementById("lamsCommunityLoginForm").submit();
 			}
-			
 		}
 		
-		function init()
-		{
+		function init() {
 			document.getElementById("lcPassword").value = "";
 		}
 		
@@ -75,7 +72,6 @@
 		</p>
 		<br />
 		
-		
 		<html:form action="/lamsCommunityLogin" method="post" styleId="lamsCommunityLoginForm">
 			
 			<html:hidden property="dispatch" value="authenticate" />
Index: lams_tool_assessment/web/includes/css/addQuestion.css
===================================================================
diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_tool_assessment/web/includes/css/addQuestion.css	(.../addQuestion.css)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
+++ lams_tool_assessment/web/includes/css/addQuestion.css	(.../addQuestion.css)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -1,12 +1,10 @@
 label.error { 
-	float: none; color: red; padding-left: .5em; vertical-align: top; font-weight: bold; font-style: italic;
+	color: red; font-weight: bold; font-style: italic; margin-left: 0px;
+	display: inline-block;
 }
 em { 
 	font-weight: bold; padding-right: 1em; vertical-align: top; 
 }
-input.error { 
-	border: 2px solid red;
-}
 #content {
 	width: 91%; margin-bottom: 10px;
 }
@@ -31,4 +29,8 @@
 	vertical-align: sub;
 }
 
-
+.fake-validation-input {
+	visibility: hidden;
+	height: 0px;
+	padding: 0 !important;
+}
\ No newline at end of file
Index: lams_tool_assessment/web/includes/css/assessment.css
===================================================================
diff -u -r0320fcacdd6f92d378d3eecc575faa08c08c488d -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_tool_assessment/web/includes/css/assessment.css	(.../assessment.css)	(revision 0320fcacdd6f92d378d3eecc575faa08c08c488d)
+++ lams_tool_assessment/web/includes/css/assessment.css	(.../assessment.css)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -65,13 +65,13 @@
 }
 
 div.error, div.message {
-    background-color: #ffffcc;
+    background-color: #FFE4C4;
     border: 1px solid #000;
     color: #000000;
     font-family: Arial, Helvetica, sans-serif;
     font-weight: normal;
     margin: 10px auto;
-    padding: 3px;
+    padding: 8px;
     text-align: left;
     vertical-align: bottom;
 }
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -19,7 +19,7 @@
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.pack.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
   	    <script>
 			$(document).ready(function(){
@@ -35,7 +35,7 @@
 		    			      required: true,
 		    			      number: true
 		    			},
-		    			fake: {
+		    			hasOptionFilled: {
 		    				required: function(element) {
 		    					prepareOptionEditorsForAjaxSubmit();	    				
 		    		        	return $("textarea[name^=optionQuestion]:filled").length < 1;
@@ -51,7 +51,8 @@
 		    			penaltyFactor: {
 		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
 		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
-		    			}
+		    			},
+		    			hasOptionFilled: "<fmt:message key='label.authoring.matching.pairs.error.one.matching.pair'/>"
 		    		},
 		    	    invalidHandler: function(form, validator) {
 		    		      var errors = validator.numberOfInvalids();
@@ -166,11 +167,11 @@
 					</label>
 				</div>
 				
-				<input type="hidden" name="fake" id="fake">
+				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.matching.pairs.matching.pairs" />
 				</div>				
-				<label for="fake" class="error" style="display: none;"><fmt:message key='label.authoring.matching.pairs.error.one.matching.pair'/></label>
+				<label for="hasOptionFilled" class="error" style="display: none;"></label>
 			</html:form>
 			
 			<!-- Options -->
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -19,7 +19,7 @@
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.pack.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
   	    <script>
 			$(document).ready(function(){
@@ -65,7 +65,7 @@
 		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
 		    			},
 		    			hasOneHundredGrade: {
-		    				required: "<br><fmt:message key='error.form.validation.hundred.score'/>"
+		    				required: "<fmt:message key='error.form.validation.hundred.score'/>"
 		    			}
 		    		},
 		    	    invalidHandler: function(form, validator) {
@@ -197,8 +197,8 @@
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.answer.options" />
 				</div>
-				<input type="hidden" name="hasOptionFilled" id="hasOptionFilled">
-				<input type="hidden" name="hasOneHundredGrade" id="hasOneHundredGrade">
+				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
+				<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
 			</html:form>
 			
 			<!-- Options -->
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -31,7 +31,7 @@
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.pack.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
   	    <script>
 			$(document).ready(function(){
@@ -99,10 +99,10 @@
 		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
 		    			},
 		    			hasOneHundredGrade: {
-		    				required: "<br><fmt:message key='error.form.validation.hundred.score'/>"
+		    				required: "<fmt:message key='error.form.validation.hundred.score'/>"
 		    			},		
 		    			allAcceptedErrorsPositive: {
-		    				required: "<br><fmt:message key='error.form.validation.positive.accepted.errors'/>"
+		    				required: "<fmt:message key='error.form.validation.positive.accepted.errors'/>"
 		    			}, 
 		    			unitList: {
 		    				required: ""
@@ -226,9 +226,9 @@
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.numerical.answers" />
 				</div>
-				<input type="hidden" name="hasOptionFilled" id="hasOptionFilled">
-				<input type="hidden" name="hasOneHundredGrade" id="hasOneHundredGrade">
-				<input type="hidden" name="allAcceptedErrorsPositive" id="allAcceptedErrorsPositive">
+				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
+				<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
+				<input type="text" name="allAcceptedErrorsPositive" id="allAcceptedErrorsPositive" class="fake-validation-input">
 			</html:form>
 			
 			<!-- Options -->
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -19,9 +19,9 @@
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.pack.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-  	    <script><!--
+  	    <script>
 			$(document).ready(function(){
 				
 		    	$("#assessmentQuestionForm").validate({
@@ -52,9 +52,7 @@
 		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
 		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
 		    			},
-		    			hasOptionFilled: {
-		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
-		    			}
+		    			hasOptionFilled:  "<fmt:message key='label.authoring.numerical.error.answer'/>"
 		    		},
 		    	    invalidHandler: function(form, validator) {
 		    		      var errors = validator.numberOfInvalids();
@@ -92,9 +90,8 @@
     			self.parent.refreshThickbox()
     			self.parent.tb_remove();
     		}    
-  		--></script>
+  		</script>
 		
-		
 	</lams:head>
 	
 	<body class="stripes" onload="parent.resizeIframe();">
@@ -167,7 +164,7 @@
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.answer.options" />
 				</div>
-				<input type="hidden" name="hasOptionFilled" id="hasOptionFilled">
+				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
 			</html:form>
 			
 			<!-- Options -->
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -19,9 +19,9 @@
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.pack.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-  	    <script><!--
+  	    <script>
 			$(document).ready(function(){
 				
 		    	$("#assessmentQuestionForm").validate({
@@ -60,12 +60,8 @@
 		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
 		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
 		    			},
-		    			hasOptionFilled: {
-		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
-		    			},
-		    			hasOneHundredGrade: {
-		    				required: "<br><fmt:message key='error.form.validation.hundred.score'/>"
-		    			}
+		    			hasOptionFilled: "<fmt:message key='label.authoring.numerical.error.answer'/>",
+		    			hasOneHundredGrade: "<fmt:message key='error.form.validation.hundred.score'/>"
 		    		},
 		    	    invalidHandler: function(form, validator) {
 		    		      var errors = validator.numberOfInvalids();
@@ -101,9 +97,8 @@
     			self.parent.refreshThickbox()
     			self.parent.tb_remove();
     		}    
-  		--></script>
+  		</script>
 		
-		
 	</lams:head>
 	
 	<body class="stripes" onload="parent.resizeIframe();">
@@ -184,8 +179,8 @@
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.short.answer.answers" />
 				</div>
-				<input type="hidden" name="hasOptionFilled" id="hasOptionFilled">
-				<input type="hidden" name="hasOneHundredGrade" id="hasOneHundredGrade">
+				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
+				<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
 			</html:form>
 			
 			<!-- Options -->
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -11,9 +11,9 @@
 		<c:set var="questionType" value="5"	scope="request" />
 
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.pack.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-  	    <script><!--
+  	    <script>
 			$(document).ready(function(){
 				
 		    	$("#assessmentQuestionForm").validate({
@@ -73,9 +73,8 @@
     			self.parent.refreshThickbox()
     			self.parent.tb_remove();
     		}    
-  		--></script>
+  		</script>
 		
-		
 	</lams:head>
 	
 	<body class="stripes" onload="parent.resizeIframe();">
Index: lams_tool_scratchie/web/common/header.jsp
===================================================================
diff -u -r99545d1824fcf0b2ea23a6bdce46aab3b288bff5 -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_tool_scratchie/web/common/header.jsp	(.../header.jsp)	(revision 99545d1824fcf0b2ea23a6bdce46aab3b288bff5)
+++ lams_tool_scratchie/web/common/header.jsp	(.../header.jsp)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -3,15 +3,13 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
- 	<!-- ********************  CSS ********************** -->
-	<link href="<html:rewrite page='/includes/css/scratchie.css'/>" rel="stylesheet" type="text/css">
-	<lams:css />
+<!-- ********************  CSS ********************** -->
+<lams:css />
+<link href="<html:rewrite page='/includes/css/scratchie.css'/>" rel="stylesheet" type="text/css">
 
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
- 	<!-- ********************  javascript ********************** -->
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/scratchiecommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
-
 	
Index: lams_tool_scratchie/web/includes/css/scratchie.css
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_tool_scratchie/web/includes/css/scratchie.css	(.../scratchie.css)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/web/includes/css/scratchie.css	(.../scratchie.css)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -6,13 +6,13 @@
 }
 
 div.error, div.message {
-    background-color: #ffffcc;
+    background-color: #FFE4C4;
     border: 1px solid #000;
     color: #000000;
     font-family: Arial, Helvetica, sans-serif;
     font-weight: normal;
     margin: 10px auto;
-    padding: 3px;
+    padding: 8px;
     text-align: left;
     vertical-align: bottom;
 }
@@ -31,3 +31,11 @@
 div.message img.icon {
     vertical-align: middle;
 }
+
+.fake-validation-input {
+	visibility: hidden;
+	height: 0px;	
+}
+label.error {
+    margin-left: 0px;
+}
\ No newline at end of file
Fisheye: Tag bea46a36fe22e2d9a148ca895deb37a513349d52 refers to a dead (removed) revision in file `lams_tool_scratchie/web/includes/javascript/scratchiecommon.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/pages/authoring/parts/additem.jsp
===================================================================
diff -u -r99545d1824fcf0b2ea23a6bdce46aab3b288bff5 -rbea46a36fe22e2d9a148ca895deb37a513349d52
--- lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	(.../additem.jsp)	(revision 99545d1824fcf0b2ea23a6bdce46aab3b288bff5)
+++ lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	(.../additem.jsp)	(revision bea46a36fe22e2d9a148ca895deb37a513349d52)
@@ -7,9 +7,8 @@
 		<%@ include file="/common/header.jsp"%>
 		<style media="screen,projection" type="text/css">
 			label { width: 10em; float: left; }
-			label.error { float: none; color: red; padding-left: .5em; vertical-align: top; font-weight: bold; font-style: italic;}
+			label.error { float: none; color: red; vertical-align: top; font-weight: bold; font-style: italic;}
 			em { font-weight: bold; padding-right: 1em; vertical-align: top; }
-			input.error { border: 2px solid red;}
 			#content {width: 91%; margin-bottom: 10px;}
 			table.alternative-color td {padding-left: 0;}
 			input[type=text].shortInputText {width:10%;}
@@ -20,10 +19,9 @@
 		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
 
 		<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.pack.js"></script>
+		<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
 		<script type="text/javascript">
-		<!--
 			var addAnswerUrl = "<c:url value='/authoring/addAnswer.do'/>";
 		   	var removeAnswerUrl = "<c:url value='/authoring/removeAnswer.do'/>";
     	    var upAnswerUrl = "<c:url value='/authoring/upAnswer.do'/>";
@@ -175,7 +173,9 @@
 	    			    }
 		    		},
 		    		messages: {
-		    			title: "<fmt:message key='label.authoring.title.required'/>"
+		    			title: "<fmt:message key='label.authoring.title.required'/>",
+		    			hasAnswerFilled: "<fmt:message key='label.authoring.error.possible.answer'/>",
+		    			hasFilledCorrectAnswer: "<fmt:message key='label.authoring.error.correct.answer'/>"
 		    		},
 		    	    invalidHandler: function(form, validator) {
 		    		      var errors = validator.numberOfInvalids();
@@ -202,13 +202,13 @@
 		    	    			self.parent.refreshThickbox()
 		    	    			self.parent.tb_remove();
 		    	    		} 
-		    		    }; 				
+		    		    };
 		    		    				
 		    			$('#scratchieItemForm').ajaxSubmit(answers);
 		    		}
 		  		});
 			});   
-  		--></script>
+  		</script>
 		
 	</lams:head>
 	
@@ -240,19 +240,19 @@
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.question.text" />
 				</div>
-				<lams:CKEditor id="description" value="${formBean.description}"
-					contentFolderID="${formBean.contentFolderID}" >
+				<lams:CKEditor id="description" value="${formBean.description}" contentFolderID="${formBean.contentFolderID}" >
 				</lams:CKEditor>
-				
 				<br><br>
-				<input type="hidden" name="hasAnswerFilled" id="hasAnswerFilled">
+				
+				<input type="text" name="hasAnswerFilled" id="hasAnswerFilled" class="fake-validation-input">
+				
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.scratchie.answers" />
 				</div>
-				<label for="hasAnswerFilled" class="error" style="display: none;"><fmt:message key='label.authoring.error.possible.answer'/></label>
+				<label for="hasAnswerFilled" class="error" style="display: none;"></label>
 				
-				<input type="hidden" name="hasFilledCorrectAnswer" id=hasFilledCorrectAnswer>
-				<label for="hasFilledCorrectAnswer" class="error" style="display: none;"><br><fmt:message key='label.authoring.error.correct.answer'/></label>
+				<input type="text" name="hasFilledCorrectAnswer" id="hasFilledCorrectAnswer" class="fake-validation-input">
+				<label for="hasFilledCorrectAnswer" class="error" style="display: none;"></label>
 				
 			</html:form>