diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index a18fefc9..faf1be46 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -73,13 +73,24 @@ <#-- Label --> <@p.label individual editable /> - <#-- Most-specific types --> - <@p.mostSpecificTypes individual /> + <#-- Display preferredTitle if it exists; otherwise mostSpecificTypes --> + <#assign title = propertyGroups.pullProperty("${core}preferredTitle")!> + <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> + <@p.addLinkWithLabel title editable /> + <#list title.statements as statement> + ${statement.value} + <@p.editingLinks "${title.name}" statement editable /> + #list> + #if> + <#-- If preferredTitle is unpopulated, display mostSpecificTypes --> + <#if ! (title.statements)?has_content> + <@p.mostSpecificTypes individual /> + #if> #if> <#-- Positions --> - <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!> + <#assign positions = propertyGroups.pullProperty("${core}personInPosition")!> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <@p.objectPropertyListing positions editable /> #if> @@ -89,7 +100,7 @@ <#include "individual-overview.ftl"> <#-- Research Areas --> - <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> + <#assign researchAreas = propertyGroups.pullProperty("${core}hasResearchArea")!> <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <@p.objectPropertyListing researchAreas editable /> #if> diff --git a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl index 359132ea..3ff43688 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl @@ -9,7 +9,7 @@ <@emailLinks "${core}email" /> <#-- Phone --> -<#assign phone = propertyGroups.getPropertyAndRemoveFromList("${core}phoneNumber")!> +<#assign phone = propertyGroups.pullProperty("${core}phoneNumber")!> <#if phone?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <@p.addLinkWithLabel phone editable /> <#if phone.statements?has_content> <#-- if there are any statements --> @@ -25,7 +25,7 @@ #if> <#macro emailLinks property> - <#assign email = propertyGroups.getPropertyAndRemoveFromList(property)!> + <#assign email = propertyGroups.pullProperty(property)!> <#if property == "${core}primaryEmail"> <#local listId = "primary-email"> <#local label = "Primary Email"> diff --git a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl index b67e17f7..584bcbc9 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl @@ -10,7 +10,7 @@