From 8ec28b71deacbbf44ebf51b00605a530440de8b9 Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Tue, 26 Nov 2013 17:18:39 -0500 Subject: [PATCH 1/8] Continued minor changes in property placement and ordering --- rdf/display/everytime/PropertyConfig.n3 | 128 ++++++++++++------- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 86 ++++++------- 2 files changed, 123 insertions(+), 91 deletions(-) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index de3a424e..d017dc24 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -513,7 +513,7 @@ local:organizationForTrainingConfig a :ObjectPropertyDisplayConfig ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationForTrainingGenerator"^^ ; - :propertyGroup . + :propertyGroup . local:adviseeRoleContext a :ConfigContext ; :hasConfiguration local:adviseeRoleConfig ; @@ -722,7 +722,7 @@ local:mailingAddressOrgContext a :ConfigContext ; local:mailingAddressOrgConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-mailingAddress.xml"^^xsd:string ; :displayName "mailing address" ; - vitro:displayRankAnnot 80; + vitro:displayRankAnnot 29; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.SubjectHasMailingAddressGenerator"^^ ; @@ -870,7 +870,7 @@ local:webpageOrgConfig a :ObjectPropertyDisplayConfig ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; - :propertyGroup . + :propertyGroup . local:webpageInfoContext a :ConfigContext ; :hasConfiguration local:webpageInfoConfig ; @@ -886,7 +886,7 @@ local:webpageInfoConfig a :ObjectPropertyDisplayConfig ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; - :propertyGroup . + :propertyGroup . local:webpageEventContext a :ConfigContext ; :hasConfiguration local:webpageEventConfig ; @@ -902,7 +902,7 @@ local:webpageEventConfig a :ObjectPropertyDisplayConfig ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; - :propertyGroup . + :propertyGroup . local:fullNameContext a :ConfigContext ; :hasConfiguration local:fullNameConfig ; @@ -1076,7 +1076,7 @@ local:eventWithinContext a :ConfigContext ; local:eventWithinConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "occurs within event" ; - vitro:displayRankAnnot 13; + vitro:displayRankAnnot 15; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1090,7 +1090,7 @@ local:includesEventContext a :ConfigContext ; local:includesEventConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "includes event" ; - vitro:displayRankAnnot 15; + vitro:displayRankAnnot 16; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1118,7 +1118,7 @@ local:seriesForEventContext a :ConfigContext ; local:seriesForEventConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "events in this series" ; - vitro:displayRankAnnot 17; + vitro:displayRankAnnot 18; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; @@ -1133,11 +1133,25 @@ local:eventLocationContext a :ConfigContext ; local:eventLocationConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "has geographic location" ; + :displayName "held in geographic location" ; vitro:displayRankAnnot 30; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . + +local:eventInFacilityContext a :ConfigContext ; + :hasConfiguration local:eventInFacilityConfig ; + :configContextFor ; + :qualifiedByDomain ; + :qualifiedBy vivo:Facility . + +local:eventInFacilityConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "held in facility" ; + vitro:displayRankAnnot 29; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + :propertyGroup . local:organizationLocationContext a :ConfigContext ; :hasConfiguration local:organizationLocationConfig ; @@ -1153,19 +1167,19 @@ local:organizationLocationConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . -local:equipmentInFacilityContext a :ConfigContext ; - :hasConfiguration local:equipmentInFacilityConfig ; +local:materialEntityInFacilityContext a :ConfigContext ; + :hasConfiguration local:materialEntityInFacilityConfig ; :configContextFor ; - :qualifiedByDomain vivo:Equipment ; + :qualifiedByDomain ; :qualifiedBy vivo:Facility . -local:equipmentInFacilityConfig a :ObjectPropertyDisplayConfig ; +local:materialEntityInFacilityConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "in facility" ; + :displayName "housed in facility" ; vitro:displayRankAnnot 2; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - :propertyGroup . + :propertyGroup . local:hasRoomContext a :ConfigContext ; :hasConfiguration local:hasRoomConfig ; @@ -1197,19 +1211,6 @@ local:roomWithinBuildingConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . -local:facilityWithinBuildingContext a :ConfigContext ; - :hasConfiguration local:facilityWithinBuildingConfig ; - :configContextFor ; - :qualifiedByDomain vivo:Facility ; - :qualifiedBy . - -local:facilityWithinBuildingConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "facility of" ; - vitro:displayRankAnnot 15; - vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - :propertyGroup . local:geographicLocationContainsBuildingContext a :ConfigContext ; :hasConfiguration local:geographicalLocationContainsBuildingConfig ; @@ -1219,7 +1220,7 @@ local:geographicLocationContainsBuildingContext a :ConfigContext ; local:geographicLocationContainsBuildingConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "location of building" ; + :displayName "geographical location for facility" ; vitro:displayRankAnnot 26; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; @@ -1228,7 +1229,7 @@ local:geographicLocationContainsBuildingConfig a :ObjectPropertyDisplayConfig ; local:bldgGeographicallyWithinContext a :ConfigContext ; :hasConfiguration local:bldgGeographicallyWithinConfig ; :configContextFor ; - :qualifiedByDomain ; + :qualifiedByDomain ; ## Site :qualifiedBy vivo:GeographicLocation . local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ; @@ -1238,34 +1239,65 @@ local:bldgGeographicallyWithinConfig a :ObjectPropertyDisplayConfig ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . + +local:projectUsesMaterialEntityContext a :ConfigContext ; + :hasConfiguration local:projectUsesMaterialEntityConfig ; + :configContextFor ; + :qualifiedByDomain vivo:Project ; + :qualifiedBy . ## Material Entity -local:bldgEquipmentLocationContext a :ConfigContext ; - :hasConfiguration local:bldgEquipmentLocationConfig ; - :configContextFor ; - :qualifiedByDomain vivo:Facility ; - :qualifiedBy vivo:Equipment . - -local:bldgEquipmentLocationConfig a :ObjectPropertyDisplayConfig ; +local:projectUsesMaterialEntityConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "location of equipment" ; + :displayName "uses equipment or instrument" ; + vitro:displayRankAnnot 85; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + :propertyGroup . + +local:materialEntityUsedByProjectContext a :ConfigContext ; + :hasConfiguration local:MaterialEntityUsedByProjectConfig ; + :configContextFor ; + :qualifiedByDomain ; ## Material Entity + :qualifiedBy vivo:Project . + +local:materialEntityUsedByProjectConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "used by project" ; + vitro:displayRankAnnot 85; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + :propertyGroup . + +local:facilityLocationOfEquipmentContext a :ConfigContext ; + :hasConfiguration local:facilityLocationOfEquipmentConfig ; + :configContextFor ; + :qualifiedByDomain ; ## Site + :qualifiedBy . ## Material Entity + +local:facilityLocationOfEquipmentConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; + :displayName "location of equipment or instrument" ; vitro:displayRankAnnot 14; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - :propertyGroup . + :propertyGroup . -local:bldgGeographicLocationOfContext a :ConfigContext ; - :hasConfiguration local:bldgGeographicLocationOfConfig ; +local:facilityLocationOfServiceContext a :ConfigContext ; + :hasConfiguration local:facilityLocationOfServiceConfig ; :configContextFor ; - :qualifiedByDomain vivo:Facility ; - :qualifiedBy vivo:GeographicLocation . + :qualifiedByDomain vivo:Facility ; + :qualifiedBy vivo:Service . -local:bldgGeographicLocationOfConfig a :ObjectPropertyDisplayConfig ; +local:facilityLocationOfServiceConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "geographic location of" ; + :displayName "facility for service" ; vitro:displayRankAnnot 18; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - :propertyGroup . + :propertyGroup ; + vitro:publicDescriptionAnnot "This relates a facility as being used for a particular service."^^xsd:string ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean . local:courseOfferedByContext a :ConfigContext ; :hasConfiguration local:courseOfferedByConfig ; @@ -1295,7 +1327,7 @@ local:orgOffersCourseConfig a :ObjectPropertyDisplayConfig ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; - :propertyGroup . + :propertyGroup . local:collegeOffersDegreeContext a :ConfigContext ; :hasConfiguration local:collegeOffersDegreeConfig ; @@ -1437,7 +1469,7 @@ local:awardOrHonorReceiptsConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 3; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ; - :propertyGroup . + :propertyGroup . local:awardReceiptsContext a :ConfigContext ; :hasConfiguration local:awardReceiptsConfig ; diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index d64d281f..61c445f3 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -1208,7 +1208,17 @@ vcard:Organizational rdfs:label "Organizational"@en-US . obo:ERO_0000774 - rdfs:label "has eligibility requirment"@en-US . + rdfs:label "has eligibility requirement"@en-US ; + vitro:displayLimitAnnot + "2"^^xsd:int ; + vitro:displayRankAnnot + "20"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + . vivo:ServiceProvidingLaboratory rdfs:label "Service Providing Lab"@en-US ; @@ -1323,7 +1333,7 @@ bibo:presents vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -2260,11 +2270,11 @@ vivo:contactInformation vitro:displayLimitAnnot "1"^^xsd:int ; vitro:displayRankAnnot - "50"^^xsd:int ; + "25"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot @@ -2297,7 +2307,7 @@ vivo:description vitro:displayLimitAnnot "3"^^xsd:int ; vitro:displayRankAnnot - "15"^^xsd:int ; + "5"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot @@ -2477,7 +2487,7 @@ vivo:freetextKeyword vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:publicDescriptionAnnot "Intended for a word or short phrase only where no instance of a controlled vocabulary can be identified. Can also be used to help in highlighting subtle difference in work."^^xsd:string . @@ -2530,7 +2540,17 @@ obo:ARG_2000065 rdfs:label "American Board of Allergy and Immunology"@en-US . obo:ERO_0000775 - rdfs:label "has residency requirement"@en-US . + rdfs:label "has residency requirement"@en-US ; + vitro:displayLimitAnnot + "2"^^xsd:int ; + vitro:displayRankAnnot + "21"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + . bibo:reviewOf rdfs:label "review of"@en-US ; @@ -2686,7 +2706,7 @@ obo:ERO_0000045 vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - . + . vivo:Division rdfs:label "Division"@en-US ; @@ -3291,7 +3311,7 @@ vcard:honorificSuffix vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot - ; + ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -4191,10 +4211,6 @@ vivo:hasFacility "90"^^xsd:int ; vitro:fullPropertyNameAnnot "has facility"^^xsd:string ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot @@ -4273,6 +4289,7 @@ vivo:equipmentFor vitro:selectFromExistingAnnot "true"^^xsd:boolean . + geo:codeGAUL rdfs:label "codeGAUL"@en-US ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -5472,21 +5489,10 @@ bibo:transcriptOf "true"^^xsd:boolean . vivo:facilityFor - rdfs:label "facility for"@en-US ; - vitro:displayLimitAnnot - "5"^^xsd:int ; - vitro:fullPropertyNameAnnot - "facility for"^^xsd:string ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:publicDescriptionAnnot - "This relates a facility as being used for something, e.g. for a particular service."^^xsd:string ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + . bibo:issuer rdfs:label "issuer"@en-US ; @@ -6055,7 +6061,12 @@ vcard:Coresident rdfs:label "Coresident"@en-US . obo:BFO_0000054 - rdfs:label "realized in"@en-US . + rdfs:label "realized in"@en-US ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + . + vivo:College rdfs:label "College"@en-US ; @@ -6745,7 +6756,7 @@ vivo:dateTimeInterval vitro:displayLimitAnnot "1"^^xsd:int ; vitro:displayRankAnnot - "19"^^xsd:int ; + "9"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:inPropertyGroupAnnot @@ -7512,20 +7523,9 @@ geo:validUntil vitro:hiddenFromDisplayBelowRoleLevelAnnot . - - vivo:equipmentFor - rdfs:label "equipment for"@en-US ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean . vivo:hasEquipment + rdfs:label "has equipment"@en-US ; vitro:displayRankAnnot "80"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -7536,8 +7536,8 @@ vivo:hasEquipment ; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; - rdfs:label "has equipment"@en-US . + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . rdfs:label "is cited as data source by"@en-US ; From cabd58dd0a3bc8a4d29417fe7f26ca6e04ea7ac6 Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 2 Dec 2013 10:57:42 -0500 Subject: [PATCH 2/8] updates for issues VIVO-507 and VIVO-589 --- rdf/display/everytime/PropertyConfig.n3 | 2 +- src/org/vivoweb/webapp/util/ModelUtils.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index d017dc24..6322ed57 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -1467,7 +1467,7 @@ local:awardOrHonorReceiptsConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "receipts" ; vitro:displayRankAnnot 3; - vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ; :propertyGroup . diff --git a/src/org/vivoweb/webapp/util/ModelUtils.java b/src/org/vivoweb/webapp/util/ModelUtils.java index 629d9f52..b59dc4ca 100644 --- a/src/org/vivoweb/webapp/util/ModelUtils.java +++ b/src/org/vivoweb/webapp/util/ModelUtils.java @@ -103,6 +103,7 @@ public class ModelUtils { List properties = new ArrayList(); properties.add(processPropertyURI); properties.add(nonProcessPropertyURI); + properties.add(grantPropertyURI); return properties; } @@ -110,6 +111,7 @@ public class ModelUtils { List properties = new ArrayList(); properties.add(processPropertyInverseURI); properties.add(nonProcessPropertyInverseURI); + properties.add(grantPropertyInverseURI); return properties; } } From 803859cec7e413eb095c0ed772abec3fb3a17b0e Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 2 Dec 2013 11:18:03 -0500 Subject: [PATCH 3/8] VIVO-593: fixed java script issue --- .../freemarker/edit/forms/js/adviseeRelationshipUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js b/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js index acf69156..88cba06f 100644 --- a/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js +++ b/productMods/templates/freemarker/edit/forms/js/adviseeRelationshipUtils.js @@ -83,7 +83,7 @@ var adviseeRelUtils = { // we don't want the user to see the label getting built, so hide the acSelector // field and display a bogus field that just has the last name in it. this.fauxLabel.val(lastName); - this.advisee.hide(); + this.advisor.hide(); this.fauxLabel.show(); this.advisor.val(name); this.lastName.val(lastName); From fe6f099a2ab9b8193815a1322a59e294b7ec2bc5 Mon Sep 17 00:00:00 2001 From: hudajkhan Date: Mon, 2 Dec 2013 13:09:52 -0500 Subject: [PATCH 4/8] VIVO 590 updating manageWebpagesGenerator to include range uri for cancel link --- .../edit/forms/manageWebpagesForIndividual.ftl | 3 +-- .../generators/ManageWebpagesForIndividualGenerator.java | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl index 81f38396..c4f0b1d0 100644 --- a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl +++ b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl @@ -11,7 +11,6 @@ <#assign deleteWebpageUrl=editConfiguration.pageData.deleteWebpageUrl!"deleteWebpageUrl is undefined"> <#assign showAddFormUrl=editConfiguration.pageData.showAddFormUrl!"showAddFormUrl is undefined"> <#assign predicateUri=editConfiguration.predicateUri!"undefined"> -<#assign domainUri = editConfiguration.predicateProperty.domainVClassURI!""> <#if (editConfiguration.pageData.subjectName??) >

${editConfiguration.pageData.subjectName}

@@ -57,7 +56,7 @@ <#-- There is no editConfig at this stage, so we don't need to go through postEditCleanup.jsp on cancel. These can just be ordinary links, rather than a v:input element, as in addAuthorsToInformationResource.jsp. --> - ${i18n().add_new_web_page} + ${i18n().add_new_web_page} ${i18n().return_to_profile} diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java index 90effba9..8911b395 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java @@ -61,11 +61,20 @@ public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationG config.addFormSpecificData("baseEditWebpageUrl", path); + //Also add domainUri and rangeUri if they exist, adding here instead of template + String domainUri = (String) vreq.getParameter("domainUri"); + String rangeUri = (String) vreq.getParameter("rangeUri"); paramMap = new ParamMap(); paramMap.put("subjectUri", config.getSubjectUri()); paramMap.put("predicateUri", config.getPredicateUri()); paramMap.put("editForm" , this.getEditForm() ); paramMap.put("cancelTo", "manage"); + if(domainUri != null && !domainUri.isEmpty()) { + paramMap.put("domainUri", domainUri); + } + if(rangeUri != null && !rangeUri.isEmpty()) { + paramMap.put("rangeUri", rangeUri); + } path = UrlBuilder.getUrl( UrlBuilder.Route.EDIT_REQUEST_DISPATCH ,paramMap); config.addFormSpecificData("showAddFormUrl", path); From 188087c993c99ba97b0ac084cfc2943bcbfc6b7e Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Mon, 2 Dec 2013 13:24:01 -0500 Subject: [PATCH 5/8] Further changes to property group and class group membership, primarily for Service and its subclasses but also to enable a create option for a hasPart relationship with geographic locations --- rdf/display/everytime/PropertyConfig.n3 | 20 +- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 203 +++++++++++-------- 2 files changed, 132 insertions(+), 91 deletions(-) diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index d017dc24..796c6065 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -1023,6 +1023,8 @@ local:geographicLocationContainsLocationConfig a :ObjectPropertyDisplayConfig ; vitro:displayRankAnnot 81; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; :propertyGroup . local:geographicLocationWithinLocationContext a :ConfigContext ; @@ -1035,6 +1037,8 @@ local:geographicLocationWithinLocationConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "part of" ; vitro:displayRankAnnot 82; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1049,6 +1053,8 @@ local:hasSubOrganizationConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "has sub-organization" ; vitro:displayRankAnnot 15; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1063,6 +1069,8 @@ local:subOrganizationWithinConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "organization within" ; vitro:displayRankAnnot 20; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1077,6 +1085,8 @@ local:eventWithinConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "occurs within event" ; vitro:displayRankAnnot 15; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1091,6 +1101,8 @@ local:includesEventConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "includes event" ; vitro:displayRankAnnot 16; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . @@ -1105,17 +1117,19 @@ local:inEventSeriesConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "in event series" ; vitro:displayRankAnnot 17; + vitro:selectFromExistingAnnot "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; :propertyGroup . -local:seriesForEventContext a :ConfigContext ; - :hasConfiguration local:seriesForEventConfig ; +local:eventsForSeriesContext a :ConfigContext ; + :hasConfiguration local:eventsForSeriesConfig ; :configContextFor ; :qualifiedByDomain ; :qualifiedBy . -local:seriesForEventConfig a :ObjectPropertyDisplayConfig ; +local:eventsForSeriesConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :displayName "events in this series" ; vitro:displayRankAnnot 18; diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 61c445f3..a5d5455a 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -267,16 +267,8 @@ bibo:sici "The Serial Item and Contribution Identifier (SICI) is a code (ANSI/NISO standard Z39.56) used to uniquely identify specific volumes, articles or other identifiable parts of a periodical."^^xsd:string . vivo:Licensure - rdfs:label "Licensure"@en-US ; - vitro:displayLimitAnnot - "5"^^xsd:int ; - vitro:displayRankAnnot - "5"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + rdfs:label "Licensure"@en-US . + vivo:inPress rdfs:label "in press"@en-US . @@ -786,7 +778,8 @@ vcard:locality rdfs:label "locality"@en-US . obo:ERO_0000005 - rdfs:label "Service"@en-US . + rdfs:label "Service"@en-US ; + vitro:inClassGroup . vitro:moniker rdfs:label "moniker (deprecated)"@en-US ; @@ -1023,7 +1016,8 @@ geo:nameOfficialRU . obo:ERO_0001255 - rdfs:label "Support Service"@en-US . + rdfs:label "Support Service"@en-US ; + vitro:inClassGroup . vivo:features rdfs:label "features"@en-US ; @@ -1068,16 +1062,7 @@ vivo:featuredIn "true"^^xsd:boolean . vivo:Certification - rdfs:label "Certification"@en-US ; - vitro:displayLimitAnnot - "2"^^xsd:int ; - vitro:displayRankAnnot - "2"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + rdfs:label "Certification"@en-US . vivo:ClinicalRole rdfs:label "Clinical Role"@en-US ; @@ -1182,7 +1167,8 @@ geo:nameCurrencyRU . obo:ERO_0001254 - rdfs:label "Transport Service"@en-US . + rdfs:label "Transport Service"@en-US ; + vitro:inClassGroup . vcard:Child rdfs:label "Child"@en-US . @@ -1319,7 +1305,8 @@ owl:DeprecatedProperty rdfs:label "deprecated property"@en-US . obo:ERO_0001257 - rdfs:label "Data Storage Service"@en-US . + rdfs:label "Data Storage Service"@en-US ; + vitro:inClassGroup . vcard:Kind rdfs:label "VCard Kind"@en-US . @@ -1452,7 +1439,8 @@ vivo:Position . obo:ERO_0001256 - rdfs:label "Material Storage Service"@en-US . + rdfs:label "Material Storage Service"@en-US ; + vitro:inClassGroup . geo:GDPYear rdfs:label "GDPYear"@en-US ; @@ -1506,18 +1494,8 @@ vivo:localAwardId "An institution's local identifier assigned to a grant awarded."^^xsd:string . vivo:IssuedCredential - rdfs:label "Issued Credential"@en-US ; - vitro:displayLimitAnnot - "2"^^xsd:int ; - vitro:displayRankAnnot - "2"^^xsd:int ; - vitro:extendedLinkedData - "true"^^xsd:boolean ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + rdfs:label "Issued Credential"@en-US . + obo:ARG_0000197 rdfs:label "health care provider ID"@en-US ; @@ -1601,7 +1579,8 @@ vivo:publisherOf "true"^^xsd:boolean . obo:ERO_0001259 - rdfs:label "Material Maintenance Service"@en-US . + rdfs:label "Material Maintenance Service"@en-US ; + vitro:inClassGroup . vcard:Home rdfs:label "Home"@en-US . @@ -1664,7 +1643,7 @@ vivo:Contract "-1"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; - vitro:inClassGroup ; + vitro:inClassGroup ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot . @@ -1681,7 +1660,8 @@ bibo:Hearing . obo:ERO_0001258 - rdfs:label "Maintenance Service"@en-US . + rdfs:label "Maintenance Service"@en-US ; + vitro:inClassGroup . obo:UO_0000280 rdfs:label "Rate Unit"@en-US . @@ -2385,7 +2365,8 @@ vivo:grantSubcontractedThrough "true"^^xsd:boolean . obo:ERO_0001260 - rdfs:label "Data Maintenance Service"@en-US . + rdfs:label "Data Maintenance Service"@en-US ; + vitro:inClassGroup . vcard:hasNickname rdfs:label "has nickname"@en-US . @@ -2534,7 +2515,8 @@ obo:ERO_0000044 rdfs:label "has inventory number"@en-US . obo:ERO_0001261 - rdfs:label "Analysis Service"@en-US . + rdfs:label "Analysis Service"@en-US ; + vitro:inClassGroup . obo:ARG_2000065 rdfs:label "American Board of Allergy and Immunology"@en-US . @@ -2574,7 +2556,8 @@ bibo:reviewOf "true"^^xsd:boolean . obo:ERO_0001263 - rdfs:label "Material Modification Service"@en-US . + rdfs:label "Material Modification Service"@en-US ; + vitro:inClassGroup . vivo:informationResourceSupportedBy rdfs:label "supported by"@en-US , "supported by"@en-US ; @@ -2705,7 +2688,11 @@ obo:ERO_0000045 ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; - vitro:inPropertyGroupAnnot + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot . vivo:Division @@ -2733,13 +2720,15 @@ vivo:Newsletter . obo:ERO_0001262 - rdfs:label "Data Analysis Service"@en-US . + rdfs:label "Data Analysis Service"@en-US ; + vitro:inClassGroup . vcard:hasKey rdfs:label "has key"@en-US . obo:ERO_0000396 - rdfs:label "Material Production Service"@en-US . + rdfs:label "Material Production Service"@en-US ; + vitro:inClassGroup . vcard:TimeZone rdfs:label "Time Zone"@en-US . @@ -2929,13 +2918,29 @@ bibo:Thesis . obo:ERO_0000046 - rdfs:label "has geographic restriction"@en-US . + rdfs:label "has geographic restriction"@en-US ; + vitro:displayLimitAnnot + "5"^^xsd:int ; + vitro:displayRankAnnot + "32"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . + obo:ARG_2000088 rdfs:label "American Board of Thoracic Surgery"@en-US . obo:ERO_0000395 - rdfs:label "Material Analysis Service"@en-US . + rdfs:label "Material Analysis Service"@en-US ; + vitro:inClassGroup . geo:isSuccessorOf rdfs:label "is successor of"@en-US ; @@ -3037,19 +3042,21 @@ vivo:validIn "2"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . obo:IAO_0000221 rdfs:label "is quality measurement of"@en-US ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + . bibo:Conference rdfs:label "Conference"@en-US ; @@ -4562,12 +4569,20 @@ vivo:hideFromDisplay obo:ERO_0000481 rdfs:label "realizes protocol"@en-US ; + vitro:displayLimitAnnot + "3"^^xsd:int ; + vitro:displayRankAnnot + "85"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . obo:ERO_0000016 rdfs:label "Clinical Trial"@en-US ; @@ -4625,8 +4640,22 @@ vcard:hasURL rdfs:label "has URL"@en-US . obo:ERO_0000482 - rdfs:label "uses software"@en-US . - + rdfs:label "uses software"@en-US ; + vitro:displayLimitAnnot + "5"^^xsd:int ; + vitro:displayRankAnnot + "92"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . + vivo:ResearchProposal rdfs:label "Research Proposal"@en-US ; vitro:displayLimitAnnot @@ -4721,14 +4750,20 @@ vcard:RelatedType obo:ERO_0000460 rdfs:label "has documentation"@en-US ; + vitro:displayLimitAnnot + "5"^^xsd:int ; + vitro:displayRankAnnot + "90"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; - vitro:inPropertyGroupAnnot - ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:selectFromExistingAnnot - "true"^^xsd:boolean . + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . vivo:EditorRole rdfs:label "Editor Role"@en-US ; @@ -5442,7 +5477,21 @@ vivo:researchOverview . obo:ERO_0000390 - rdfs:label "service provided by"@en-US . + rdfs:label "service provided by"@en-US ; + vitro:displayLimitAnnot + "3"^^xsd:int ; + vitro:displayRankAnnot + "5"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . skos:Concept rdfs:label "Concept"@en-US ; @@ -5642,15 +5691,7 @@ vcard:TextPhone obo:ERO_0000391 rdfs:label "Access Service"@en-US ; - vitro:displayLimitAnnot - "-1"^^xsd:int ; - vitro:displayRankAnnot - "20"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + vitro:inClassGroup . vcard:Crush rdfs:label "Crush"@en-US . @@ -5813,15 +5854,8 @@ vcard:Agent obo:ERO_0000392 rdfs:label "Storage Service"@en-US ; - vitro:displayLimitAnnot - "-1"^^xsd:int ; - vitro:displayRankAnnot - "20"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + vitro:inClassGroup . + vivo:translatorOf rdfs:label "translator of"@en-US ; @@ -5855,15 +5889,7 @@ bibo:Document obo:ERO_0000394 rdfs:label "Material Processing Service"@en-US ; - vitro:displayLimitAnnot - "-1"^^xsd:int ; - vitro:displayRankAnnot - "20"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:inClassGroup ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + vitro:inClassGroup . obo:ARG_2000011 rdfs:label "Expertise Measurement Process"@en-US . @@ -5961,7 +5987,8 @@ vivo:GeopoliticalEntity . obo:ERO_0000393 - rdfs:label "Training Service"@en-US . + rdfs:label "Training Service"@en-US ; + vitro:inClassGroup . vivo:sponsors rdfs:label "sponsors award or honor"@en-US ; From dd24baad8bf8f9365dcd6e895c48707c51d3936e Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Mon, 2 Dec 2013 15:43:39 -0500 Subject: [PATCH 6/8] 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 7/8] 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 8/8] 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