litvinovg/vivo
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-26 12:18:31 -05:00
commit c10733c911
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rdf/abox/filegraph/continents.n3
View file

@ -8,4 +8,4 @@ geo:Australia_and_New_Zealand rdf:type core:Continent .
geo:Europe rdf:type core:Continent . geo:Europe rdf:type core:Continent .
geo:South_America rdf:type core:Continent . geo:South_America rdf:type core:Continent .
geo:northern_America rdf:type core:Continent . geo:northern_America rdf:type core:Continent .
geo:Oceania rdf:type core:Continent . geo:Antarctica rdf:type core:Continent .

16
rdf/display/everytime/PropertyConfig.n3
View file

@ -1197,6 +1197,20 @@ local:roomWithinBuildingConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:facilityWithinBuildingContext a :ConfigContext ;
:hasConfiguration local:facilityWithinBuildingConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
:qualifiedByDomain vivo:Facility ;
:qualifiedBy <http://purl.obolibrary.org/obo/BFO_0000029> .
local:facilityWithinBuildingConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "facility of" ;
vitro:displayRankAnnot 15;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:geographicLocationContainsBuildingContext a :ConfigContext ; local:geographicLocationContainsBuildingContext a :ConfigContext ;
:hasConfiguration local:geographicalLocationContainsBuildingConfig ; :hasConfiguration local:geographicalLocationContainsBuildingConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ; :configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
@ -1214,7 +1228,7 @@ local:geographicLocationContainsBuildingConfig a :ObjectPropertyDisplayConfig ;
local:bldgGeographicallyWithinContext a :ConfigContext ; local:bldgGeographicallyWithinContext a :ConfigContext ;
:hasConfiguration local:bldgGeographicallyWithinConfig ; :hasConfiguration local:bldgGeographicallyWithinConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ; :configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
:qualifiedByDomain vivo:Building ; :qualifiedByDomain <http://purl.obolibrary.org/obo/BFO_0000029> ;
:qualifiedBy vivo:GeographicLocation . :qualifiedBy vivo:GeographicLocation .
local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ; local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ;