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 d113c42d..b484f5f9 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 @@ -2295,6 +2295,7 @@ display level -1 -1 + grantPiRoleShortView.jsp @@ -4249,7 +4250,7 @@ display level -1 - grantRoleShortView.jsp + grantCopiRoleShortView.jsp core diff --git a/productMods/templates/entity/grantCopiRoleShortView.jsp b/productMods/templates/entity/grantCopiRoleShortView.jsp new file mode 100644 index 00000000..96631196 --- /dev/null +++ b/productMods/templates/entity/grantCopiRoleShortView.jsp @@ -0,0 +1,7 @@ +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> + + + + + + diff --git a/productMods/templates/entity/grantPiRoleShortView.jsp b/productMods/templates/entity/grantPiRoleShortView.jsp new file mode 100644 index 00000000..9de6429b --- /dev/null +++ b/productMods/templates/entity/grantPiRoleShortView.jsp @@ -0,0 +1,7 @@ +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> + + + + + + diff --git a/productMods/templates/entity/grantRoleShortView.jsp b/productMods/templates/entity/roleShortView.jsp similarity index 89% rename from productMods/templates/entity/grantRoleShortView.jsp rename to productMods/templates/entity/roleShortView.jsp index fabee7e2..50064ace 100644 --- a/productMods/templates/entity/grantRoleShortView.jsp +++ b/productMods/templates/entity/roleShortView.jsp @@ -1,14 +1,17 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - - + <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="http://vitro.mannlib.cornell.edu/vitro/tags/StringProcessorTag" prefix="p" %> -http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole -http://vivoweb.org/ontology/core#roleIn -grant - +<%-- + This short view is intended to be called to handle short views for roles + + The following vars should be set by the jsp that is calling this short view + personToRolePredicate: URI of the person to role predicate. + roleActivityToRolePredicate: URI of the activity to role predicate. + roleActivityLabel: human readable label of activity. --%> + <%-- individual is the OBJECT of the property referenced -- the Role individual, not the Person or grant --%> <%-- c:set var="authorRank" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#authorRank'].dataPropertyStatements[0].data}"/ --%> @@ -17,7 +20,7 @@ <%-- SUBJECT is a Person, so get info from other part of the role --%> - + @@ -36,14 +39,14 @@ - (no ${roleActivityLabel} linked yet) + (no ${param.roleActivityLabel} linked yet) <%-- SUBJECT is an activity of some sort, so get info from the Role about the related Person --%> - + <%-- there is a related Person --%>