Moved property group menu to a separate template. Some code cleanup.

webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPreprocessor.java

@@ -17,8 +17,7 @@ public abstract class BaseObjectPropertyDataPreprocessor implements
         this.objectPropertyTemplateModel = optm;
         this.wdf = wdf;
     }
-    
+        
-    
     @Override
     public void process(List<Map<String, String>> data) {
         for (Map<String, String> map : data) {

webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java

@@ -25,12 +25,6 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     
     private static final Log log = LogFactory.getLog(ObjectPropertyTemplateModel.class);      
     private static final String TYPE = "object";
-    /* NB The default preprocessor is not the same as the preprocessor for the default view. The latter
-     * actually defines its own preprocessor, whereas the default preprocessor is used for custom views
-     * that don't define a preprocessor.
-     */
-    private static final String DEFAULT_PREPROCESSOR = 
-        "edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.BaseObjectPropertyDataPreprocessor";
 
     private PropertyListConfig config;
 

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

@@ -56,13 +56,13 @@
                 <p><a href="${relatedSubject.url}">&larr; return to ${relatedSubject.name}</a></p>                
             <#else>
                 <#-- Label -->
-                    <h1 class="fn">${individual.name}
+                <h1 class="fn">${individual.name}
                         
                 <#-- Moniker -->
                 <#if individual.moniker?has_content>
                         <span class="preferred-title">${individual.moniker}</span>                  
                 </#if>
-                    </h1>
+                </h1>
             </#if>
                
             <h2>Current Positions</h2>
@@ -114,19 +114,9 @@
     </section>
 </section>
 
+<#-- Property group menu -->
 <#assign nameForOtherGroup = "other">
-<nav id="property-group-menus" role="navigation">
+<#include "individual-propertyGroupMenu.ftl">
-    <ul role="list">
-        <#list propertyGroups as group>
-            <#assign groupname = group.name(nameForOtherGroup)>
-            <#if groupname?has_content>
-                <#-- capitalize will capitalize each word in the name; cap_first only the first. We may need a custom
-                function to capitalize all except function words. -->
-                <li role="listitem"><a href="#${groupname}">${groupname?capitalize}</a></li>
-            </#if>
-        </#list>
-    </ul>
-</nav>
 
 <#-- Ontology properties -->
 <#include "individual-properties.ftl">

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

@@ -0,0 +1,17 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for property group menu on individual profile page -->
+
+<#assign nameForOtherGroup = nameForOtherGroup!"other">
+<nav id="property-group-menus" role="navigation">
+    <ul role="list">
+        <#list propertyGroups as group>
+            <#assign groupname = group.name(nameForOtherGroup)>
+            <#if groupname?has_content>
+                <#-- capitalize will capitalize each word in the name; cap_first only the first. We may need a custom
+                function to capitalize all except function words. -->
+                <li role="listitem"><a href="#${groupname}">${groupname?capitalize}</a></li>
+            </#if>
+        </#list>
+    </ul>
+</nav>