NIHVIVO-1322 Separated IndividualTemplateModel into two classes, one for profile page and one for listing individuals in the context of search, browse, menupages, etc. The needs of the two cases are quite different.

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

@@ -63,13 +63,7 @@
         </nav>
                 
         <#-- Links -->
-        <nav role="navigation">
-            <ul id ="individual-urls" role="list">
-                <#list individual.links as link>                               
-                    <li role="listitem"><a href="${link.url}">${link.anchor}</a></li>                                 
-                </#list>         
-            </ul>
-        </nav>
+        <#include "individual-links.ftl">
     </section>
 </section>
 

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

@@ -0,0 +1,15 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for links on individual profile 
+
+     Currently the page displays the vitro namespace links properties. Future versions 
+     will use the vivo core ontology links property, eliminating the need for special handling.
+-->
+
+<nav role="navigation">
+    <ul id ="individual-urls" role="list">
+        <#list individual.links as link>                               
+            <li role="listitem"><a href="${link.url}">${link.anchor}</a></li>                                 
+        </#list>         
+    </ul>
+</nav>

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

@@ -76,4 +76,6 @@ we need to also show the property label. -->
     <#if url?has_content>
         <a href="${url}" title="delete this relationship"><img  class="delete-individual" src="${urls.images}/individual/deleteIcon.gif" alt="delete" /></a>
     </#if>
-</#macro>
+</#macro>
+
+<#-- Macros for specific properties -->