From d5aa4cfc25bca98e6e6ae7813eb6fbe80c2fd189 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 2 Apr 2010 23:17:48 +0000
Subject: [PATCH] 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

---
 themes/vivo-basic/jsp/footer.jsp   | 7 +++++--
 themes/vivo-basic/jsp/identity.jsp | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/themes/vivo-basic/jsp/footer.jsp b/themes/vivo-basic/jsp/footer.jsp
index f5024a0e..38277c5c 100644
--- a/themes/vivo-basic/jsp/footer.jsp
+++ b/themes/vivo-basic/jsp/footer.jsp
@@ -12,7 +12,7 @@
 
 <%@ 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
@@ -48,6 +48,7 @@
 </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="contactMailSetup" value="<%= ContactMailServlet.getSmtpHostFromProperties() != null %>"/>
 
 <div id='footer'>
   
@@ -73,7 +74,9 @@
         <c:set var="contactHref">
           <c:out value="${contactHref}" escapeXml="true"/>
         </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>
 
     </div>
diff --git a/themes/vivo-basic/jsp/identity.jsp b/themes/vivo-basic/jsp/identity.jsp
index 97f2e1be..c693896f 100644
--- a/themes/vivo-basic/jsp/identity.jsp
+++ b/themes/vivo-basic/jsp/identity.jsp
@@ -130,7 +130,7 @@ portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
       <c:out value="${aboutHref}" escapeXml="true"/>
     </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}" >
     	<li><a href='<c:url value="/comments"><c:param name="home" value="${currentPortal}"/></c:url>'>Contact Us</a></li>