NIHVIVO-2264 Modify addLinkWithLabel macro so header is displayed whenever a user is editing the page, even if no add link is provided.

This commit is contained in:
ryounes 2011-06-24 15:16:18 +00:00
parent aa04e188a2
commit 851eb31119

View file

@ -85,9 +85,16 @@ name will be used as the label. -->
<#macro addLinkWithLabel property editable label="${property.name?capitalize}" extraParams=""> <#macro addLinkWithLabel property editable label="${property.name?capitalize}" extraParams="">
<#local addLink><@addLink property editable label extraParams /></#local> <#local addLink><@addLink property editable label extraParams /></#local>
<#local verboseDisplay><@verboseDisplay property /></#local> <#local verboseDisplay><@verboseDisplay property /></#local>
<#-- Display the label when user is in edit mode, even if there's no add link (due to
displayLimitAnnot, for example). Otherwise the display looks odd, since neighboring
properties have labels.
<#if addLink?has_content || verboseDisplay?has_content> <#if addLink?has_content || verboseDisplay?has_content>
<h2 id="${property.localName}">${label} ${addLink!} ${verboseDisplay!}</h2> <h2 id="${property.localName}">${label} ${addLink!} ${verboseDisplay!}</h2>
</#if> </#if>
-->
<#if editable>
<h2 id="${property.localName}">${label} ${addLink!} ${verboseDisplay!}</h2>
</#if>
</#macro> </#macro>
<#macro addLink property editable label="${property.name}" extraParams=""> <#macro addLink property editable label="${property.name}" extraParams="">