From 77c2a282959562db653671f1cb5f717a508f91ab Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 11 Jul 2011 21:40:51 +0000
Subject: [PATCH] NIHVIVO-707 Small modifications to markup on Manage Web Pages
 screen

---
 .../forms/css/manageWebpagesForIndividual.css     | 15 ++-------------
 .../edit/forms/manageWebpagesForIndividual.jsp    | 10 +++++-----
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/productMods/edit/forms/css/manageWebpagesForIndividual.css b/productMods/edit/forms/css/manageWebpagesForIndividual.css
index 33491faf..d6d99e47 100644
--- a/productMods/edit/forms/css/manageWebpagesForIndividual.css
+++ b/productMods/edit/forms/css/manageWebpagesForIndividual.css
@@ -23,33 +23,22 @@ class, in case we want to re-enable DD without a page reload. */
     width: 15em;
 }
 
-#showAddForm span.or {
-    display: none;
-}
-
-#showAddForm a.cancel {
+#returnToIndividual {
     margin-left: 2em;
 }
 
 #manageWebpages a:link.remove, 
-#manageWebpages a:visited.remove,
-#manageWebpages a:link.undo, 
-#manageWebpages a:visited.undo,  
+#manageWebpages a:visited.remove,  
 #manageWebpages a:hover.remove,
-#manageWebpages a:hover.undo,
 #showAddForm a:hover.cancel {
     color: #fff;
     background: #f70;
 }
 
 #manageWebpages a:hover.remove,
-#manageWebpages a:hover.undo,
 #showAddForm a:hover.cancel {
     color: #fff;
     background: #f70;
 }
 
-#manageWebpages a.undo {
-    margin-left: 1em;
-}
 
diff --git a/productMods/edit/forms/manageWebpagesForIndividual.jsp b/productMods/edit/forms/manageWebpagesForIndividual.jsp
index ced029c3..70aff55f 100644
--- a/productMods/edit/forms/manageWebpagesForIndividual.jsp
+++ b/productMods/edit/forms/manageWebpagesForIndividual.jsp
@@ -92,7 +92,9 @@
 %>
 
 <c:url var="deleteWebpageUrl" value="/edit/primitiveDelete" />
-<c:url var="returnToIndividualUrl" value="/individual?uri=<%= subjectUri %>" />
+
+<c:set var="subjectUri" value="<%= subjectUri %>" />
+<c:url var="returnToIndividualUrl" value="/individual?uri=${subjectUri}" />
 
 <jsp:include page="${preForm}"/>
 
@@ -130,10 +132,8 @@
     </c:forEach>
 </ul>
 
-<div id="showAddForm">
-    <a href="${showAddFormUrl}" class="button">Add Web Page</a>
-    <a href="${returnToIndividualUrl}" class="">Return to Individual</a>
-</div> 
+<a href="${showAddFormUrl}" id="showAddForm" class="button">Add Web Page</a>
+<a href="${returnToIndividualUrl}" id="returnToIndividual">Return to Individual</a>
 
 <jsp:include page="${postForm}"/>