From c5e740efa20edbfeacfba5118bc8cdbc970978f2 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 4 Jan 2011 00:47:17 +0000
Subject: [PATCH] NIHVIVO-1372 In search of the elusive page title holy grail.
 Set title on defaultAddMissingIndividual and addMissingWithMonikerAndLink to
 "Edit"

---
 webapp/web/edit/forms/addMissingWithMonikerAndLink.jsp    | 8 +++++---
 webapp/web/edit/forms/defaultAddMissingIndividualForm.jsp | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/webapp/web/edit/forms/addMissingWithMonikerAndLink.jsp b/webapp/web/edit/forms/addMissingWithMonikerAndLink.jsp
index 63bb7808d..e73f03d0f 100644
--- a/webapp/web/edit/forms/addMissingWithMonikerAndLink.jsp
+++ b/webapp/web/edit/forms/addMissingWithMonikerAndLink.jsp
@@ -210,11 +210,13 @@
 
     String submitButtonLabel=""; // don't put local variables into the request
     /* title is used by pre and post form fragments */
+    //set title to Edit to maintain functionality from 1.1.1 and avoid updates to Selenium tests
+    request.setAttribute("title", "Edit");
     if (objectUri != null) {
-    	request.setAttribute("title", "Edit \""+propDomainPublic+"\" entry for " + subject.getName());
+    	request.setAttribute("formTitle", "Edit \""+propDomainPublic+"\" entry for " + subject.getName());
         submitButtonLabel = "Save changes";
     } else {
-        request.setAttribute("title","Create \""+propDomainPublic+"\" entry for " + subject.getName());
+        request.setAttribute("formTitle","Create \""+propDomainPublic+"\" entry for " + subject.getName());
         submitButtonLabel = "Create \""+propDomainPublic+"\" entry";
     }
 
@@ -258,7 +260,7 @@ $(document).ready(function() {
 })
 </script>
 
-<h2>${title}</h2>
+<h2>${formTitle}</h2>
 <form action="<c:url value="/edit/processRdfForm2.jsp"/>" >
     <v:input type="text" label="name (required)" id="name" size="30"/>
     <hr/>
diff --git a/webapp/web/edit/forms/defaultAddMissingIndividualForm.jsp b/webapp/web/edit/forms/defaultAddMissingIndividualForm.jsp
index a016b19b3..f8300c78f 100644
--- a/webapp/web/edit/forms/defaultAddMissingIndividualForm.jsp
+++ b/webapp/web/edit/forms/defaultAddMissingIndividualForm.jsp
@@ -231,11 +231,13 @@
 
     String submitButtonLabel="";
     /* title is used by pre and post form fragments */
+    //set title to Edit to maintain functionality from 1.1.1 and avoid updates to Selenium tests
+    request.setAttribute("title", "Edit");
     if (objectUri != null) {
-        request.setAttribute("title", "Edit \""+propDomainPublic+"\" entry for " + subject.getName());
+        request.setAttribute("formTitle", "Edit \""+propDomainPublic+"\" entry for " + subject.getName());
         submitButtonLabel = "Save changes";
     } else {
-        request.setAttribute("title","Create \""+propDomainPublic+"\" entry for " + subject.getName());
+        request.setAttribute("formTitle","Create \""+propDomainPublic+"\" entry for " + subject.getName());
         submitButtonLabel = "Create \""+propDomainPublic+"\" entry";
     }
 
@@ -246,7 +248,7 @@
     <jsp:param name="useAutoComplete" value="false"/>
 </jsp:include>
 
-<h2>${title}</h2>
+<h2>${formTitle}</h2>
 <form action="<c:url value="/edit/processRdfForm2.jsp"/>" ><br/>
     <v:input type="text" label="name (required)" id="name" size="30"/><br/>    
     <v:input type="submit" id="submit" value="<%=submitButtonLabel%>" cancel="true"/>