From e3c30f32273b6779fc2c4af968f7d272f4ecc213 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 8 Sep 2010 14:27:28 +0000
Subject: [PATCH] Merge r1348:1350 from rel-1.1-maint

---
 productMods/templates/entity/roleShortView.jsp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/productMods/templates/entity/roleShortView.jsp b/productMods/templates/entity/roleShortView.jsp
index 7fe7232c..5568cba9 100644
--- a/productMods/templates/entity/roleShortView.jsp
+++ b/productMods/templates/entity/roleShortView.jsp
@@ -29,7 +29,9 @@ Optional vars:
 	<c:when test="${!empty individual}"><%-- individual is the OBJECT of the property referenced -- the Role individual, not the Person or grant --%>
  		<c:choose>
 			<c:when test="${!empty predicateUri}">
-											
+				
+				<c:set var="description" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#description'].dataPropertyStatements[0].data}" />
+				                							
 			    <%-- get years off role --%>
 				<c:set var="startYear" value="${individual.dataPropertyMap[startYearPredicate].dataPropertyStatements[0].data}"/>
                 <c:if test="${! empty startYear}">
@@ -96,7 +98,7 @@ Optional vars:
                                     <c:otherwise><c:set var="name" value="unlabeled ${param.roleActivityLabel} to person relation"/></c:otherwise>
                                </c:choose>
                                <c:set var="name" value="unknown person"/>
-                               <c:set var="label" value="${ ! empty individual.rdfsLabel ? individual.rdfsLabel : 'unlabled param.roleActivityLabel to person relation' }"/>                   
+                               <c:set var="label" value="${ ! empty individual.rdfsLabel ? individual.rdfsLabel : 'unlabeled param.roleActivityLabel to person relation' }"/>                   
                                <c:set var="errorMsg" value="&nbsp;(unidentified person - please edit)"/>
                                <c:set var="uri" value=""/>
 					        </c:otherwise>
@@ -110,6 +112,8 @@ Optional vars:
 				    </c:otherwise>
 			    </c:choose>
 			    
+
+			    
 			    <%-- only show error messages if logged in --%>
 			    <c:if test="${ ! showSelfEdits}">
 			       <c:set var="errorMsg" value=""/>
@@ -120,12 +124,14 @@ Optional vars:
 			    	<c:when test="${!empty uri}">
 			            <c:url var="olink" value="/entity"><c:param name="uri" value="${uri}"/></c:url>
 		                <a href="<c:out value="${olink}"/>">${name}</a>&nbsp;${label}&nbsp;${startYear}${endYearVal} ${errorMsg}
+		                <c:if test="${! empty description}">
+		                  <br />${description}
+		                </c:if>
 		            </c:when>
 		            <c:otherwise>
 		                <p:process><strong>${name}</strong> ${label}</p:process> ${errorMsg}
 		            </c:otherwise>
-		        </c:choose>
-		        
+		        </c:choose>                		        
 			</c:when>
 			<c:otherwise>
 				<c:out value="No predicate available for custom rendering ..."/>