From 57d3d0df795098e2311b7b2790db96adf9005a7e Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 11 Feb 2011 15:17:01 +0000 Subject: [PATCH] Merge r7446 from nihvivo-rel-1.2-maint --- .../freemarker/body/partials/individual/lib-properties.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 5ff1e501f..4c817e8cf 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl @@ -81,17 +81,17 @@ Assumes property is non-null. --> we need to also show the property label. If no label is specified, the property name will be used as the label. --> <#macro addLinkWithLabel property editable label="${property.name?capitalize}"> - <#local addLink><@addLink property editable /> + <#local addLink><@addLink property editable label /> <#if addLink?has_content>

${label} ${addLink}

-<#macro addLink property editable> +<#macro addLink property editable label="${property.name}"> <#if editable> <#local url = property.addUrl> <#if url?has_content> - add + add