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

Merge remote-tracking branch 'origin/develop' into dev-isf

Browse source 
Conflicts:
	webapp/rdf/displayDisplay/everytime/displayDisplay.n3
	webapp/web/i18n/all.properties
	webapp/web/templates/freemarker/lib/lib-properties.ftl
This commit is contained in:
brianjlowe 2013-09-23 16:19:05 -04:00
commit 90512bdc1c
16 changed files with 893 additions and 409 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -224,7 +224,7 @@ name will be used as the label. -->
<#assign labelPropertyUri = ("http://www.w3.org/2000/01/rdf-schema#label"?url) />
<#assign useEditLink = false />
<#--edit link used if in edit mode and only one label and one language-->
<#if labelCount = 1 && editable>
<#if labelCount = 1 && editable && localesCount = 1 >
<#assign useEditLink = true/>
</#if>
<#local label = individual.nameStatement>