From e65f567fce387ebf4c10b4b61c96874b5709dfab Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 4 Jan 2011 15:02:11 +0000
Subject: [PATCH] NIHVIVO-1491 Display person's positions at top of page

---
 .../freemarker/body/individual/individual.ftl   | 17 ++++++++---------
 .../body/partials/individual/lib-properties.ftl |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl
index ca24b38a5..b8490c308 100644
--- a/webapp/web/templates/freemarker/body/individual/individual.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual.ftl
@@ -84,20 +84,19 @@ annotaiton has been implemented. -->
                 </h1>
             </#if>
                
-            <#-- Current positions -->
-            <#assign positions = propertyGroups.getProperty("${core}personInPosition")!>
-            <#if positions?has_content> <#-- true when the property is in the list, even if there are no statements (when editing) -->
-                <h2>Current Positions</h2>
+            <#-- Positions -->
+            <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!>
+            <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
+                <h2>Positions</h2>
                 <ul id ="individual-positions" role="list">
-                    <@p.objectProperty positions />
+                    <@p.objectPropertyList positions.statements positions.template />
                 </ul>
             </#if>
-
         </header>
          
         <#-- Overview -->
         <#assign overview = propertyGroups.getPropertyAndRemoveFromList("${core}overview")!> 
-        <#if overview?has_content> <#-- true when the property is in the list, even if there are no statements (when editing) -->
+        <#if overview?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
             <#list overview.statements as statement>
                 <p class="individual-overview">${statement.value}</p>
             </#list>
@@ -105,10 +104,10 @@ annotaiton has been implemented. -->
         
         <#-- Research Areas -->
         <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> 
-        <#if researchAreas?has_content> <#-- true when the property is in the list, even if there are no statements (when editing) -->
+        <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
             <h2>Research Areas</h2>                   
             <ul id="individual-areas" role="list">
-                <@p.objectProperty researchAreas />
+                <@p.simpleObjectPropertyList researchAreas />
             </ul>
         </#if>
                 
diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
index 3fe59fedd..82d99ce72 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
@@ -22,7 +22,7 @@
     </#list>
 </#macro>
 
-<#macro objectProperty property>
+<#macro simpleObjectPropertyList property>
     <@objectPropertyList property.statements "propStatement-simple.ftl" />
 </#macro>