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

bugs in n3 files and manage labels logic when there are no labels (e.g. on individual page profile)

Browse source
This commit is contained in:
hudajkhan 2013-10-07 17:26:34 -04:00
parent aced8fece7
commit 7c3c8f6c4e
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
webapp/rdf/display/everytime/dataGetterLabels.n3
View file

@ -1,4 +1,5 @@
# $This file is distributed under the terms of the license in /doc/license.txt$ # $This file is distributed under the terms of the license in /doc/license.txt$
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
#Data getter type labels #Data getter type labels
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData> rdfs:label "Class Group Page" . <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData> rdfs:label "Class Group Page" .

5
webapp/rdf/display/everytime/pageList.n3
View file

@ -1,7 +1,7 @@
# $This file is distributed under the terms of the license in /doc/license.txt$ # $This file is distributed under the terms of the license in /doc/license.txt$
# This file is for the portions of the pageList that should not be editable, i.e. # This file is for the portions of the pageList that should not be editable, i.e.#
that it cannot be deleted and that it requires certain permissions # # that it cannot be deleted and that it requires certain permissions #
@prefix owl: <http://www.w3.org/2002/07/owl#> . @prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> . @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
@ -12,6 +12,5 @@ that it cannot be deleted and that it requires certain permissions #
### This file defines the page list menu for vitro. ### ### This file defines the page list menu for vitro. ###
display:pageListPage display:pageListPage
display:queryModel <vitro:requestDisplayModel> ;
display:requiresAction <java:edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission#ManageMenus> ; display:requiresAction <java:edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission#ManageMenus> ;
display:cannotDeletePage "true" . display:cannotDeletePage "true" .

1
webapp/rdf/display/firsttime/pageList_editableStatements.n3
View file

@ -18,6 +18,7 @@ display:pageListPage
display:pageListData display:pageListData
a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>; a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>;
display:saveToVar "pages" ; display:saveToVar "pages" ;
display:queryModel <vitro:requestDisplayModel> ;
display:query """ display:query """
PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>

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

@ -249,7 +249,7 @@ name will be used as the label. -->
${label.value} ${label.value}
<#if useEditLink> <#if useEditLink>
<@editingLinks "label" "" label editable /> <@editingLinks "label" "" label editable />
<#elseif editable || (languageCount > 1)> <#elseif (editable && (labelCount > 0)) || (languageCount > 1)>
<#--We display the link even when the user is not logged in case of multiple labels with different languages--> <#--We display the link even when the user is not logged in case of multiple labels with different languages-->
<#assign labelLink = ""/> <#assign labelLink = ""/>
<#-- Manage labels now goes to generator --> <#-- Manage labels now goes to generator -->
@ -274,7 +274,7 @@ name will be used as the label. -->
<span class="inline"> <span class="inline">
<a class="add-label" href="${labelLink}" <a class="add-label" href="${labelLink}"
title="${linkTitle}">${individualProfileUrl} -> ${profileParameters} -> ${extraParameters} title="${linkTitle}">
<img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${imageAlt}" /></a> <img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${imageAlt}" /></a>
</span> </span>
</#if> </#if>