From 8792d6adecb68a8a57b73d725f5168784748849a Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 23 Dec 2010 18:48:45 +0000
Subject: [PATCH] NIHVIVO-1510 Fixed markup on collated property display

---
 .../partials/individual/individual-properties.ftl    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
index a54eb03bd..8f3663857 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
@@ -31,9 +31,9 @@
                         <@dataPropertyList property.statements />
 
                     <#-- object property -->      
-                    <#elseif property.collatedBySubclass>                             
+                    <#elseif property.collatedBySubclass> <#-- collated -->                            
                         <@collatedObjectPropertyList property />
-                    <#else>
+                    <#else> <#-- uncollated -->
                         <@objectPropertyList property.statements property.template />
                     </#if>  
                 </ul>                 
@@ -55,8 +55,12 @@
 <#macro collatedObjectPropertyList property>
     <#assign subclasses = property.subclasses>
     <#list subclasses?keys as subclass>
-        <h3>${subclass?lower_case}</h3>
-        <@objectPropertyList subclasses[subclass] property.template /> 
+        <li>
+            <h3>${subclass?lower_case}</h3>
+            <ul>
+                <@objectPropertyList subclasses[subclass] property.template /> 
+            </ul>
+        </li>
     </#list>
 </#macro>