From d1776d766c291024fb68cd6df398df0f7f234110 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Sun, 6 Feb 2011 02:16:26 +0000
Subject: [PATCH] NIHVIVO-1709 Now using preferred title (if populated) next to
 person's name at the top of the page in lieu of the moniker

---
 .../body/individual/individual--foaf-person.ftl | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
index 262f02d5..86f557ab 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -95,15 +95,24 @@
         <header>
             <#if relatedSubject??>
                 <h2>${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}</h2>
-                <p><a href="${relatedSubject.url}">&larr; return to ${relatedSubject.name}</a></p>                
+                <p><a href="${relatedSubject.url}">&larr; return to ${relatedSubject.name}</a></p>
             <#else>                
                 <h1 class="fn foaf-person">
                     <#-- Label -->
                     <@p.label individual editable />
                         
-                    <#-- Moniker -->
-                    <#if individual.moniker?has_content>
-                        <span class="preferred-title">${individual.moniker}</span>                  
+                    <#-- Moniker / Preferred Title -->
+                    <#-- Use Preferred Title over Moniker if it is populated -->
+                    <#assign hasPreferredTitle = p.hasStatements(propertyGroups, "${core}preferredTitle") />
+                    <#if hasPreferredTitle || individual.moniker?has_content>
+                        <span class="preferred-title">
+                            <#if hasPreferredTitle>
+                                <#assign preferredTitle = propertyGroups.getProperty("${core}preferredTitle")! />
+                                ${preferredTitle.statements[0].value}
+                            <#else>
+                                ${individual.moniker}
+                            </#if>
+                        </span>
                     </#if>
                 </h1>
             </#if>