From fb7e82ab649677c2c32b6f047d7e982507eddf99 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 22 Jun 2011 14:14:14 +0000
Subject: [PATCH] NIHVIVO-2746 UI changes to editor, reviewer, and organizer
 role forms

---
 .../edit/forms/addEditorRoleToPerson.jsp      |  3 +-
 .../edit/forms/addOrganizerRoleToPerson.jsp   |  1 +
 .../edit/forms/addReviewerRoleToPerson.jsp    |  1 +
 .../edit/forms/addRoleToPersonTwoStage.jsp    | 30 +++++++++----------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/productMods/edit/forms/addEditorRoleToPerson.jsp b/productMods/edit/forms/addEditorRoleToPerson.jsp
index 3d873084..c982d386 100644
--- a/productMods/edit/forms/addEditorRoleToPerson.jsp
+++ b/productMods/edit/forms/addEditorRoleToPerson.jsp
@@ -1,8 +1,9 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleDescriptor" value="editor role" />
+	<jsp:param name="roleDescriptor" value="collection or series editor role" />
 	<jsp:param name="typeSelectorLabel" value="editor role in" />
+	<jsp:param name="showRoleLabelField" value="false" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#EditorRole" />	
     <jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#forInformationResource" />
     <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#linkedRole" />	
diff --git a/productMods/edit/forms/addOrganizerRoleToPerson.jsp b/productMods/edit/forms/addOrganizerRoleToPerson.jsp
index 8576efc8..cf23023a 100644
--- a/productMods/edit/forms/addOrganizerRoleToPerson.jsp
+++ b/productMods/edit/forms/addOrganizerRoleToPerson.jsp
@@ -3,6 +3,7 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleDescriptor" value="organizer of" />
 	<jsp:param name="typeSelectorLabel" value="organizer of" />
+	<jsp:param name="showRoleLabelField" value="false" />
 	<jsp:param name="buttonText" value="organizer role" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OrganizerRole" />	
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
diff --git a/productMods/edit/forms/addReviewerRoleToPerson.jsp b/productMods/edit/forms/addReviewerRoleToPerson.jsp
index a5631376..d181e77a 100644
--- a/productMods/edit/forms/addReviewerRoleToPerson.jsp
+++ b/productMods/edit/forms/addReviewerRoleToPerson.jsp
@@ -4,6 +4,7 @@
 	<jsp:param name="roleDescriptor" value="reviewer of" />
     <jsp:param name="typeSelectorLabel" value="reviewer of" />	
     <jsp:param name="buttonText" value="reviewer role" />
+    <jsp:param name="showRoleLabelField" value="false" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ReviewerRole" />	
     <jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#forInformationResource" />
     <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#linkedRole" />	
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index 521c4b5d..1b88d875 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -91,6 +91,9 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
     ${! empty param.activityToRolePredicate ? param.activityToRolePredicate : "http://vivoweb.org/ontology/core#relatedRole"}
 </c:set>
 <c:set var="numDateFields">${! empty param.numDateFields ? param.numDateFields : 2 }</c:set>
+<c:set var="showRoleLabelField">
+    ${! empty param.showRoleLabelField ? param.showRoleLabelField : true }
+</c:set>
 
 <%
     VitroRequest vreq = new VitroRequest(request);
@@ -167,8 +170,9 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 <c:set var="intervalToEnd" value="${vivoCore}end"/>
 
 <%-- label and type required if we are doing an add or a repair, but not an edit --%> 
-<c:set var="labelRequired" ><%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ?"\"nonempty\"," : "" %></c:set>
-<c:set var="typeRequired" ><%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ?"\"nonempty\"" : "" %></c:set>
+<c:set var="labelRequired" ><%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ? "\"nonempty\"," : "" %></c:set>
+<c:set var="typeRequired" ><%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ? "\"nonempty\"" : "" %></c:set>
+<c:set var="roleLabelRequired">${showRoleLabelField ? "\"nonempty\"," : "" }</c:set>
 
 <v:jsonset var="roleLabelAssertion" >
     ?role <${label}> ?roleLabel .
@@ -236,15 +240,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
   SELECT ?existingRoleLabel WHERE { ?role  <${label}> ?existingRoleLabel . }
 </v:jsonset>
 
-<%-- 
-<v:jsonset var="activityTypeQuery">
-        PREFIX core: <${vivoCore}>
-        SELECT ?existingActivityType WHERE {
-            ?role <${roleToActivityPredicate}> ?existingActivity . 
-            ?existingActivity a ?existingActivityType . 
-        }    
-</v:jsonset>
---%>
 <% 
 request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
 %>
@@ -318,8 +313,9 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
     "predicate" : ["rolePredicate", "${predicateUriJson}" ],
     "object"    : ["role", "${objectUriJson}", "URI" ],
     
-    "n3required"    : [ "${n3ForNewRole}", "${roleLabelAssertion}" ],        
-    "n3optional"    : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}", "${n3ForStart}", "${n3ForEnd}" ],        
+    "n3required"    : [ "${n3ForNewRole}"  ],        
+    "n3optional"    : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}",
+                        "${n3ForStart}", "${n3ForEnd}", "${roleLabelAssertion}" ],        
                                                                                         
     "newResources"  : { "role" : "${defaultNamespace}",
                         "roleActivity" : "${defaultNamespace}",
@@ -385,7 +381,7 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
       },
       "roleLabel" : {
          "newResource"      : "false",
-         "validators"       : [ "nonempty","datatype:${stringDatatypeUriJson}" ],
+         "validators"       : [ ${roleLabelRequired} "datatype:${stringDatatypeUriJson}"  ],
          "optionsType"      : "UNDEFINED",
          "literalOptions"   : [ ],
          "predicateUri"     : "",
@@ -426,7 +422,7 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
         editConfig = new EditConfiguration((String) request.getAttribute("editjson"));     
         EditConfiguration.putConfigInSession(editConfig,session);
         
-      //setup date time edit elements
+        //set up date time edit elements
         Field startField = editConfig.getField("startField");
         startField.setEditElement(
                 new DateTimeWithPrecision(startField, 
@@ -519,7 +515,9 @@ 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} ${roleExamples}" size="50" /></p>
+	        <c:if test="${showRoleLabelField}">
+	           <p><v:input type="text" id="roleLabel" label="Role in ### ${requiredHint} ${roleExamples}" size="50" /></p>
+	        </c:if>
 	        
 	        <c:choose>
 	            <c:when test="${numDateFields == 1}">