From 1f174b98f6b3ad48ce3866e8d8fa0d20957593cd Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 16 Nov 2011 15:38:40 +0000
Subject: [PATCH] modified, expanded error messaging

---
 .../edit/forms/addRoleToPersonTwoStage.ftl    | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
index 3dfe661a..dd5ffc94 100644
--- a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
+++ b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
@@ -73,15 +73,28 @@
         <p>
         <#--below shows examples of both printing out all error messages and checking the error message for a specific field-->
         <#list submissionErrors?keys as errorFieldName>
-        	${errorFieldName}: ${submissionErrors[errorFieldName]}
-        	<br/>
+        	<#if errorFieldName == "startField">
+        	    <#if submissionErrors[errorFieldName]?contains("before")>
+        	        The Start Year must be earlier than the End Year.
+        	    <#else>
+        	        ${submissionErrors[errorFieldName]}
+        	    </#if>
+        	    <br />
+        	<#elseif errorFieldName == "endField">
+    	        <#if submissionErrors[errorFieldName]?contains("after")>
+    	            The End Year must be later than the Start Year.
+    	        <#else>
+    	            ${submissionErrors[errorFieldName]}
+    	        </#if>
+	        </#if>
         </#list>
         <#--Checking if role field is empty-->
         <#if lvf.submissionErrorExists(editSubmission, "roleLabel")>
-        	Specify a role for this activity.
+    	    Please specify a role for this activity.
         </#if>
+        <#--Checking if Name field is empty-->
          <#if lvf.submissionErrorExists(editSubmission, "activityLabel")>
-				        	Enter a name for the activity.
+ 	        Please enter or select a value in the Name field.
         </#if>
         
         </p>