Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6

rdf/display/everytime/PropertyConfig.n3

@@ -634,6 +634,8 @@ local:orgAdministersGrantConfig a :ObjectPropertyDisplayConfig ;
     vitro:displayRankAnnot 62;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:selectFromExistingAnnot   "true"^^xsd:boolean ;
+    vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
     vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationAdministersGrantGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupresearch> .
     
@@ -1009,6 +1011,8 @@ local:documentPartOfConfig a :ObjectPropertyDisplayConfig ;
     vitro:displayRankAnnot 52;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:selectFromExistingAnnot   "true"^^xsd:boolean ;
+    vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
     
 local:geographicLocationContainsLocationContext a :ConfigContext ;
@@ -1254,6 +1258,20 @@ local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
 
+local:bldgGeographicaLocationOfContext a :ConfigContext ;
+    :hasConfiguration local:bldgGeographicaLocationOfConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/RO_0001015> ;
+    :qualifiedByDomain      <http://purl.obolibrary.org/obo/BFO_0000029> ; 
+    :qualifiedBy      <http://purl.obolibrary.org/obo/BFO_0000004> .
+
+local:bldgGeographicaLocationOfConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
+    :displayName "geographic location of" ;
+    vitro:displayRankAnnot 21;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
+    
 local:projectUsesMaterialEntityContext a :ConfigContext ;
     :hasConfiguration local:projectUsesMaterialEntityConfig ;
     :configContextFor  <http://purl.obolibrary.org/obo/ERO_0000031> ; 
@@ -1300,7 +1318,7 @@ local:facilityLocationOfServiceContext a :ConfigContext ;
     :hasConfiguration local:facilityLocationOfServiceConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/RO_0001015> ;
     :qualifiedByDomain  vivo:Facility ;
-    :qualifiedBy        vivo:Service .
+    :qualifiedBy        <http://purl.obolibrary.org/obo/ERO_0000005> .
 
 local:facilityLocationOfServiceConfig a :ObjectPropertyDisplayConfig ;
     :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;

rdf/tbox/filegraph/classes-additional.owl

@@ -904,6 +904,36 @@
     
     
 
+    <!-- http://vivoweb.org/ontology/core#Contract -->
+
+    <owl:Class rdf:about="http://vivoweb.org/ontology/core#Contract">
+
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#supportedInformationResource"/>
+                <owl:allValuesFrom rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://purl.org/ontology/bibo/abstract"/>
+                <owl:allValuesFrom rdf:resource="http://www.w3.org/2000/01/rdf-schema#Literal"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#assignedBy"/>
+                <owl:allValuesFrom rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#dateTimeInterval"/>
+                <owl:allValuesFrom rdf:resource="http://vivoweb.org/ontology/core#DateTimeInterval"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+    </owl:Class>
+
     <!-- http://purl.obolibrary.org/obo/IAO_0000030 -->
 
     <owl:Class rdf:about="http://purl.obolibrary.org/obo/IAO_0000030">

rdf/tbox/filegraph/dataDomains.rdf

@@ -33,7 +33,14 @@
     <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Article"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#localAwardId">
-    <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Grant"/>
+    <rdfs:domain>
+      <owl:Class>
+        <owl:unionOf rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Contract"/>
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Grant"/>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:domain>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#eRACommonsId">
     <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
@@ -48,7 +55,14 @@
     <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Authorship"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#grantDirectCosts">
-    <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Grant"/>
+    <rdfs:domain>
+      <owl:Class>
+        <owl:unionOf rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Contract"/>
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Grant"/>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:domain>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#majorField">
     <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#EducationalProcess"/>
@@ -69,7 +83,14 @@
     <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Report"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#sponsorAwardId">
-    <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Grant"/>
+    <rdfs:domain>
+      <owl:Class>
+        <owl:unionOf rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Contract"/>
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Grant"/>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:domain>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#licenseNumber">
     <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Licensure"/>
@@ -90,7 +111,14 @@
     <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Patent"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#totalAwardAmount">
-    <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Grant"/>
+    <rdfs:domain>
+      <owl:Class>
+        <owl:unionOf rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Contract"/>
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Grant"/>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:domain>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#outreachOverview">
     <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>

rdf/tbox/filegraph/object-properties.owl

@@ -1580,6 +1580,7 @@ there is a measurement process p that has specified output m, a measurement datu
 
         <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Public Definition source (http://www.answers.com/topic/publisher).</obo:IAO_0000112>
         <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
+        <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
     </owl:ObjectProperty>
     
 

rdf/tbox/filegraph/object-properties3.owl

@@ -387,6 +387,7 @@
     <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#features">
 
         <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
+        <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
     </owl:ObjectProperty>
     
 
@@ -613,7 +614,7 @@
 
     <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#translatorOf">
 
-        <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
+        <rdfs:range rdf:resource="http://purl.org/ontology/bibo/Document"/>
     </owl:ObjectProperty>
     
 

rdf/tbox/filegraph/objectRanges.rdf

@@ -36,7 +36,14 @@
     <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Review"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasFundingVehicle">
-    <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Grant"/>
+    <rdfs:range>
+      <owl:Class>
+        <owl:unionOf rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Contract"/>
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Grant"/>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:range>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasFacility">
     <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Facility"/>

rdf/tbox/firsttime/initialTBoxAnnotations.n3

@@ -164,6 +164,7 @@ geo:non_self_governing
               "-1"^^xsd:int ;
       vitro:displayRankAnnot
               "-1"^^xsd:int ;
+      vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouplocations> ;
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
@@ -533,6 +534,7 @@ vivo:SubnationalRegion
               "-1"^^xsd:int ;
       vitro:displayRankAnnot
               "-1"^^xsd:int ;
+      vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouplocations> ;
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
@@ -547,6 +549,7 @@ geo:territory
               "-1"^^xsd:int ;
       vitro:displayRankAnnot
               "-1"^^xsd:int ;
+      vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouplocations> ;
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
@@ -968,6 +971,7 @@ geo:disputed
               "-1"^^xsd:int ;
       vitro:displayRankAnnot
               "-1"^^xsd:int ;
+      vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouplocations> ;
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
@@ -1033,6 +1037,8 @@ vivo:features
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
+      vitro:offerCreateNewOptionAnnot
+              "true"^^xsd:boolean ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:publicDescriptionAnnot
@@ -3164,6 +3170,7 @@ obo:ERO_0001520
               "90"^^xsd:int ;
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
+      vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:inPropertyGroupAnnot
@@ -5245,6 +5252,7 @@ vivo:TransnationalRegion
               "-1"^^xsd:int ;
       vitro:displayRankAnnot
               "-1"^^xsd:int ;
+      vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouplocations> ;
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
@@ -6001,6 +6009,7 @@ vivo:GeopoliticalEntity
               "-1"^^xsd:int ;
       vitro:displayRankAnnot
               "-1"^^xsd:int ;
+      vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouplocations> ;
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot

themes/wilma/css/wilma.css

@@ -1069,6 +1069,9 @@ div#adjImgHeight {
     text-align:center;
     margin-top:100px;
 }
+#noContentMsg {
+    clear: both;
+}
 /* FOOTER------>  */
 footer {
     clear: both;