From 91c8d5d7e9e84d66a24d9fdcf948b9fc0da15640 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 28 Mar 2011 19:49:00 +0000
Subject: [PATCH] NIHVIVO-978 Add examples to "Role in" label for teacher and
 presenter roles

---
 productMods/edit/forms/addPresenterRoleToPerson.jsp | 1 +
 productMods/edit/forms/addRoleToPersonTwoStage.jsp  | 6 +++++-
 productMods/edit/forms/addTeacherRoleToPerson.jsp   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/productMods/edit/forms/addPresenterRoleToPerson.jsp b/productMods/edit/forms/addPresenterRoleToPerson.jsp
index 6bb02e92..764312df 100644
--- a/productMods/edit/forms/addPresenterRoleToPerson.jsp
+++ b/productMods/edit/forms/addPresenterRoleToPerson.jsp
@@ -6,6 +6,7 @@
 	<jsp:param name="buttonLabel" value="presentation role" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />	
 	<jsp:param name="numDateFields" value="1" />
+	<jsp:param name="roleExamples" value="Moderator, Speaker, Panelist" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index 7fcaf60b..97a0431b 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -471,6 +471,10 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
     </c:otherwise>
 </c:choose>
 
+<c:if test="${ ! empty param.roleExamples}">
+    <c:set var="roleExamples" value="(e.g., ${param.roleExamples})" />
+</c:if>
+
 <jsp:include page="${preForm}" />
 
 <% if( mode == EditMode.ERROR ){ %>
@@ -502,7 +506,7 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
 		        <v:input type="hidden" id="roleActivityUri" name="roleActivity" cssClass="acUriReceiver" /> <!-- Field value populated by JavaScript -->
 		    </div>
 	
-	        <p><v:input type="text" id="roleLabel" label="Role in ### ${requiredHint}" size="50" /></p>
+	        <p><v:input type="text" id="roleLabel" label="Role in ### ${requiredHint} ${roleExamples}" size="50" /></p>
 	        
 	        <c:choose>
 	            <c:when test="${numDateFields == 1}">
diff --git a/productMods/edit/forms/addTeacherRoleToPerson.jsp b/productMods/edit/forms/addTeacherRoleToPerson.jsp
index 75c1d7d7..3ea87099 100644
--- a/productMods/edit/forms/addTeacherRoleToPerson.jsp
+++ b/productMods/edit/forms/addTeacherRoleToPerson.jsp
@@ -3,7 +3,7 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="teaching activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#TeacherRole" />
-	
+	<jsp:param name="roleExamples" value="Instructor, Facilitator, Assistant" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions"