NIHVIVO-650: Links and image display; fixed a bug in admin panel display.

This commit is contained in:
rjy7 2010-09-21 19:49:43 +00:00
parent e2407f7b01
commit 7b58a73c67
4 changed files with 26 additions and 15 deletions

View file

@ -3,6 +3,7 @@
<#-- Template for individual profile page -->
<#import "lib-property.ftl" as p>
<#import "lib-list.ftl" as l>
<#assign editingClass>
<#if editStatus.showEditLinks>editing<#else></#if>
@ -36,6 +37,7 @@
<#include "individual-sparklineVisualization.ftl">
<#-- Thumbnail -->
<div id="dprop-vitro-image" class="propsItem ${editingClass}">
<#if individual.thumbUrl??>
<@p.dataPropsWrapper id="thumbnail">
@ -47,14 +49,28 @@
</@p.dataPropsWrapper>
<#elseif individual.person>
<@p.dataPropsWrapper id="thumbnail">
<img src="${urls.images}/dummyImages/person.thumbnail.jpg"
alt="placeholder image" width="115" />
<img src="${urls.images}/dummyImages/person.thumbnail.jpg"
title = "no image" alt="placeholder image" width="115" />
</@p.dataPropsWrapper>
</#if>
</div>
<#-- Links -->
<#if individual.links?has_content>
<div id="dprop-vitro-links" class="propsItem ${editingClass}">
<ul class="externalLinks properties">
<#list individual.links as link>
<@l.firstLastList>
<li>
<span class="statementWrap">
<a class="externalLink" href="${link.url}">${link.anchor}</a>
</span>
</li>
</@l.firstLastList>
</#list>
</ul>
</div>
</#if>
</div> <!-- #contents -->
</div> <!-- #personWrap -->

View file

@ -6,6 +6,6 @@
<h3 class="toggle">Admin Panel</h3>
<div class="panelContents">
<a href="${editStatus.editingUrl}"> edit this individual</a>
<p>Resource URI: ${individual.URI}</p>
<p>Resource URI: ${individual.uri}</p>
</div>
</div>