From f243f48b3b8a35e2118476c95ec8f158275f988a Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 25 Jan 2011 17:32:45 +0000
Subject: [PATCH] NIHVIVO-1895 Show placeholder image for non-person individual
 when displaying an add link for an image

---
 .../freemarker/body/individual/individual-vitro.ftl  |  7 ++++++-
 .../body/partials/individual/lib-properties.ftl      | 12 ++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl b/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
index fa9bc9d99..e35f99593 100644
--- a/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
@@ -5,7 +5,12 @@
 <section id="individual-intro" class="vcard" role="region">
     
     <#-- Image -->
-    <@p.imageLinks individual propertyGroups namespaces editable />
+    <@p.imageLinks individual=individual 
+                   propertyGroups=propertyGroups 
+                   namespaces=namespaces 
+                   editable=editable 
+                   showPlaceholder="with_add_link" 
+                   placeholder="${urls.images}/placeholders/person.thumbnail.jpg" />
     
     <section id="individual-info" role="region">
         <#if individual.showAdminPanel>
diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
index 46f7df73a..59d503966 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
@@ -118,7 +118,8 @@ name will be used as the label. -->
 </#macro>
 
 <#-- Main image links -->
-<#macro imageLinks individual propertyGroups namespaces editable placeholderImage="">
+<#-- Values for showPlaceholderImage: "always", "never", "with_add_link" -->
+<#macro imageLinks individual propertyGroups namespaces editable showPlaceholder="never" placeholder="">
     <#local mainImage = propertyGroups.getPropertyAndRemoveFromList("${namespaces.vitroPublic}mainImage")!>    
     <#local thumbUrl = individual.thumbUrl!>  
     <#-- Don't assume that if the mainImage property is populated, there is a thumbnail image (though that is the general case).
@@ -127,9 +128,12 @@ name will be used as the label. -->
         <a href="${individual.imageUrl}"><img class="individual-photo" src="${thumbUrl}" title="click to view larger image" alt="${individual.name}" width="160" /></a>            
         <@p.editingLinks "${mainImage.localName}" mainImage.statements[0] editable />
     <#else>
-        <@p.addLinkWithLabel mainImage editable "Photo" /> 
-        <#if placeholderImage?has_content>
-            <img class="individual-photo" src="${placeholderImage}" title = "no image" alt="placeholder image" width="160" /> 
+        <#local imageLabel><@p.addLinkWithLabel mainImage editable "Photo" /></#local>
+        ${imageLabel}
+        <#if placeholder?has_content>
+            <#if showPlaceholder == "always" || (showPlaceholder="with_add_link" && imageLabel?has_content)>
+                <img class="individual-photo" src="${placeholder}" title = "no image" alt="placeholder image" width="160" /> 
+            </#if>
         </#if>                                                      
     </#if>
 </#macro>