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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-11-13 12:26:54 -05:00
commit 395a032431
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
webapp/web/templates/freemarker/lib/lib-properties.ftl
View file

@ -172,7 +172,7 @@ name will be used as the label. -->
<#if editable > <#if editable >
<#if (!rangeUri?contains("Authorship") && !rangeUri?contains("URL") && !rangeUri?contains("Editorship") && propertyLocalName != "hasResearchArea")> <#if (!rangeUri?contains("Authorship") && !rangeUri?contains("URL") && !rangeUri?contains("Editorship") && propertyLocalName != "hasResearchArea")>
<@editLink propertyLocalName propertyName statement rangeUri/> <@editLink propertyLocalName propertyName statement rangeUri/>
<@deleteLink propertyLocalName propertyName statement /> <@deleteLink propertyLocalName propertyName statement rangeUri/>
</#if> </#if>
</#if> </#if>
</#macro> </#macro>
@ -202,20 +202,20 @@ name will be used as the label. -->
<a class="edit-${propertyLocalName}" href="${url}" title="${i18n().edit_entry}"><img class="edit-individual" src="${urls.images}/individual/editIcon.gif" alt="${i18n().edit_entry}" /></a> <a class="edit-${propertyLocalName}" href="${url}" title="${i18n().edit_entry}"><img class="edit-individual" src="${urls.images}/individual/editIcon.gif" alt="${i18n().edit_entry}" /></a>
</#macro> </#macro>
<#macro deleteLink propertyLocalName propertyName statement> <#macro deleteLink propertyLocalName propertyName statement rangeUri="">
<#local url = statement.deleteUrl> <#local url = statement.deleteUrl>
<#if url?has_content> <#if url?has_content>
<#--We need to specify the actual object to be deleted as it is different from the object uri--> <#--We need to specify the actual object to be deleted as it is different from the object uri-->
<#if propertyLocalName?contains("ARG_2000028")> <#if propertyLocalName?contains("ARG_2000028")>
<#if propertyName?contains("mailing address")> <#if rangeUri?contains("Address")>
<#local url = url + "&deleteObjectUri=" + "${statement.address!}"> <#local url = url + "&deleteObjectUri=" + "${statement.address!}">
<#elseif propertyName?contains("phone") || propertyName?contains("fax")> <#elseif rangeUri?contains("Telephone") || rangeUri?contains("Fax")>
<#local url = url + "&deleteObjectUri=" + "${statement.phone!}"> <#local url = url + "&deleteObjectUri=" + "${statement.phone!}">
<#elseif propertyName?contains("primary email") || propertyName?contains("additional emails")> <#elseif rangeUri?contains("Work") || rangeUri?contains("Email")>
<#local url = url + "&deleteObjectUri=" + "${statement.email!}"> <#local url = url + "&deleteObjectUri=" + "${statement.email!}">
<#elseif propertyName?contains("full name")> <#elseif rangeUri?contains("Name")>
<#local url = url + "&deleteObjectUri=" + "${statement.fullName!}"> <#local url = url + "&deleteObjectUri=" + "${statement.fullName!}">
<#elseif propertyName?contains("preferred title")> <#elseif rangeUri?contains("Title")>
<#local url = url + "&deleteObjectUri=" + "${statement.title!}"> <#local url = url + "&deleteObjectUri=" + "${statement.title!}">
</#if> </#if>
</#if> </#if>