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

NIHVIVO-358 merging bug fixes into trunk

Browse source
This commit is contained in:
nac26 2010-04-13 16:49:33 +00:00
parent 17ef726ad8
commit 59ac3aff2d
2 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
webapp/web/contact_err.jsp
View file

@ -1,5 +1,5 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@ -8,6 +8,8 @@
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
<% <%
VitroRequest vreq = new VitroRequest(request); VitroRequest vreq = new VitroRequest(request);
String errorString=request.getParameter("ERR"); String errorString=request.getParameter("ERR");
@ -16,10 +18,16 @@ if (errorString == null || errorString.equals("")) {
} }
%> %>
<c:set var="portal" value="${requestScope.portalBean}"/>
<c:set var="themeDir"><c:out value="${portalBean.themeDir}"/></c:set>
<%-- Need to get the context --%>
<c:url var="themeDir" value="/${themeDir}"/>
<table> <table>
<tr> <tr>
<td align="center" colspan="3"> <td align="center" colspan="3">
<img src="site_icons/bomb.gif" alt="failed email"/><br/> <img src="${themeDir}site_icons/bomb.gif" alt="failed email"/><br/>
<% if ( errorString != null && !errorString.equals("")) {%> <% if ( errorString != null && !errorString.equals("")) {%>
<p class="normal">We report the following error in processing your request:<br/> <p class="normal">We report the following error in processing your request:<br/>
<b><%=errorString%></b> <b><%=errorString%></b>

47
webapp/web/thankyou.jsp
View file

@ -1,23 +1,28 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ page language="java" %> <%@ page language="java" %>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %>
<%@ page import="java.util.*" %> <%@ page import="java.util.*" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
<% <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
VitroRequest vreq = new VitroRequest(request);
Portal portalBean=vreq.getPortal(); <%
%> VitroRequest vreq = new VitroRequest(request);
Portal portalBean=vreq.getPortal();
<div id="content"> %>
<h2>Feedback</h2>
<c:set var='themeDir'> <c:set var="portal" value="${requestScope.portalBean}"/>
<c:if test="${!empty context && context != ''}">/${context}</c:if>/<%=portalBean.getThemeDir()%> <c:set var="themeDir"><c:out value="${portalBean.themeDir}"/></c:set>
</c:set>
<img src="${themeDir}site_icons/mail.gif" alt="mailbox"/><br/> <%-- Need to get the context --%>
<c:url var="themeDir" value="/${themeDir}"/>
<p>Thank you for contacting our curation and development team. We will respond to your inquiry as soon as possible.</p>
<p>Click to return to the <a href="index.jsp?home=<%=portalBean.getPortalId()%>">home page</a>.</p> <div id="content">
</div><!-- content --> <h2>Feedback</h2>
<img src="${themeDir}site_icons/mail.gif" alt="mailbox"/><br/>
<p>Thank you for contacting our curation and development team. We will respond to your inquiry as soon as possible.</p>
<p>Click to return to the <a href="index.jsp?home=<%=portalBean.getPortalId()%>">home page</a>.</p>
</div><!-- content -->