From c633d3fbd0d46d3b2b137b339bec2e52d401ad46 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 27 Jan 2011 16:07:55 +0000
Subject: [PATCH] Moved display of personInPosition and hasResearchArea
 properties to a macro. Adjusted css selectors accordingly to align with
 auto-generated ids.

---
 .../body/individual/individual--foaf-person.ftl    | 14 ++------------
 themes/wilma/css/wilma.css                         | 14 +++++++-------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
index b9789d42..778282fc 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -111,12 +111,7 @@
                
             <#-- 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 id="${positions.localName}">${positions.name?capitalize} <@p.addLink positions editable /></h2>
-                <ul id="individual-positions" role="list">
-                    <@p.objectProperty positions editable />
-                </ul>
-            </#if>
+            <@p.objectPropertyListing positions editable />
         </header>
          
         <#-- Overview -->
@@ -124,12 +119,7 @@
         
         <#-- Research Areas -->
         <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> 
-        <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
-            <h2 id="${researchAreas.localName}">${researchAreas.name?capitalize} <@p.addLink researchAreas editable /></h2>                
-            <ul id="individual-areas" role="list">
-                <@p.objectProperty researchAreas editable "propStatement-simple.ftl" />
-            </ul>
-        </#if>
+        <@p.objectPropertyListing researchAreas editable />
     </section>
     
 </section>
diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index 03b1473b..718ec7ba 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -1078,14 +1078,14 @@ h1.fn .preferred-title {
     font-size: 1.125em;
     line-height: 1.2em;
 }
-ul#individual-positions{
+ul#individual-personInPosition {
     font-size: 1em;
     list-style: url("../../../images/individual/arrow-green.gif");
 }
-ul#individual-positions li{
+ul#individual-personInPosition li{
     line-height: 1.8em;
 }
-ul#individual-positions li a{
+ul#individual-personInPosition li a{
     color: #2485ae;
 }
 .individual-overview{
@@ -1094,16 +1094,16 @@ ul#individual-positions li a{
     padding-top: 10px;
     width: 100%;
 }
-ul#individual-areas{
+ul#individual-hasResearchArea{
     padding-bottom: 24px;
 }
-ul#individual-areas li{
+ul#individual-hasResearchArea li{
     border-right: 1px solid #A6B1B0;
 }
-ul#individual-areas li:last-child{
+ul#individual-hasResearchArea li:last-child{
     border-right: none;
 }
-ul#individual-areas li a{
+ul#individual-hasResearchArea li a{
     color: #2485ae;
 }
 /* INDIVIDUAL VISUALIZATION ------>  */