Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
brianjlowe 2013-11-26 10:50:53 -05:00
commit 788d762f06
2 changed files with 47 additions and 29 deletions

View file

@ -989,10 +989,12 @@ local:documentHasPartContext a :ConfigContext ;
local:documentHasPartConfig a :ObjectPropertyDisplayConfig ; local:documentHasPartConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "has part" ; :displayName "has document part" ;
vitro:displayRankAnnot 51; vitro:displayRankAnnot 51;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:selectFromExistingAnnot "true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:documentPartOfContext a :ConfigContext ; local:documentPartOfContext a :ConfigContext ;
@ -1003,33 +1005,33 @@ local:documentPartOfContext a :ConfigContext ;
local:documentPartOfConfig a :ObjectPropertyDisplayConfig ; local:documentPartOfConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "part of" ; :displayName "part of other document" ;
vitro:displayRankAnnot 52; vitro:displayRankAnnot 52;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:spatialRegionHasPartContext a :ConfigContext ; local:geographicLocationContainsLocationContext a :ConfigContext ;
:hasConfiguration local:spatialRegionHasPartConfig ; :hasConfiguration local:geographicLocationContainsLocationConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ; :configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
:qualifiedByDomain <http://purl.obolibrary.org/obo/BFO_0000006> ; :qualifiedByDomain vivo:GeographicLocation ;
:qualifiedBy <http://purl.obolibrary.org/obo/BFO_0000006> . :qualifiedBy vivo:GeographicLocation .
local:spatialRegionHasPartConfig a :ObjectPropertyDisplayConfig ; local:geographicLocationContainsLocationConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "has part" ; :displayName "has part" ;
vitro:displayRankAnnot 81; vitro:displayRankAnnot 81;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupother> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:spatialRegionPartOfContext a :ConfigContext ; local:geographicLocationWithinLocationContext a :ConfigContext ;
:hasConfiguration local:spatialRegionPartOfConfig ; :hasConfiguration local:geographicLocationWithinLocationConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ; :configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
:qualifiedByDomain <http://purl.obolibrary.org/obo/BFO_0000006> ; :qualifiedByDomain vivo:GeographicLocation ;
:qualifiedBy <http://purl.obolibrary.org/obo/BFO_0000006> . :qualifiedBy vivo:GeographicLocation .
local:spatialRegionPartOfConfig a :ObjectPropertyDisplayConfig ; local:geographicLocationWithinLocationConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "part of" ; :displayName "part of" ;
vitro:displayRankAnnot 82; vitro:displayRankAnnot 82;
@ -1119,6 +1121,8 @@ local:seriesForEventConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 17; vitro:displayRankAnnot 17;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:selectFromExistingAnnot "true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:eventLocationContext a :ConfigContext ; local:eventLocationContext a :ConfigContext ;
@ -1172,24 +1176,40 @@ local:hasRoomContext a :ConfigContext ;
local:hasRoomConfig a :ObjectPropertyDisplayConfig ; local:hasRoomConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "rooms" ; :displayName "rooms" ;
vitro:displayRankAnnot 2; vitro:displayRankAnnot 22;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupother> . vitro:selectFromExistingAnnot "true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:bldgGeographicallyContainsContext a :ConfigContext ; local:roomWithinBuildingContext a :ConfigContext ;
:hasConfiguration local:bldgGeographicallyContainsConfig ; :hasConfiguration local:roomWithinBuildingConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ; :configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
:qualifiedByDomain vivo:Building ; :qualifiedByDomain vivo:Room ;
:qualifiedBy vivo:GeographicLocation . :qualifiedBy vivo:Building .
local:bldgGeographicallyContainsConfig a :ObjectPropertyDisplayConfig ; local:roomWithinBuildingConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "geographically contains" ; :displayName "within building" ;
vitro:displayRankAnnot 6; vitro:displayRankAnnot 23;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouplocation> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:geographicLocationContainsBuildingContext a :ConfigContext ;
:hasConfiguration local:geographicalLocationContainsBuildingConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
:qualifiedByDomain vivo:GeographicLocation ;
:qualifiedBy vivo:Building .
local:geographicLocationContainsBuildingConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "location of building" ;
vitro:displayRankAnnot 26;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:bldgGeographicallyWithinContext a :ConfigContext ; local:bldgGeographicallyWithinContext a :ConfigContext ;
:hasConfiguration local:bldgGeographicallyWithinConfig ; :hasConfiguration local:bldgGeographicallyWithinConfig ;
@ -1200,10 +1220,10 @@ local:bldgGeographicallyWithinContext a :ConfigContext ;
local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ; local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "geographically within" ; :displayName "geographically within" ;
vitro:displayRankAnnot 10; vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouplocation> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:bldgEquipmentLocationContext a :ConfigContext ; local:bldgEquipmentLocationContext a :ConfigContext ;
:hasConfiguration local:bldgEquipmentLocationConfig ; :hasConfiguration local:bldgEquipmentLocationConfig ;

View file

@ -6458,8 +6458,6 @@ obo:RO_0002351
obo:BFO_0000051 obo:BFO_0000051
rdfs:label "has part"@en-US ; rdfs:label "has part"@en-US ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot