From 5e07aff4dbf132d3c0f206b12d16c3631be54fe2 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 26 Jul 2010 21:13:30 +0000
Subject: [PATCH] merging from rel-1.1-maint branch: removing "new" from form
 headings in attempt to minimize user confusion. Kept "new" for
 newIndividualForm.jsp but removed "individual" from tail end of heading.
 NIHVIVO-1012

---
 productMods/edit/forms/addGrantRoleToPerson.jsp           | 2 +-
 productMods/edit/forms/addPublicationToPerson.jsp         | 2 +-
 productMods/edit/forms/addRoleToPersonTwoStage.jsp        | 2 +-
 productMods/edit/forms/newIndividualForm.jsp              | 2 +-
 productMods/edit/forms/organizationHasPositionHistory.jsp | 4 ++--
 productMods/edit/forms/personHasEducationalTraining.jsp   | 4 ++--
 productMods/edit/forms/personHasPositionHistory.jsp       | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp
index 1da850bc..171e1bed 100644
--- a/productMods/edit/forms/addGrantRoleToPerson.jsp
+++ b/productMods/edit/forms/addGrantRoleToPerson.jsp
@@ -83,7 +83,7 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest
         <c:set var="disabledVal" value="disabled" />
     </c:when>
     <c:otherwise>
-        <c:set var="formHeading" value="Create a new ${formHeading}" />
+        <c:set var="formHeading" value="Create ${formHeading}" />
         <c:set var="editMode" value="add" />
         <c:set var="labelRequired" value="\"nonempty\"," />
         <c:set var="disabledVal" value="" />
diff --git a/productMods/edit/forms/addPublicationToPerson.jsp b/productMods/edit/forms/addPublicationToPerson.jsp
index bdc30384..427f0fc6 100644
--- a/productMods/edit/forms/addPublicationToPerson.jsp
+++ b/productMods/edit/forms/addPublicationToPerson.jsp
@@ -227,7 +227,7 @@ SPARQL queries for existing values. --%>
 
 <jsp:include page="${preForm}" />
 
-<h2>Create a new publication entry for <%= subjectName %></h2>
+<h2>Create publication entry for <%= subjectName %></h2>
 
 <%@ include file="unsupportedBrowserMessage.jsp" %>
 
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index 28f31a7e..3140320e 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -381,7 +381,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
         <c:set var="disabledVal" value="disabled" />
     </c:when>
     <c:otherwise>
-        <c:set var="titleText" value="Create a new" />
+        <c:set var="titleText" value="Create" />
         <c:set var="editMode" value="add" />
         <c:set var="submitButtonText" value="${buttonLabel}" />
         <c:set var="disabledVal" value="" />
diff --git a/productMods/edit/forms/newIndividualForm.jsp b/productMods/edit/forms/newIndividualForm.jsp
index 648d94ea..9e9c914e 100644
--- a/productMods/edit/forms/newIndividualForm.jsp
+++ b/productMods/edit/forms/newIndividualForm.jsp
@@ -173,7 +173,7 @@ parameter set up by editRequestDispatch.
 
 <jsp:include page="${preForm}" />
 
-<h2>Create a new ${typeName} individual</h2>
+<h2>Create a new ${typeName}</h2>
 
 <form action="<c:url value="/edit/processRdfForm2.jsp"/>" >
 	<c:if test="${! isPersonType}">
diff --git a/productMods/edit/forms/organizationHasPositionHistory.jsp b/productMods/edit/forms/organizationHasPositionHistory.jsp
index 5eacaf4d..d5194ab8 100644
--- a/productMods/edit/forms/organizationHasPositionHistory.jsp
+++ b/productMods/edit/forms/organizationHasPositionHistory.jsp
@@ -176,8 +176,8 @@
 		request.setAttribute("title","Edit position history entry for "+ subject.getName());
 		submitLabel = "Save changes";
 	} else {
-		request.setAttribute("title","Create a new position history entry for " + subject.getName());
-		submitLabel = "Create new position history entry";
+		request.setAttribute("title","Create position history entry for " + subject.getName());
+		submitLabel = "Create position history entry";
 	}
 %>
 
diff --git a/productMods/edit/forms/personHasEducationalTraining.jsp b/productMods/edit/forms/personHasEducationalTraining.jsp
index 2a055323..98e99444 100644
--- a/productMods/edit/forms/personHasEducationalTraining.jsp
+++ b/productMods/edit/forms/personHasEducationalTraining.jsp
@@ -351,9 +351,9 @@ the org type still gets asserted. --%>
     } else { // adding new entry
 %>
         <c:set var="editType" value="add" />
-        <c:set var="title" value="Create a new educational background entry for ${subjectName}" />
+        <c:set var="title" value="Create educational background entry for ${subjectName}" />
         <%-- NB This will be the button text when Javascript is disabled. --%>
-        <c:set var="submitLabel" value="Create New Educational Background" />
+        <c:set var="submitLabel" value="Create Educational Background" />
 <%  } 
     
     List<String> customJs = new ArrayList<String>(Arrays.asList("/js/utils.js",            
diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp
index cc8f485e..9649ee34 100644
--- a/productMods/edit/forms/personHasPositionHistory.jsp
+++ b/productMods/edit/forms/personHasPositionHistory.jsp
@@ -280,7 +280,7 @@
 %>
         <c:set var="editType" value="add" />
         <c:set var="formSteps" value="2" />
-        <c:set var="title" value="Create a new position entry for ${subjectName}" />
+        <c:set var="title" value="Create position entry for ${subjectName}" />
         <%-- NB This will be the button text when Javascript is disabled. --%>
         <c:set var="submitLabel" value="Create position" />
 <%  }