NIHVIVO-1333 Display of uncollated object property statements with default view

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

@@ -2,8 +2,6 @@
 
 <#-- Template for property listing on individual profile page -->
 
-<#assign propertyGroups = individual.propertyList>
-
 <#list propertyGroups as group>
 
     <#-- Get the group name -->
@@ -42,9 +40,10 @@
                         </#list>
                         
                     <#else> <#-- object property -->      
-                        <p>Collated? ${property.collatedBySubclass?string("yes", "no")}</p>
-                        <#if ! property.collatedBySubclass> <#-- temporary, till we handle collated props -->
+                        <#if ! property.collatedBySubclass> 
                             <#include "${property.template}">
+                        <#else>
+                            <#include "objectPropertyList-collated.ftl">
                         </#if>
                     </#if>                   
                 </div> <!-- end property -->               

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

@@ -12,6 +12,9 @@
 <#if editStatus.showAdminPanel>
     <#include "individual-adminPanel.ftl">
 </#if>
+
+<#-- Manolo, please do not remove this line. Thanks! -->
+<#assign propertyGroups = individual.propertyList>
     
 <section id="individual-intro-person" class="vcard">
     <div id="individual-intro-left-content"> 

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

@@ -0,0 +1,5 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for collated object property statement list -->
+
+<p>Display of collated object property statements is in progress.</p>

webapp/web/templates/freemarker/body/individual/objectPropertyList-default.ftl

@@ -4,6 +4,6 @@
 
 <#list property.statements as statement>
     <div class="obj-prop-stmt-obj">
-        statement ${statement_index +1}
+       <a href="${statement.object.url}">${statement.object.name}</a> ${statement.object.moniker!} 
     </div> <!-- end obj-prop-stmt-obj -->
 </#list>

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

@@ -46,6 +46,8 @@
 
 <p><strong>Berries: </strong>${berries}</p>
 
+<p>${year?number?c}</p>
+
 <@dump var="now" />
 <@dump var="urls" />
 <@dump var="fruit" />