From 4c49f270c907c0d73ac9f7317be145e596d239d5 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 17 Nov 2011 16:43:59 +0000
Subject: [PATCH] date labels now display correctly

---
 .../edit/forms/addGrantRoleToPerson.ftl       |  9 ++++----
 .../edit/forms/addRoleToPersonTwoStage.ftl    | 21 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
index 20beb5b7..0a7c73ea 100644
--- a/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
@@ -111,12 +111,13 @@
 
         <h4>Years of Participation in Grant</h4>							 
 			 						<#if htmlForElements?keys?seq_contains("startField")>
-			 							 <label for="startField">Start Year ${yearHint}</label>
-			 							${htmlForElements["startField"]}
+			 							 <label class="dateTime" for="startField">Start</label>
+			 							${htmlForElements["startField"]} ${yearHint}
 			 					 </#if>
+			 					 <p></p>
 			 					 <#if htmlForElements?keys?seq_contains("endField")>
-			 							<label for="endField">End Year ${yearHint}</label>
-			 							${htmlForElements["endField"]}
+			 							<label class="dateTime" for="endField">End</label>
+			 							${htmlForElements["endField"]} ${yearHint}
 					 	</#if>
 					 
             <p class="submit">
diff --git a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
index 6348da39..f56eceb6 100644
--- a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
+++ b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
@@ -88,14 +88,14 @@
     	        </#if>
 	        </#if>
         </#list>
-        <#--Checking if role field is empty-->
-        <#if lvf.submissionErrorExists(editSubmission, "roleLabel")>
-    	    Please specify a role for this activity.
-        </#if>
         <#--Checking if Name field is empty-->
          <#if lvf.submissionErrorExists(editSubmission, "activityLabel")>
  	        Please enter or select a value in the Name field.
         </#if>
+        <#--Checking if role field is empty-->
+        <#if lvf.submissionErrorExists(editSubmission, "roleLabel")>
+    	    Please specify a role for this activity.
+        </#if>
         
         </p>
     </section>
@@ -155,18 +155,19 @@
             <#if numDateFields == 1 >
                <#--Generated html is a map with key name mapping to html string-->
                <#if htmlForElements?keys?seq_contains("startField")>
-                	<label for="startField">Start Year ${yearHint}</label>
-               		${htmlForElements["startField"]}
+                	<label class="dateTimeLabel" for="startField">Start Year</label>
+               		${htmlForElements["startField"]} ${yearHint}
                </#if>
             <#else>
                 <h4>Years of Participation in ${roleDescriptor?capitalize}</h4>
                 <#if htmlForElements?keys?seq_contains("startField")>
-                	 <label for="startField">Start Year ${yearHint}</label>
-               		${htmlForElements["startField"]}
+                	    <label class="dateTime" for="startField">Start</label>
+               		    ${htmlForElements["startField"]} ${yearHint}
                </#if>
+               <p></p>
                <#if htmlForElements?keys?seq_contains("endField")>
-               		<label for="endField">End Year ${yearHint}</label>
-               		${htmlForElements["endField"]}
+               		    <label class="dateTime" for="endField">End</label>
+               		    ${htmlForElements["endField"]} ${yearHint}
                </#if>
             </#if>
         </div>