From 69af70e7beb218256dc33ab80c1522acf6253d97 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 12 Jul 2011 14:47:41 +0000
Subject: [PATCH] NIHVIVO-707 Add web page and cancel link destinations

---
 productMods/edit/forms/addEditWebpageForm.jsp |  5 +++--
 .../forms/css/manageWebpagesForIndividual.css |  4 ++++
 .../forms/manageWebpagesForIndividual.jsp     | 19 +++++++++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/productMods/edit/forms/addEditWebpageForm.jsp b/productMods/edit/forms/addEditWebpageForm.jsp
index a189c22f..69c342d3 100644
--- a/productMods/edit/forms/addEditWebpageForm.jsp
+++ b/productMods/edit/forms/addEditWebpageForm.jsp
@@ -130,7 +130,6 @@ core:rank
     "formUrl" : "${formUrl}",
     "editKey" : "${editKey}",
     "urlPatternToReturnTo" : "${returnPathAfterSubmit}",
-    "urlPatternToCancelTo" : "${returnPathAfterCancel}",
     
     "subject"   : ["subject",    "${subjectUriJson}" ],
     "predicate" : ["predicate", "${predicateUriJson}" ],
@@ -228,7 +227,9 @@ core:rank
         <c:set var="editMode" value="add" />
         <c:set var="title" value="Add a webpage for" />        
         <c:set var="submitButtonText" value="Add webpage" />
-        <c:set var="cancelUrl" value="/individual" />
+        <%-- Cancel to where ever we came from: either directly from the profile page, or from
+             the Manage Web Pages screen. The latter has added a url param to signal itself. --%>
+        <c:set var="cancelUrl" value="${ param.cancelTo == 'manage' ? '' : '/individual' }" />
     </c:otherwise>
 </c:choose>
 
diff --git a/productMods/edit/forms/css/manageWebpagesForIndividual.css b/productMods/edit/forms/css/manageWebpagesForIndividual.css
index 28bf2af3..aa5dc1ec 100644
--- a/productMods/edit/forms/css/manageWebpagesForIndividual.css
+++ b/productMods/edit/forms/css/manageWebpagesForIndividual.css
@@ -23,6 +23,10 @@ class, in case we want to re-enable DD without a page reload. */
     width: 15em;
 }
 
+#addAndCancelLinks {
+    margin-top: 1.5em;
+}
+
 #returnToIndividual {
     margin-left: 2em;
 }
diff --git a/productMods/edit/forms/manageWebpagesForIndividual.jsp b/productMods/edit/forms/manageWebpagesForIndividual.jsp
index 70aff55f..7400c54e 100644
--- a/productMods/edit/forms/manageWebpagesForIndividual.jsp
+++ b/productMods/edit/forms/manageWebpagesForIndividual.jsp
@@ -57,11 +57,12 @@
     } // else stay here to manage webpages
 
     VitroRequest vreq = new VitroRequest(request);
-    WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-    vreq.setAttribute("defaultNamespace", wdf.getDefaultNamespace());
+    //WebappDaoFactory wdf = vreq.getWebappDaoFactory();
+    //vreq.setAttribute("defaultNamespace", wdf.getDefaultNamespace());
     
     String subjectName = ((Individual)request.getAttribute("subject")).getName();
     String subjectUri = (String) request.getAttribute("subjectUri");
+    String predicateUri = (String) request.getAttribute("predicateUri");
     
     List<Map<String, String>> webpages = getWebpages(subjectUri, vreq);
     vreq.setAttribute("webpages", webpages);
@@ -95,6 +96,11 @@
 
 <c:set var="subjectUri" value="<%= subjectUri %>" />
 <c:url var="returnToIndividualUrl" value="/individual?uri=${subjectUri}" />
+<c:url var="showAddFormUrl" value="/edit/editRequestDispatch.jsp">
+    <c:param name="subjectUri" value="<%= subjectUri %>" />
+    <c:param name="predicateUri" value="<%= predicateUri %>" />
+    <c:param name="cancelTo" value="manage" />
+</c:url>
 
 <jsp:include page="${preForm}"/>
 
@@ -132,8 +138,13 @@
     </c:forEach>
 </ul>
 
-<a href="${showAddFormUrl}" id="showAddForm" class="button">Add Web Page</a>
-<a href="${returnToIndividualUrl}" id="returnToIndividual">Return to Individual</a>
+<div id="addAndCancelLinks">
+    <%-- There is no editConfig at this stage, so we don't need to go through postEditCleanup.jsp on cancel.
+         These can just be ordinary links, rather than a v:input element, as in 
+         addAuthorsToInformationResource.jsp. --%>
+    <a href="${showAddFormUrl}" id="showAddForm" class="button green">Add Web Page</a>
+    <a href="${returnToIndividualUrl}" id="returnToIndividual" class="return">Return to Individual</a>
+</div>
 
 <jsp:include page="${postForm}"/>