From 6f42c8c992d135e27f1b53e7d44de5cf97c4e2ca Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 24 Jun 2011 16:54:48 +0000
Subject: [PATCH] NIHVIVO-2584: Changed label EMAIL for ADDITIONAL EMAILS

---
 .../individual/individual-contactInfo.ftl       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
index 2851c791..ae4ca902 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
@@ -3,10 +3,10 @@
 <#-- Contact info on individual profile page -->
 
 <#-- Primary Email -->    
-<@emailLinks "${core}primaryEmail" "primary-email" />
+<@emailLinks "${core}primaryEmail" />
 
 <#-- Additional Emails --> 
-<@emailLinks "${core}email" "additional-emails" />   
+<@emailLinks "${core}email"  />   
   
 <#-- Phone --> 
 <#assign phone = propertyGroups.getPropertyAndRemoveFromList("${core}phoneNumber")!>
@@ -24,10 +24,17 @@
     </#if>
 </#if>
 
-<#macro emailLinks property listId>
-    <#assign email = propertyGroups.getPropertyAndRemoveFromList(property)!>      
+<#macro emailLinks property>
+    <#assign email = propertyGroups.getPropertyAndRemoveFromList(property)!>    
+    <#if property == "${core}primaryEmail">
+        <#local listId = "primary-email">
+        <#local label = "Primary Email">
+    <#else>
+        <#local listId = "additional-emails">
+        <#local label = "Additional Emails">
+    </#if>     
     <#if email?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
-        <@p.addLinkWithLabel email editable />
+        <@p.addLinkWithLabel email editable label/>
         <#if email.statements?has_content> <#-- if there are any statements -->
             <ul id="${listId}" class="individual-emails" role="list">
                 <#list email.statements as statement>