From 55c2f8f21362936666814d8e19b45aae6e135143 Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 23 Jun 2011 14:41:42 +0000
Subject: [PATCH] NIHVIVO-2584: Added core:primaryEmail to individual foaf
 person template

---
 .../individual/individual-contactInfo.ftl     | 20 +++++++++++++++++--
 themes/wilma/css/wilma.css                    |  7 ++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
index 892538ed..d50e8af8 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl
@@ -2,12 +2,28 @@
 
 <#-- Contact info on individual profile page -->
 
-<#-- Email -->    
+<#-- Primary Email -->    
+<#assign primaryEmail = propertyGroups.getPropertyAndRemoveFromList("${core}primaryEmail")!>      
+<#if primaryEmail?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
+    <@p.addLinkWithLabel primaryEmail editable />
+    <#if primaryEmail.statements?has_content> <#-- if there are any statements -->
+        <ul id="primary-email" class="individual-emails" role="list">
+            <#list primaryEmail.statements as statement>
+                <li role="listitem">
+                    <img class ="icon-email middle" src="${urls.images}/individual/emailIcon.gif" alt="email icon" /><a class="email" href="mailto:${statement.value}">${statement.value}</a>
+                    <@p.editingLinks "${primaryEmail.localName}" statement editable />
+                </li>
+            </#list>
+        </ul>
+    </#if>
+</#if>
+
+<#-- Additional Emails -->    
 <#assign email = propertyGroups.getPropertyAndRemoveFromList("${core}email")!>      
 <#if email?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
     <@p.addLinkWithLabel email editable />
     <#if email.statements?has_content> <#-- if there are any statements -->
-        <ul id="individual-email" role="list">
+        <ul id="additional-emails" class="individual-emails" role="list">
             <#list email.statements as statement>
                 <li role="listitem">
                     <img class ="icon-email middle" src="${urls.images}/individual/emailIcon.gif" alt="email icon" /><a class="email" href="mailto:${statement.value}">${statement.value}</a>
diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index 14b2c959..1a618fa6 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -1230,17 +1230,14 @@ ul#individual-tools li a {
 ul.individual-urls {
     list-style: url(../../../images/individual/arrow-grey.gif);
 }
-ul#individual-email, 
+
 ul#individual-phone {
     list-style-type: none;
 }
-ul#individual-email li, 
 ul#individual-phone li {
     line-height: 1.6em;
 }
-ul#individual-email li:last-child {
-    margin-bottom: 15px;
-}
+
 ul.individual-urls li {
     font-size: .875em;
     line-height: 1.6em;