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

Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

Browse source
This commit is contained in:
brianjlowe 2013-10-08 14:33:10 -04:00
commit 946c40a13e
8 changed files with 298 additions and 298 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/build.xml
View file

@ -265,6 +265,8 @@
================================= --> ================================= -->
<target name="clean" description="--> Delete all artifacts."> <target name="clean" description="--> Delete all artifacts.">
<delete dir="${build.dir}" /> <delete dir="${build.dir}" />
<!-- delete the rdf files, removing any unused languages, for example. -->
<delete dir="${vitro.home}/rdf" />
</target> </target>
<!-- ================================= <!-- =================================

572
webapp/languages/example/i18n/all_es.properties
View file

File diff suppressed because it is too large Load diff

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

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 @@
### 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#>

8
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
View file

@ -207,12 +207,10 @@ public class RequestModelsPrep implements Filter {
OntModelSpec.OWL_MEM, dataset.getDefaultModel()); OntModelSpec.OWL_MEM, dataset.getDefaultModel());
ModelAccess.on(vreq).setOntModel(ModelID.BASE_ABOX, baseABoxModel); ModelAccess.on(vreq).setOntModel(ModelID.BASE_ABOX, baseABoxModel);
ModelAccess.on(vreq).setOntModel(ModelID.INFERRED_ABOX, unionABoxModel); ModelAccess.on(vreq).setOntModel(ModelID.INFERRED_ABOX, inferenceABoxModel);
ModelAccess.on(vreq) ModelAccess.on(vreq).setOntModel(ModelID.UNION_ABOX, unionABoxModel);
.setOntModel(ModelID.UNION_ABOX, inferenceABoxModel);
ModelAccess.on(vreq).setOntModel(ModelID.BASE_FULL, baseFullModel); ModelAccess.on(vreq).setOntModel(ModelID.BASE_FULL, baseFullModel);
ModelAccess.on(vreq).setOntModel(ModelID.INFERRED_FULL, ModelAccess.on(vreq).setOntModel(ModelID.INFERRED_FULL, inferenceFullModel);
inferenceFullModel);
ModelAccess.on(vreq).setOntModel(ModelID.UNION_FULL, unionFullModel); ModelAccess.on(vreq).setOntModel(ModelID.UNION_FULL, unionFullModel);
} }

3
webapp/web/css/vitro.css
View file

@ -374,7 +374,8 @@ a.filter-search {
line-height: 35px; line-height: 35px;
} }
#home-stats h4 { #home-stats h4 {
width: 102px; display: inline;
padding: 3px 10px;
} }
#stats { #stats {
margin: 0 auto; margin: 0 auto;

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>