NIHVIVO-1335, NIHVIVO-1510 Working on authorship list view and collated object properties: some reorganization to handle collated properties, but not displaying as collated yet.

webapp/web/templates/freemarker/body/individual/individual.ftl

@@ -37,13 +37,11 @@
         <#-- Links -->
         <nav role="navigation">
             <ul id ="individual-urls-people" role="list">
-            <#if individual.links?has_content>
-                <@l.firstLastList>
-                    <#list individual.links as link>                        
-                        <li role="listitem"><a href="${link.url}">${link.anchor}</a></li>
-                        </#list>
-                </@l.firstLastList>
-            </#if>              
+            <@l.firstLastList>
+                <#list individual.links as link>                               
+                    <li role="listitem"><a href="${link.url}">${link.anchor}</a></li>                                 
+                </#list>
+            </@l.firstLastList>          
             </ul>
         </nav>
     </section>

webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl

@@ -7,7 +7,11 @@
     <#assign groupname = group.name(nameForOtherGroup)>
     
     <section class="property-group" role="region">
-        <nav class="scroll-up" role="navigation"><a href="#property-nav"><img src="${urls.images}/individual/scroll-up.png" alt="scroll to property group menus" /></a></nav>
+        <nav class="scroll-up" role="navigation">
+            <a href="#property-nav">
+                <img src="${urls.images}/individual/scroll-up.png" alt="scroll to property group menus" />
+            </a>
+        </nav>
    
         <#-- Display the group heading --> 
         <#if groupname?has_content>
@@ -24,16 +28,41 @@
                 <ul class="property-list" role="list"> 
                     <#-- data property -->  
                     <#if property.type == "data"> 
-                        <#include "dataPropertyList-statements.ftl">               
+                        <@dataPropertyList property.statements />
 
                     <#-- object property -->      
                     <#elseif property.collatedBySubclass>                             
-                        <#include "objectPropertyList-collated.ftl">
+                        <@objectPropertySubclassList property />
                     <#else>
-                        <#include "objectPropertyList-statements.ftl">
+                        <@objectPropertyList property.statements property.template />
                     </#if>  
                 </ul>                 
             </article> <!-- end property -->             
         </#list>                    
     </section> <!-- end property-group -->
 </#list> 
+
+<#-----------------------------------------------------------------------------
+    Macros for generating property lists
+------------------------------------------------------------------------------>
+
+<#macro dataPropertyList statements>
+    <#list statements as statement>
+        <li role="listitem">${statement.value}</li>
+    </#list> 
+</#macro>
+
+<#macro objectPropertySubclassList property>
+    <#list property.subclasses as subclass>
+        <h3>${subclass}</h3>
+        <@objectPropertyList subclass.statements property.template />
+    </#list>
+</#macro>
+
+<#macro objectPropertyList statements template>
+    <#list statements as statement>
+        <li role="listitem">
+            <#include "${template}">
+        </li>
+    </#list>
+</#macro>

webapp/web/templates/freemarker/body/partials/individual/objectPropertyList-collated.ftl

@@ -2,4 +2,9 @@
 
 <#-- Template for collated object property statement list -->
 
-<p>Display of collated object property statements is in progress.</p>
+<p>Display of collated object property statements is in progress.</p>
+
+<#list property.subclasses as subclass>
+    <h3>${subclass}</h3>
+    <@listStatements subclass.statements />
+</#list>

webapp/web/templates/freemarker/body/partials/individual/objectPropertyList-statements.ftl

@@ -2,7 +2,7 @@
 
 <#-- Template to list statements for an object property -->
 
-<#list property.statements as statement>
+<#list statements as statement>
     <li role="listitem">
         <#include "${property.template}">
     </li>

webapp/web/templates/freemarker/body/partials/individual/objectPropertyList-uncollated.ftl

@@ -0,0 +1,6 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for uncollated object property statement list -->
+
+<#assign statements = property.statements>
+<#include "objectPropertyList-statements.ftl">