litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge r7065, r7066 from the release 1.2 maintenance branch

Browse source
This commit is contained in:
jeb228 2011-01-17 14:58:37 +00:00
parent adbdee50ed
commit 940fe03123
4 changed files with 49 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,12 +118,12 @@ name will be used as the label. -->
<#-- Don't assume that if the mainImage property is populated, there is a thumbnail image (though that is the general case).
If there's a mainImage statement but no thumbnail image, treat it as if there is no image. -->
<#if (mainImage.statements)?has_content && thumbUrl?has_content>
<a href="${individual.imageUrl}"><img class="individual-photo2" src="${thumbUrl}" title="click to view larger image" alt="${individual.name}" width="115" /></a>
<a href="${individual.imageUrl}"><img class="individual-photo" src="${thumbUrl}" title="click to view larger image" alt="${individual.name}" width="115" /></a>
<@p.editingLinks mainImage.statements[0] showEditLinks />
<#else>
<@p.addLinkWithLabel mainImage showEditLinks "Photo" />
<#if placeholderImage?has_content>
<img class="individual-photo2" src="${placeholderImage}" title = "no image" alt="placeholder image" width="115" />
<img class="individual-photo" src="${placeholderImage}" title = "no image" alt="placeholder image" width="115" />
</#if>
</#if>