From a014f61127a8820827afc006fb9718f5dbddc837 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 18 Nov 2011 22:07:06 +0000
Subject: [PATCH] misc template clean up

---
 .../edit/forms/addRoleToPersonTwoStage.ftl      |  2 +-
 .../edit/forms/personHasPositionHistory.ftl     | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
index f56eceb6..be2dcbb9 100644
--- a/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
+++ b/productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
@@ -90,7 +90,7 @@
         </#list>
         <#--Checking if Name field is empty-->
          <#if lvf.submissionErrorExists(editSubmission, "activityLabel")>
- 	        Please enter or select a value in the Name field.
+ 	        Please enter or select a value in the Name field.<br />
         </#if>
         <#--Checking if role field is empty-->
         <#if lvf.submissionErrorExists(editSubmission, "roleLabel")>
diff --git a/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl b/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
index 830f98f1..bd4c6d57 100644
--- a/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
+++ b/productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl
@@ -61,19 +61,19 @@
         </#list>
         <#--Checking if Org Type field is empty-->
          <#if lvf.submissionErrorExists(editSubmission, "orgType")>
- 	        Please select a value in the Organization Type field.
+ 	        Please select a value in the Organization Type field.<br />
         </#if>
         <#--Checking if Org Name field is empty-->
          <#if lvf.submissionErrorExists(editSubmission, "orgLabel")>
- 	        Please enter or select a value in the Name field.
+ 	        Please enter or select a value in the Name field.<br />
         </#if>
         <#--Checking if Position Title field is empty-->
          <#if lvf.submissionErrorExists(editSubmission, "positionTitle")>
- 	        Please enter a value in the Position Title field.
+ 	        Please enter a value in the Position Title field.<br />
         </#if>
         <#--Checking if Position Type field is empty-->
          <#if lvf.submissionErrorExists(editSubmission, "positionType")>
- 	        Please select a value in the Position Type field.
+ 	        Please select a value in the Position Type field.<br />
         </#if>
         
         </p>
@@ -89,7 +89,7 @@
         <#list orgTypeOpts?keys as key>             
             <option value="${key}"  <#if orgTypeValue = key>selected</#if>>${orgTypeOpts[key]}</option>            
         </#list>
-    </select>   
+    </select>
   </p>
 
   <div class="fullViewOnly">        
@@ -110,11 +110,11 @@
       <label for="positionType">Position Type ${requiredHint}</label>
       <#assign posnTypeOpts = editConfiguration.pageData.positionType />
       <select name="positionType" style="margin-top:-2px" >
-          <option value="" selected="selected">Select one</option>                
+          <option value="" <#if positionTypeValue == "">selected</#if>>Select one</option>                
           <#list posnTypeOpts?keys as key>             
-              <option value="${key}"  <#if positionTypeValue = key>selected</#if>>${posnTypeOpts[key]}</option>         
+              <option value="${key}"  <#if positionTypeValue == key>selected</#if>>${posnTypeOpts[key]}</option>         
           </#list>
-      </select>   
+      </select>
       <p></p>
       <#--Need to draw edit elements for dates here-->
        <#if htmlForElements?keys?seq_contains("startField")>
@@ -154,7 +154,6 @@ var customFormData  = {
 };
 </script>
 
-
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customFormWithAutocomplete.css" />')}