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

Revert changes in r8069 since it was messing up display of mainImage in edit mode for individuals with no image

Browse source
This commit is contained in:
ryounes 2011-05-26 14:35:09 +00:00
parent 42c8fe1b39
commit d6bacf0c95
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,17 +81,15 @@ 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}" extraParams=""> <#macro addLinkWithLabel property editable label="${property.name?capitalize}" extraParams="">
<#if property?has_content>
<#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>
<#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>
</#macro> </#macro>
<#macro addLink property editable label="${property.name}" extraParams=""> <#macro addLink property editable label="${property.name}" extraParams="">
<#if property?has_content && editable> <#if editable>
<#local url = property.addUrl> <#local url = property.addUrl>
<#if url?has_content> <#if url?has_content>
<@showAddLink property.localName label addParamsToEditUrl(url, extraParams) /> <@showAddLink property.localName label addParamsToEditUrl(url, extraParams) />
@ -210,7 +208,7 @@ name will be used as the label. -->
Note that this macro has a side-effect in the call to propertyGroups.pullProperty(). Note that this macro has a side-effect in the call to propertyGroups.pullProperty().
--> -->
<#macro image individual propertyGroups namespaces editable showPlaceholder="never" placeholder=""> <#macro image individual propertyGroups namespaces editable showPlaceholder="never" placeholder="">
<#local mainImage = propertyGroups.pullProperty("${namespaces.vitroPublic}fake")!> <#local mainImage = propertyGroups.pullProperty("${namespaces.vitroPublic}mainImage")!>
<#local extraParams = ""> <#local extraParams = "">
<#if placeholder?has_content> <#if placeholder?has_content>
<#local extraParams = { "placeholder" : placeholder } > <#local extraParams = { "placeholder" : placeholder } >