From 2111854d74a4ce508c1914f8be8e3ba6982c39f7 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 4 Jan 2011 17:03:53 +0000
Subject: [PATCH] NIHVIVO-1459 Create generic individual.ftl template by
 stripping away person-specific code.

---
 .../freemarker/body/individual/individual.ftl | 61 +------------------
 .../individual/individual-properties.ftl      |  4 +-
 2 files changed, 5 insertions(+), 60 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl
index 9b9b8da72..7bb07a1b6 100644
--- a/webapp/web/templates/freemarker/body/individual/individual.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual.ftl
@@ -33,26 +33,6 @@
                 <li role="listitem"><a class="icon-rdf" href="#">RDF</a></li>
             </ul>
         </nav>
-            
-        <#-- Email -->    
-        <#assign email = propertyGroups.getPropertyAndRemoveFromList("${core}email")!>
-        <#if email?has_content>
-            <ul>
-                <#list email.statements as statement>
-                    <li><a class="email" href="#"><span class ="picto-font  picto-email">M</span> ${statement.value}</a></li>
-                </#list>
-            </ul>
-        </#if>
-          
-        <#-- Phone --> 
-        <#assign phone = propertyGroups.getPropertyAndRemoveFromList("${core}phoneNumber")!>
-        <#if phone?has_content>
-            <ul>
-                <#list phone.statements as statement>
-                    <li><a class="tel" href="#"><img class ="icon-phone" src="${urls.images}/individual/phone-icon.gif" alt="phone icon" />${statement.value}</a></li>
-                </#list>
-            </ul>
-        </#if>      
                 
         <#-- Links -->
         <nav role="navigation">
@@ -80,16 +60,6 @@
                     </#if>
                 </h1>
             </#if>
-               
-            <#-- Positions -->
-            <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!>
-            <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
-                <h2>Positions</h2>
-                <ul id ="individual-positions" role="list">
-                    <@p.objectPropertyList positions.statements positions.template />
-                </ul>
-            </#if>
-        </header>
          
         <#-- Overview -->
         <#assign overview = propertyGroups.getPropertyAndRemoveFromList("${core}overview")!> 
@@ -98,16 +68,7 @@
                 <p class="individual-overview">${statement.value}</p>
             </#list>
         </#if>
-        
-        <#-- Research Areas -->
-        <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> 
-        <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
-            <h2>Research Areas</h2>                   
-            <ul id="individual-areas" role="list">
-                <@p.simpleObjectPropertyList researchAreas />
-            </ul>
-        </#if>
-                
+   
     </section>
 </section>
 
@@ -115,7 +76,8 @@
     <section id="sparklines-publications" role="region">
          <#include "individual-sparklineVisualization.ftl">
          
-         <#-- RY Move out of this template when it's converted to individual--foaf-person.ftl. Will we have an organization-specific individual template? -->
+         <#-- RY Will we have an individual--foaf-organization.ftl template? If so, move this there and remove from here.
+         Also remove the method IndividualTemplateModel.isOrganization(). -->
          <#if individual.organization >
 	     	<div style="width: 100%;">
 				<div style="width: 30%;float:left;margin-top: 5%;margin-right: 10px;"><img src="${urls.images}/visualization/temporal_vis_icon.jpg"/></div>
@@ -124,23 +86,6 @@
 			<#--<div>VISMODE: ${individual.moniker}</div>-->
 		</#if>
     </section>
-    
-    <section id="co-authors" role="region">
-        <header>
-            <h3><span class="grey">10 </span>Co-Authors</h3>
-        </header>
-        
-        <ul role="list">
-            <li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Bacall.jpg" /></a></li>
-            <li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Bogart.jpg" /></a></li>
-            <li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Gable.jpg" /></a></li>
-            <li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Grant.jpg" /></a></li>
-            <li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Leigh.jpg" /></a></li>
-            <li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Welles.jpg" /></a></li>
-        </ul>
-        
-        <p class="view-all-coauthors"><a class="view-all-style" href="#">View All <span class="pictos-arrow-10">4</span></a></p>
-    </section>
 </section>
 
 <#-- Property group menu -->
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 1685cf6fe..626ea6776 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
@@ -19,13 +19,13 @@
         <#if groupname?has_content>
             <h2><a name="${groupname}"></a>${groupname?capitalize}</h2>
         </#if>
-        
+
         <#-- List the properties in the group -->        
         <#list group.properties as property>
             <article class="property" role="article">
                 <#-- Property display name -->
                 <h3>${property.name}</h3>
-                    
+
                 <#-- List the statements for each property -->   
                 <ul class="property-list" role="list"> 
                     <#-- data property -->