litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-707 Add web page and cancel link destinations

Browse source
This commit is contained in:
ryounes 2011-07-12 14:47:41 +00:00
parent c399323d92
commit 69af70e7be
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
productMods/edit/forms/addEditWebpageForm.jsp
View file

@ -130,7 +130,6 @@ core:rank
"formUrl" : "${formUrl}", "formUrl" : "${formUrl}",
"editKey" : "${editKey}", "editKey" : "${editKey}",
"urlPatternToReturnTo" : "${returnPathAfterSubmit}", "urlPatternToReturnTo" : "${returnPathAfterSubmit}",
"urlPatternToCancelTo" : "${returnPathAfterCancel}",
"subject" : ["subject", "${subjectUriJson}" ], "subject" : ["subject", "${subjectUriJson}" ],
"predicate" : ["predicate", "${predicateUriJson}" ], "predicate" : ["predicate", "${predicateUriJson}" ],
@ -228,7 +227,9 @@ core:rank
<c:set var="editMode" value="add" /> <c:set var="editMode" value="add" />
<c:set var="title" value="Add a webpage for" /> <c:set var="title" value="Add a webpage for" />
<c:set var="submitButtonText" value="Add webpage" /> <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:otherwise>
</c:choose> </c:choose>

4
productMods/edit/forms/css/manageWebpagesForIndividual.css
View file

@ -23,6 +23,10 @@ class, in case we want to re-enable DD without a page reload. */
width: 15em; width: 15em;
} }
#addAndCancelLinks {
margin-top: 1.5em;
}
#returnToIndividual { #returnToIndividual {
margin-left: 2em; margin-left: 2em;
} }

19
productMods/edit/forms/manageWebpagesForIndividual.jsp
View file

@ -57,11 +57,12 @@
} // else stay here to manage webpages } // else stay here to manage webpages
VitroRequest vreq = new VitroRequest(request); VitroRequest vreq = new VitroRequest(request);
WebappDaoFactory wdf = vreq.getWebappDaoFactory(); //WebappDaoFactory wdf = vreq.getWebappDaoFactory();
vreq.setAttribute("defaultNamespace", wdf.getDefaultNamespace()); //vreq.setAttribute("defaultNamespace", wdf.getDefaultNamespace());
String subjectName = ((Individual)request.getAttribute("subject")).getName(); String subjectName = ((Individual)request.getAttribute("subject")).getName();
String subjectUri = (String) request.getAttribute("subjectUri"); String subjectUri = (String) request.getAttribute("subjectUri");
String predicateUri = (String) request.getAttribute("predicateUri");
List<Map<String, String>> webpages = getWebpages(subjectUri, vreq); List<Map<String, String>> webpages = getWebpages(subjectUri, vreq);
vreq.setAttribute("webpages", webpages); vreq.setAttribute("webpages", webpages);
@ -95,6 +96,11 @@
<c:set var="subjectUri" value="<%= subjectUri %>" /> <c:set var="subjectUri" value="<%= subjectUri %>" />
<c:url var="returnToIndividualUrl" value="/individual?uri=${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}"/> <jsp:include page="${preForm}"/>
@ -132,8 +138,13 @@
</c:forEach> </c:forEach>
</ul> </ul>
<a href="${showAddFormUrl}" id="showAddForm" class="button">Add Web Page</a> <div id="addAndCancelLinks">
<a href="${returnToIndividualUrl}" id="returnToIndividual">Return to Individual</a> <%-- 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}"/> <jsp:include page="${postForm}"/>