From dd24baad8bf8f9365dcd6e895c48707c51d3936e Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Mon, 2 Dec 2013 15:43:39 -0500 Subject: [PATCH 1/3] VIVO-596 adding Grant properties to Contract --- rdf/tbox/filegraph/classes-additional.owl | 30 +++++++++++++++++++ rdf/tbox/filegraph/dataDomains.rdf | 36 ++++++++++++++++++++--- rdf/tbox/filegraph/objectRanges.rdf | 9 +++++- 3 files changed, 70 insertions(+), 5 deletions(-) diff --git a/rdf/tbox/filegraph/classes-additional.owl b/rdf/tbox/filegraph/classes-additional.owl index d79fbefa..c22a4c8b 100644 --- a/rdf/tbox/filegraph/classes-additional.owl +++ b/rdf/tbox/filegraph/classes-additional.owl @@ -902,7 +902,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rdf/tbox/filegraph/dataDomains.rdf b/rdf/tbox/filegraph/dataDomains.rdf index 3ad46a2b..9526dba1 100644 --- a/rdf/tbox/filegraph/dataDomains.rdf +++ b/rdf/tbox/filegraph/dataDomains.rdf @@ -33,7 +33,14 @@ - + + + + + + + + @@ -48,7 +55,14 @@ - + + + + + + + + @@ -69,7 +83,14 @@ - + + + + + + + + @@ -90,7 +111,14 @@ - + + + + + + + + diff --git a/rdf/tbox/filegraph/objectRanges.rdf b/rdf/tbox/filegraph/objectRanges.rdf index dc75e58f..165d888e 100644 --- a/rdf/tbox/filegraph/objectRanges.rdf +++ b/rdf/tbox/filegraph/objectRanges.rdf @@ -36,7 +36,14 @@ - + + + + + + + + From a3b9674c3072b5816833748d2145d242f9001a96 Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 2 Dec 2013 16:48:44 -0500 Subject: [PATCH 2/3] VIVO-586: added css selector --- themes/wilma/css/wilma.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index 02326f89..c3f89181 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -1069,6 +1069,9 @@ div#adjImgHeight { text-align:center; margin-top:100px; } +#noContentMsg { + clear: both; +} /* FOOTER------> */ footer { clear: both; From 19c95c1670f48267680e246cd2b1b529ebad4598 Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 2 Dec 2013 17:06:51 -0500 Subject: [PATCH 3/3] fixes for VIVO-591, VIVO-592, VIVO-594, VIVO-597, VIVO-598 and VIVO-601 --- rdf/display/everytime/PropertyConfig.n3 | 20 +++++++++++++++++++- rdf/tbox/filegraph/object-properties.owl | 1 + rdf/tbox/filegraph/object-properties3.owl | 3 ++- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 9 +++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index 6fe747af..e0bacd39 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/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"^^ ; :propertyGroup . @@ -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 . local:geographicLocationContainsLocationContext a :ConfigContext ; @@ -1253,6 +1257,20 @@ local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . + +local:bldgGeographicaLocationOfContext a :ConfigContext ; + :hasConfiguration local:bldgGeographicaLocationOfConfig ; + :configContextFor ; + :qualifiedByDomain ; + :qualifiedBy . + +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 . local:projectUsesMaterialEntityContext a :ConfigContext ; :hasConfiguration local:projectUsesMaterialEntityConfig ; @@ -1300,7 +1318,7 @@ local:facilityLocationOfServiceContext a :ConfigContext ; :hasConfiguration local:facilityLocationOfServiceConfig ; :configContextFor ; :qualifiedByDomain vivo:Facility ; - :qualifiedBy vivo:Service . + :qualifiedBy . local:facilityLocationOfServiceConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; diff --git a/rdf/tbox/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl index b7863d57..6820cc96 100644 --- a/rdf/tbox/filegraph/object-properties.owl +++ b/rdf/tbox/filegraph/object-properties.owl @@ -1580,6 +1580,7 @@ there is a measurement process p that has specified output m, a measurement datu Public Definition source (http://www.answers.com/topic/publisher). + diff --git a/rdf/tbox/filegraph/object-properties3.owl b/rdf/tbox/filegraph/object-properties3.owl index 793b44c5..73dce86b 100644 --- a/rdf/tbox/filegraph/object-properties3.owl +++ b/rdf/tbox/filegraph/object-properties3.owl @@ -387,6 +387,7 @@ + @@ -613,7 +614,7 @@ - + diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index a5d5455a..3bf5bebb 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -166,6 +166,7 @@ geo:non_self_governing "-1"^^xsd:int ; vitro:displayRankAnnot "-1"^^xsd:int ; + vitro:inClassGroup ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -531,6 +532,7 @@ vivo:SubnationalRegion "-1"^^xsd:int ; vitro:displayRankAnnot "-1"^^xsd:int ; + vitro:inClassGroup ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -545,6 +547,7 @@ geo:territory "-1"^^xsd:int ; vitro:displayRankAnnot "-1"^^xsd:int ; + vitro:inClassGroup ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -966,6 +969,7 @@ geo:disputed "-1"^^xsd:int ; vitro:displayRankAnnot "-1"^^xsd:int ; + vitro:inClassGroup ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -1031,6 +1035,8 @@ vivo:features ; vitro:inPropertyGroupAnnot ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot @@ -3158,6 +3164,7 @@ obo:ERO_0001520 "90"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot @@ -5225,6 +5232,7 @@ vivo:TransnationalRegion "-1"^^xsd:int ; vitro:displayRankAnnot "-1"^^xsd:int ; + vitro:inClassGroup ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -5981,6 +5989,7 @@ vivo:GeopoliticalEntity "-1"^^xsd:int ; vitro:displayRankAnnot "-1"^^xsd:int ; + vitro:inClassGroup ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot