Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
tworrall 2013-11-20 14:52:08 -05:00
commit a1c8200a54
3 changed files with 66 additions and 20 deletions

View file

@ -860,6 +860,34 @@ local:preferredTitleConfig a :ObjectPropertyDisplayConfig ;
### properties using default editing form ##
local:documentHasPartContext a :ConfigContext ;
:hasConfiguration local:documentHasPartConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
:qualifiedByDomain <http://purl.org/ontology/bibo/Document> ;
:qualifiedBy <http://purl.org/ontology/bibo/DocumentPart> .
local:documentHasPartConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "has part" ;
vitro:displayRankAnnot -1;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupother> .
local:documentPartOfContext a :ConfigContext ;
:hasConfiguration local:documentPartOfConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
:qualifiedByDomain <http://purl.org/ontology/bibo/Document> ;
:qualifiedBy <http://purl.org/ontology/bibo/DocumentPart> .
local:documentPartOfConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "part of" ;
vitro:displayRankAnnot -1;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupother> .
local:hasSubOrganizationContext a :ConfigContext ;
:hasConfiguration local:hasSubOrganizationConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
@ -867,7 +895,7 @@ local:hasSubOrganizationContext a :ConfigContext ;
:qualifiedBy <http://xmlns.com/foaf/0.1/Organization> .
local:hasSubOrganizationConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-webpage.xml"^^xsd:string ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "has sub-organization" ;
vitro:displayRankAnnot 15;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
@ -881,7 +909,7 @@ local:subOrganizationWithinContext a :ConfigContext ;
:qualifiedBy <http://xmlns.com/foaf/0.1/Organization> .
local:subOrganizationWithinConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-webpage.xml"^^xsd:string ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "organization within" ;
vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
@ -920,7 +948,7 @@ local:inEventSeriesContext a :ConfigContext ;
:hasConfiguration local:inEventSeriesConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
:qualifiedByDomain <http://purl.org/NET/c4dm/event.owl#Event> ;
:qualifiedBy <http://purl.org/NET/c4dm/event.owl#EventSeries> .
:qualifiedBy <http://vivoweb.org/ontology/core#EventSeries> .
local:inEventSeriesConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
@ -944,20 +972,6 @@ local:eventLocationConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouplocation> .
local:eventRelatedDocsContext a :ConfigContext ;
:hasConfiguration local:eventRelatedDocsConfig ;
:configContextFor <http://purl.org/ontology/bibo/presents> ;
:qualifiedByDomain <http://purl.org/NET/c4dm/event.owl#Event> ;
:qualifiedBy <http://purl.org/ontology/bibo/Document> .
local:eventRelatedDocsConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "related documents" ;
vitro:displayRankAnnot 2;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibobscure> .
local:organizationLocationContext a :ConfigContext ;
:hasConfiguration local:organizationLocationConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0001025> ;
@ -986,6 +1000,20 @@ local:equipmentInFacilityConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouplocation> .
local:hasRoomContext a :ConfigContext ;
:hasConfiguration local:hasRoomConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
:qualifiedByDomain vivo:Building ;
:qualifiedBy vivo:Room .
local:hasRoomConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "rooms" ;
vitro:displayRankAnnot 2;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupother> .
local:bldgGeographicallyContainsContext a :ConfigContext ;
:hasConfiguration local:bldgGeographicallyContainsConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;

View file

@ -94,6 +94,12 @@
<owl:allValuesFrom rdf:resource="http://vivoweb.org/ontology/core#GeographicRegion"/>
</owl:Restriction>
</rdfs:subClassOf>
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="http://purl.org/ontology/bibo/presents"/>
<owl:allValuesFrom rdf:resource="http://purl.org/ontology/bibo/Document"/>
</owl:Restriction>
</rdfs:subClassOf>
</owl:Class>

View file

@ -6158,7 +6158,11 @@ obo:ERO_0000789
obo:BFO_0000050
rdfs:label "part of"@en-US ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
"true"^^xsd:boolean ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
bibo:Letter
rdfs:label "Letter"@en-US ;
@ -6248,7 +6252,11 @@ obo:RO_0002351
obo:BFO_0000051
rdfs:label "has part"@en-US ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
"true"^^xsd:boolean ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
obo:ARG_2000008
rdfs:label "Topic Weight Measurement"@en-US .
@ -7163,7 +7171,11 @@ vcard:Location
rdfs:label "Location"@en-US .
obo:RO_0001015
rdfs:label "location of"@en-US .
rdfs:label "location of"@en-US ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
vcard:OrganizationUnitName
rdfs:label "Organizational Unit Name"@en-US .