Add annotations for educational background-related custom form and short view. Update educationalBackground custom form to use EducationalAttainment.

productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf

@@ -1398,6 +1398,7 @@ source: http://www.fao.org/countryprofiles/geopol_v10/dataproperties/geopolitica
     <j.0:exampleAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Currently any abstract name is given to members of this class. This could change in the future.</j.0:exampleAnnot>
     <j.0:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <j.0:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
+    <j.0:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">edBackgroundShortView.jsp</j.0:customShortViewAnnot>
   </rdf:Description>
   <rdf:Description rdf:about="http://purl.org/ontology/bibo/degree">
     <j.0:descriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The source of the public description and this info is found here:  http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html.  Bibo considers this term "unstable".  The bibo editorial note is: "We are not defining, using an enumeration, the range of the bibo:degree to the defined list of bibo:ThesisDegree. We won't do it because we want people to be able to define new degress if needed by some special usecases. Creating such an enumeration would restrict this to happen."</j.0:descriptionAnnot>
@@ -1912,6 +1913,7 @@ The Uniform Code Council (UCC) was the Numbering Organization in the USA to admi
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#educationalBackground">
     <j.0:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
+    <j.0:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">personHasEducationalBackground.jsp</j.0:customEntryFormAnnot>
     <j.0:publicDescriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">This relates a person to the description of their educational background.</j.0:publicDescriptionAnnot>
     <j.0:fullPropertyNameAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">educational background</j.0:fullPropertyNameAnnot>
     <j.0:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">5</j.0:displayLimitAnnot>

productMods/edit/forms/personHasEducationalBackground.jsp

@@ -45,17 +45,17 @@
 <c:set var="rdf" value="<%= VitroVocabulary.RDF %>" />
 <c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" />
 <c:set var="label" value="${rdfs}label" />
-<c:set var="edBackgroundClass" value="${vivoCore}EducationalBackground" />
+<c:set var="edBackgroundClass" value="${vivoCore}EducationalAttainment" />
 <c:set var="orgClass" value="http://xmlns.com/foaf/0.1/Organization" />
 <c:set var="degreeClass" value="${vivoCore}AcademicDegree" />
 <%--
 Classes: 
-core:EducationalBackground - primary new individual being created
+core:EducationalAttainment - primary new individual being created
 foaf:Person - existing individual
 foaf:Organization - new or existing individual
 core:AcademicDegree - existing individual
 
-Data properties of EducationalBackground:
+Data properties of EducationalAttainment:
 core:majorField
 core:year
 core:departmentOrSchool
@@ -63,13 +63,13 @@ core:supplementalInformation
 
 Object properties (domain : range)
 
-core:educationalBackground (Person : EducationalBackground) - inverse of educationalBackgroundOf
+core:educationalBackground (Person : EducationalAttainment) - inverse of educationalBackgroundOf
-core:educationalBackgroundOf (EducationalBackground : Person) - inverse of educationalBackground
+core:educationalBackgroundOf (EducationalAttainment : Person) - inverse of educationalBackground
 
-core:degreeTypeAwarded (EducationalBackground : AcademicDegree) - inverse of awardedTo
+core:degreeTypeAwarded (EducationalAttainment : AcademicDegree) - inverse of awardedTo
-core:awardedTo (AcademicDegree : EducationalBackground) - inverse of degreeTypeAwarded
+core:awardedTo (AcademicDegree : EducationalAttainment) - inverse of degreeTypeAwarded
 
-core:organizationGrantingDegree (EducationalBackground : Organization) - no inverse
+core:organizationGrantingDegree (EducationalAttainment : Organization) - no inverse
 
 <%-- Data properties --%>
 <%--  Then enter a SPARQL query for each field, by convention concatenating the field id with "Existing"
@@ -156,7 +156,7 @@ the org type still gets asserted. --%>
     ?person core:educationalBackground  ?edBackgroundUri .
     
     ?edBackgroundUri core:educationalBackgroundOf ?person ;
-                     a core:EducationalBackground ,
+                     a core:EducationalAttainment ,
                        <${flagURI}> .
 </v:jsonset>
 

productMods/templates/entity/edBackgroundShortView.jsp

@@ -7,7 +7,7 @@
 <%-- 
     This is a custom short view render for educational background.
     The variable individual is the OBJECT of the property statement to be rendered. -- 
-    In this JSP that is the  Educational Background, not the Person, Organization or DegreeType
+    In this JSP that is the  Educational Attainment object, not the Person, Organization or DegreeType
  --%>
 
 <c:choose>