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

NIHVIVO-173 Followed Brian's pattern to hide "Contact Us" link in footer (footer.jsp) if smtpHost is not set in deploy.properties. Tweaked identity.jsp, making anchor class conditional as well

Browse source
This commit is contained in:
nac26 2010-04-02 23:17:48 +00:00
parent f64d355b11
commit d5aa4cfc25
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
themes/vivo-basic/jsp/footer.jsp
View file

@ -12,7 +12,7 @@
<%@ 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 */ %>
<jsp:useBean id="loginHandler" class="edu.cornell.mannlib.vedit.beans.LoginFormBean" scope="session" /> <%@page import="edu.cornell.mannlib.vitro.webapp.controller.ContactMailServlet"%><jsp:useBean id="loginHandler" class="edu.cornell.mannlib.vedit.beans.LoginFormBean" scope="session" />
<% <%
/** /**
* @version 1.00 * @version 1.00
@ -48,6 +48,7 @@
</c:set> </c:set>
<c:set var='themeDir'><c:out value='${themePath}' default='/themes/vivo-basic/' /></c:set> <c:set var='themeDir'><c:out value='${themePath}' default='/themes/vivo-basic/' /></c:set>
<c:set var="currentPortal" value="<%=portal.getPortalId()%>"/> <c:set var="currentPortal" value="<%=portal.getPortalId()%>"/>
<c:set var="contactMailSetup" value="<%= ContactMailServlet.getSmtpHostFromProperties() != null %>"/>
<div id='footer'> <div id='footer'>
@ -73,7 +74,9 @@
<c:set var="contactHref"> <c:set var="contactHref">
<c:out value="${contactHref}" escapeXml="true"/> <c:out value="${contactHref}" escapeXml="true"/>
</c:set> </c:set>
<li class="last"><a href="${contactHref}" title="feedback form">Contact Us</a></li> <c:if test="${contactMailSetup}">
<li class="last"><a href="${contactHref}" title="feedback form">Contact Us</a></li>
</c:if>
</ul> </ul>
</div> </div>

2
themes/vivo-basic/jsp/identity.jsp
View file

@ -130,7 +130,7 @@ portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
<c:out value="${aboutHref}" escapeXml="true"/> <c:out value="${aboutHref}" escapeXml="true"/>
</c:set> </c:set>
<li class="border"><a href="${aboutHref}" title="more about this web site">About</a></li> <li<c:if test="${contactMailSetup}"> class="border"</c:if>><a href="${aboutHref}" title="more about this web site">About</a></li>
<c:if test="${contactMailSetup}" > <c:if test="${contactMailSetup}" >
<li><a href='<c:url value="/comments"><c:param name="home" value="${currentPortal}"/></c:url>'>Contact Us</a></li> <li><a href='<c:url value="/comments"><c:param name="home" value="${currentPortal}"/></c:url>'>Contact Us</a></li>