NIHVIVO-650 Display image on new (Freemarker) individual profile page. Add <@url /> directive to generate img src value.

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

@@ -2,12 +2,18 @@
 
 <#-- Template for individual profile page -->
 
+<#import "lib-property.ftl" as p>
+
+<#assign editingClass>
+    <#if editStatus.showEditLinks>editing<#else></#if>
+</#assign>
+
 <div id="personWrap">
     <#if editStatus.showAdminPanel>
         <#include "individual-adminPanel.ftl">
     </#if>
     
-    <div class="contents entity <#if editStatus.showEditLinks>editing</#if>">
+    <div class="contents entity ${editingClass}">
         <div id="labelAndMoniker">
             
             <#if relatedSubject??>
@@ -15,34 +21,44 @@
                 <p><a href="${relatedSubject.url}">&larr; return to ${relatedSubject.name}</a></p>                
             <#else>
                 <#-- Label -->
-                <div class="datatypePropertyValue" id="label">    
-                    <div class="statementWrap">
-                        <h2>${individual.name}</h2>
-                        <#if editStatus.showEditLinks>                        
-                        </#if>
-                    </div>
-                </div>
+                <@p.dataPropWrapper id="label">
+                    <h2>${individual.name}</h2>
+                </@p.dataPropWrapper>
                 
                 <#-- Moniker -->
                 <#if individual.moniker?has_content>
-                    <div class="datatypeProperties">
-                        <div class="datatypePropertyValue" id="moniker">
-                            <div class="statementWrap">
-                                <em class="moniker">${individual.moniker}</em>               
-                            </div>
-                        </div>
-                    </div>                    
+                    <@p.dataPropsWrapper id="moniker">
+                        <em class="moniker">${individual.moniker}</em>
+                    </@p.dataPropsWrapper>                   
                 </#if>
             </#if>
         </div> <!-- labelAndMoniker -->
 
-       <#include "individual-sparklineVisualization.ftl">
-
+        <#include "individual-sparklineVisualization.ftl">
+       
+        <div id="dprop-vitro-image" class="propsItem ${editingClass}"> 
+            <#if individual.thumbUrl??>
+                <@p.dataPropsWrapper id="thumbnail">
+                    <a class="image" href="${individual.imageUrl}">
+                        <img src="${individual.thumbUrl}" 
+                             title="click to view larger image" 
+                             alt="${individual.name}" width="115" />
+                    </a>
+                </@p.dataPropsWrapper> 
+            <#elseif individual.person>
+                <@p.dataPropsWrapper id="thumbnail">
+                    <img src="<@url path='/images/dummyImages/person.thumbnail.jpg' />" "                         
+                         alt="placeholder image" width="115" />
+                </@p.dataPropsWrapper>             
+            </#if>
+        </div>
+        
+ 
+       
     </div> <!-- #contents -->
 
 </div> <!-- #personWrap -->
 
-
 ${stylesheets.addFromTheme("/entity.css")}
                            
 <#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) -->

webapp/web/templates/freemarker/lib/lib-list.ftl

@@ -15,7 +15,7 @@
             <li>apples</li>
             <li>bananas</li>
             <li>oranges</li>
-        <@firstLastList>
+        </@firstLastList>
 
     RY Consider rewriting in Java. Probably designers won't want to modify this. That would allow us to support
     nested <li> elements.
@@ -51,13 +51,13 @@
             <li>apples</li>,
             <li>bananas</li>,
             <li>oranges</li>
-        <@firstLastListNested>
+        </@firstLastListNested>
         
         <@firstLastListNested delim="??">
             <li>apples, oranges</li>??
             <li>bananas, lemons</li>??
             <li>grapefruit, limes</li>
-        <@firstLastListNested>
+        </@firstLastListNested>
         
         <@firstLastListNested delim="??">
             <li>Books
@@ -72,7 +72,7 @@
                     <li>Time</li>
                 </ul>
             </li>
-        <@firstLastListNested>
+        </@firstLastListNested>
 
     RY Consider rewriting in Java. Probably designers won't want to modify this.
 -->

webapp/web/templates/freemarker/lib/lib-property.ftl

@@ -0,0 +1,43 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Macros for display of individual properties -->
+
+<#-- 
+    Macro: dataPropWrapper
+    
+    Wrap a dataproperty in the appropriate divs
+    
+    Usage: 
+        <@dataPropWrapper id="myId" editStatus=true>
+            <#nested>
+        </@dataPropWrapper>
+-->
+
+<#macro dataPropWrapper id editStatus=false>
+    <div class="datatypePropertyValue" id="${id}">
+        <div class="statementWrap">
+            <#nested>
+        </div>
+    </div>
+</#macro>
+
+<#---------------------------------------------------------------------------->
+
+<#-- 
+    Macro: dataPropsWrapper
+    
+    Wrap a dataproperty in the appropriate divs
+    
+    Usage: 
+        <@dataPropsWrapper id="myId" editStatus=true>
+            <#nested>
+        </@dataPropsWrapper>
+-->
+
+<#macro dataPropsWrapper id editStatus=false>
+    <div class="datatypeProperties">
+        <@dataPropWrapper id=id editStatus=editStatus>
+            <#nested>
+        </@dataPropWrapper>
+    </div>
+</#macro>