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

updates for page management security, labels

Browse source
This commit is contained in:
hudajkhan 2013-10-02 14:58:01 -04:00
parent 8d520895ac
commit 3e5c770506
10 changed files with 60 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -238,7 +238,7 @@ name will be used as the label. -->
</#macro>
<#-- Label -->
<#macro label individual editable labelCount localesCount=1>
<#macro label individual editable labelCount localesCount=1 languageCount=1>
<#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-->
@ -249,8 +249,8 @@ name will be used as the label. -->
${label.value}
<#if useEditLink>
<@editingLinks "label" "" label editable />
<#elseif editable || (labelCount > 1)>
<#--We display the link even when the user is not logged in case of multiple labels-->
<#elseif editable || (languageCount > 1)>
<#--We display the link even when the user is not logged in case of multiple labels with different languages-->
<#assign labelLink = ""/>
<#-- Manage labels now goes to generator -->
<#assign individualUri = individual.uri!""/>