diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf index f944e660..210e5563 100644 --- a/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf @@ -1877,7 +1877,7 @@ display level true true - personHasEducationalBackground.jsp + personHasEducationalTraining.jsp true This relates a person to the description of their educational background. 15 @@ -3309,7 +3309,7 @@ display level 5 1 - addPublicationToAuthor.jsp + addPublicationToPerson.jsp has authorship This relates a person to their authorship information. diff --git a/productMods/edit/forms/addPublicationToAuthor.jsp b/productMods/edit/forms/addPublicationToPerson.jsp similarity index 100% rename from productMods/edit/forms/addPublicationToAuthor.jsp rename to productMods/edit/forms/addPublicationToPerson.jsp diff --git a/productMods/edit/forms/css/personHasEducationalBackground.css b/productMods/edit/forms/css/personHasEducationalTraining.css similarity index 100% rename from productMods/edit/forms/css/personHasEducationalBackground.css rename to productMods/edit/forms/css/personHasEducationalTraining.css diff --git a/productMods/edit/forms/personHasEducationalBackground.jsp b/productMods/edit/forms/personHasEducationalTraining.jsp similarity index 97% rename from productMods/edit/forms/personHasEducationalBackground.jsp rename to productMods/edit/forms/personHasEducationalTraining.jsp index 4c03a5f7..66a7718a 100644 --- a/productMods/edit/forms/personHasEducationalBackground.jsp +++ b/productMods/edit/forms/personHasEducationalTraining.jsp @@ -15,11 +15,11 @@ core:supplementalInformation Object properties (domain : range) -core:educationalBackground (Person : EducationalTraining) - inverse of educationalBackgroundOf -core:educationalBackgroundOf (EducationalTraining : Person) - inverse of educationalBackground +core:educationalTraining (Person : EducationalTraining) - inverse of core:educationalTrainingOf +core:educationalTrainingOf (EducationalTraining : Person) - inverse of core:educationalTraining -core:degreeEarned (EducationalTraining : AcademicDegree) - inverse of degreeOutcomeOf -core:degreeOutcomeOf (AcademicDegree : EducationalTraining) - inverse of degreeEarned +core:degreeEarned (EducationalTraining : AcademicDegree) - inverse of core:degreeOutcomeOf +core:degreeOutcomeOf (AcademicDegree : EducationalTraining) - inverse of core:degreeEarned core:organizationGrantingDegree (EducationalTraining : Organization) - no inverse @@ -174,9 +174,9 @@ the org type still gets asserted. --%> @prefix core: <${vivoCore}> . - ?person core:educationalBackground ?edTrainingUri . + ?person core:educationalTraining ?edTrainingUri . - ?edTrainingUri core:educationalBackgroundOf ?person ; + ?edTrainingUri core:educationalTrainingOf ?person ; a core:EducationalTraining . @@ -366,7 +366,7 @@ the org type still gets asserted. --%> request.setAttribute("customJs", customJs); List customCss = new ArrayList(Arrays.asList("/edit/forms/css/customForm.css", - "/edit/forms/css/personHasEducationalBackground.css" + "/edit/forms/css/personHasEducationalTraining.css" )); request.setAttribute("customCss", customCss); %> diff --git a/productMods/templates/entity/educationalTrainingShortView.jsp b/productMods/templates/entity/educationalTrainingShortView.jsp index 7c1409cf..9fd87817 100644 --- a/productMods/templates/entity/educationalTrainingShortView.jsp +++ b/productMods/templates/entity/educationalTrainingShortView.jsp @@ -15,7 +15,7 @@ <%-- SUBJECT is a Person --%> - + <%-- Degree type and major --%> @@ -85,7 +85,7 @@ - + ${personName} @@ -123,6 +123,6 @@ <%-- This clause is when there is no object individual defined, it should never be reached. --%> - +