Adding feedback from search IndexController instead of a blank screen, so user knows when indexing is finished. NIHVIVO-783

Working on shor views for grants. NIHVIVO-630.

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

@@ -2295,6 +2295,7 @@ display level 	</vitro:publicDescriptionAnnot>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayLimitAnnot>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayRankAnnot>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
+    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">grantPiRoleShortView.jsp</vitro:customShortViewAnnot>
   </rdf:Description>
   <rdf:Description rdf:about="http://aims.fao.org/aos/geopolitical.owl#nameShortFR">
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody"/>
@@ -4249,7 +4250,7 @@ display level 	</vitro:publicDescriptionAnnot>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayRankAnnot>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
-    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">grantRoleShortView.jsp</vitro:customShortViewAnnot>
+    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">grantCopiRoleShortView.jsp</vitro:customShortViewAnnot>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core">
     <vitro:ontologyPrefixAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">core</vitro:ontologyPrefixAnnot>

productMods/templates/entity/grantCopiRoleShortView.jsp

@@ -0,0 +1,7 @@
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<jsp:include page="roleShortView.jsp">
+	<jsp:param name="personToRolePredicate" value="http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole"/>
+	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#roleIn"/>
+	<jsp:param name="roleActivityLabel" value="grant"/>
+</jsp:include>

productMods/templates/entity/grantPiRoleShortView.jsp

@@ -0,0 +1,7 @@
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<jsp:include page="roleShortView.jsp">
+	<jsp:param name="personToRolePredicate" value="http://vivoweb.org/ontology/core#hasPrincipalInvestigatorRole"/>
+	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#roleIn"/>
+	<jsp:param name="roleActivityLabel" value="grant"/>
+</jsp:include>

productMods/templates/entity/roleShortView.jsp

@@ -1,13 +1,16 @@
 <%-- $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" %>
 
-<c:set var="personToRolePredicate">http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole</c:set>
+<%-- 
-<c:set var="roleActivityToRolePredicate">http://vivoweb.org/ontology/core#roleIn</c:set>
+ This short view is intended to be called to handle short views for roles
-<c:set var="roleActivityLabel">grant</c:set>
+ 
+ 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.   --%>
  
 <c:choose>
 	<c:when test="${!empty individual}"><%-- individual is the OBJECT of the property referenced -- the Role individual, not the Person or grant --%>
@@ -17,7 +20,7 @@
  			    <c:choose>
  			    
  			    	<%-- SUBJECT is a Person, so get info from other part of the role --%>
-				    <c:when test="${predicateUri == personToRolePredicate}">
+				    <c:when test="${predicateUri == param.personToRolePredicate}">
 					    <c:choose>
                             <c:when test="${!empty individual.objectPropertyMap['http://vivoweb.org/ontology/core#relatedRole']}">
 					            <c:set var="roleActivity" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#relatedRole'].objectPropertyStatements[0].object}" />
@@ -36,14 +39,14 @@
                                         <c:set var="name" value="unlabeled role"/>
                                     </c:otherwise>
  				                </c:choose>
-                                <c:set var="label" >(no ${roleActivityLabel} linked yet)</c:set>
+                                <c:set var="label" >(no ${param.roleActivityLabel} linked yet)</c:set>
                                 <c:set var="uri" value="${individual.URI}"/>
 				            </c:otherwise>
 				        </c:choose>
 				    </c:when>
 				    
 				    <%-- SUBJECT is an activity of some sort, so get info from the Role about the related Person --%>
-				    <c:when test="${predicateUri == roleActivityToRolePredicate}">				    				   
+				    <c:when test="${predicateUri == param.roleActivityToRolePredicate}">				    				   
 				    	<c:choose>
 				    	
 				    	    <%-- there is a related Person --%>