From cad30a359d1f0265bc79a49772d3fef8b18e0b54 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Mon, 4 Nov 2013 11:35:28 -0500 Subject: [PATCH 1/6] VIVO-460 offerCreateNew settings for various properties --- rdf/display/everytime/PropertyConfig.n3 | 17 ++++- rdf/tbox/filegraph/classes-additional.owl | 66 -------------------- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 14 ++++- 3 files changed, 27 insertions(+), 70 deletions(-) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index 49bdfced..704bde9e 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -768,7 +768,7 @@ local:collegeOffersDegreeConfig a :ObjectPropertyDisplayConfig ; :propertyGroup . local:deptOffersDegreeContext a :ConfigContext ; - :hasConfiguration local:debtOffersDegreeConfig ; + :hasConfiguration local:deptOffersDegreeConfig ; :configContextFor vivo:offers ; :qualifiedByDomain vivo:AcademicDepartment ; :qualifiedBy vivo:AcademicDegree . @@ -795,6 +795,21 @@ local:uniOffersDegreeConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . +local:labOffersServiceContext a :ConfigContext ; + :hasConfiguration local:labOffersServiceConfig ; + :configContextFor vivo:offers ; + :qualifiedByDomain vivo:Laboratory ; + :qualifiedBy . + +local:labOffersServiceConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "offers service" ; + vitro:displayRankAnnot 2; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + :propertyGroup . + local:grantAwardedByContext a :ConfigContext ; :hasConfiguration local:grantAwardedByConfig ; :configContextFor vivo:assignedBy ; diff --git a/rdf/tbox/filegraph/classes-additional.owl b/rdf/tbox/filegraph/classes-additional.owl index ebe04e37..8bc74eed 100644 --- a/rdf/tbox/filegraph/classes-additional.owl +++ b/rdf/tbox/filegraph/classes-additional.owl @@ -559,27 +559,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -687,23 +666,6 @@ - - - - - - - - - - - - - - - - - @@ -947,21 +909,6 @@ - - - - - - - - - - - - - - - @@ -1040,19 +987,6 @@ - - - - - - - - - - - - - diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index b41d98c9..570b4b20 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -660,6 +660,8 @@ vivo:reproduces ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; vitro:selectFromExistingAnnot "true"^^xsd:boolean . @@ -2054,7 +2056,9 @@ bibo:number "A generic item or document number. Not to be confused with issue number. A barcode, perhaps?"^^xsd:string . obo:RO_0001025 - rdfs:label "located in"@en-US . + rdfs:label "located in"@en-US ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . vivo:Location rdfs:label "Location"@en-US ; @@ -6176,7 +6180,9 @@ obo:ERO_0000789 rdfs:label "Staff Role"@en-US . obo:BFO_0000050 - rdfs:label "part of"@en-US . + rdfs:label "part of"@en-US ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . bibo:Letter rdfs:label "Letter"@en-US ; @@ -6264,7 +6270,9 @@ obo:RO_0002351 rdfs:label "has member"@en-US . obo:BFO_0000051 - rdfs:label "has part"@en-US . + rdfs:label "has part"@en-US ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . obo:ARG_2000008 rdfs:label "Topic Weight Measurement"@en-US . From 11a37ed0786bad79592170d5b14d8b8c682d6834 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Mon, 4 Nov 2013 11:46:26 -0500 Subject: [PATCH 2/6] VIVO-457 additional property visibility --- rdf/display/everytime/PropertyConfig.n3 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index 704bde9e..47f25725 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -725,6 +725,20 @@ local:eventLocationConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . +local:hasRoomContext a :ConfigContext ; + :hasConfiguration local:hasRoomConfig ; + :configContextFor ; + :qualifiedByDomain vivo:Building ; + :qualifiedBy vivo:Room . + +local:hasRoomConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "has room" ; + vitro:displayRankAnnot 2; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + :propertyGroup . + local:courseOfferedByContext a :ConfigContext ; :hasConfiguration local:courseOfferedByConfig ; :configContextFor vivo:offeredBy ; From 8dbf9969c2c8895d3745d59f406c1c8850f68628 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Mon, 4 Nov 2013 11:50:54 -0500 Subject: [PATCH 3/6] VIVO-408 hiding dateTimeValue property --- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 570b4b20..d1586c88 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -65,13 +65,13 @@ vivo:dateTimeValue vitro:displayRankAnnot "5"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:inPropertyGroupAnnot ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; + ; vitro:selectFromExistingAnnot "false"^^xsd:boolean . From 5f71827f934a44f63ecb8981b27b98190c2e481c Mon Sep 17 00:00:00 2001 From: hudajkhan Date: Mon, 4 Nov 2013 11:52:36 -0500 Subject: [PATCH 4/6] search part of page needs to be broken out to include search box in jsp pages --- themes/wilma/templates/page.ftl | 15 +-------------- themes/wilma/templates/search.ftl | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 themes/wilma/templates/search.ftl diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl index 61a2b3c4..b826291c 100644 --- a/themes/wilma/templates/page.ftl +++ b/themes/wilma/templates/page.ftl @@ -10,20 +10,7 @@ <#include "identity.ftl"> - - - + <#include "search.ftl" > <#include "menu.ftl"> <#-- VIVO OpenSocial Extension by UCSF --> diff --git a/themes/wilma/templates/search.ftl b/themes/wilma/templates/search.ftl new file mode 100644 index 00000000..a3825eea --- /dev/null +++ b/themes/wilma/templates/search.ftl @@ -0,0 +1,17 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#--Breaking this out so this can be utilized by other pages such as the jsp advanced tools pages--> + + + \ No newline at end of file From 35ec65eebe70466486e2ffaf1178eafcf4f19377 Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 4 Nov 2013 12:48:13 -0500 Subject: [PATCH 5/6] VIVO-415 OpenSocial template was in Wilma - should be in VIVO. --- .../freemarker/body/individual}/individual-openSocial.ftl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {themes/wilma/templates => productMods/templates/freemarker/body/individual}/individual-openSocial.ftl (100%) diff --git a/themes/wilma/templates/individual-openSocial.ftl b/productMods/templates/freemarker/body/individual/individual-openSocial.ftl similarity index 100% rename from themes/wilma/templates/individual-openSocial.ftl rename to productMods/templates/freemarker/body/individual/individual-openSocial.ftl From 9f854b6490b05fa36fdf34040a1e482c3fd4dbaa Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 4 Nov 2013 12:50:19 -0500 Subject: [PATCH 6/6] VIVO-482 replace core:URLLink with card:URL --- rdf/display/everytime/vivoSearchProhibited.n3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdf/display/everytime/vivoSearchProhibited.n3 b/rdf/display/everytime/vivoSearchProhibited.n3 index 17985305..8e7b7063 100644 --- a/rdf/display/everytime/vivoSearchProhibited.n3 +++ b/rdf/display/everytime/vivoSearchProhibited.n3 @@ -27,7 +27,7 @@ vitroDisplay:excludeClass core:DateTimeValuePrecision ; vitroDisplay:excludeClass core:DateTimeInterval ; vitroDisplay:excludeClass core:AcademicDegree ; - vitroDisplay:excludeClass core:URLLink ; + vitroDisplay:excludeClass vcard:URL ; vitroDisplay:excludeClass vcard:Communication ; vitroDisplay:excludeClass vcard:Code ; vitroDisplay:excludeClass vcard:Explanatory ;