Merge r7446 from nihvivo-rel-1.2-maint

This commit is contained in:
rjy7 2011-02-11 15:17:01 +00:00
parent bb984ccaea
commit 57d3d0df79

View file

@ -81,17 +81,17 @@ Assumes property is non-null. -->
we need to also show the property label. If no label is specified, the property we need to also show the property label. If no label is specified, the property
name will be used as the label. --> name will be used as the label. -->
<#macro addLinkWithLabel property editable label="${property.name?capitalize}"> <#macro addLinkWithLabel property editable label="${property.name?capitalize}">
<#local addLink><@addLink property editable /></#local> <#local addLink><@addLink property editable label /></#local>
<#if addLink?has_content> <#if addLink?has_content>
<h2 id="${property.localName}">${label} ${addLink}</h2> <h2 id="${property.localName}">${label} ${addLink}</h2>
</#if> </#if>
</#macro> </#macro>
<#macro addLink property editable> <#macro addLink property editable label="${property.name}">
<#if editable> <#if editable>
<#local url = property.addUrl> <#local url = property.addUrl>
<#if url?has_content> <#if url?has_content>
<a class="add-${property.localName}" href="${url}" title="Add new ${property.name}"><img class="add-individual" src="${urls.images}/individual/addIcon.gif" alt="add" /></a> <a class="add-${property.localName}" href="${url}" title="Add new ${label?lower_case}"><img class="add-individual" src="${urls.images}/individual/addIcon.gif" alt="add" /></a>
</#if> </#if>
</#if> </#if>
</#macro> </#macro>