From e3e38c87c6f2bbc31ce9f57674beb44fd5f75918 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 11 May 2010 20:37:50 +0000
Subject: [PATCH] Move FreeMarker templates, controllers, setup, and library
 upgrades into trunk. Not used to generate any pages or templates yet (except
 a couple of hidden pages that are only available through the url).

---
 themes/vivo-basic/css/screen.css   |  7 ++++++-
 themes/vivo-basic/jsp/identity.jsp | 12 ++++++------
 themes/vivo-basic/jsp/menu.jsp     |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/themes/vivo-basic/css/screen.css b/themes/vivo-basic/css/screen.css
index 8ae0832e..fe76241c 100644
--- a/themes/vivo-basic/css/screen.css
+++ b/themes/vivo-basic/css/screen.css
@@ -101,11 +101,16 @@ ul#otherMenu li {
   margin-left: 4px;
 }
 
-ul#otherMenu li.border {
+ul#otherMenu li {
   padding-right: 4px;
   border-right: 1px solid #ccc;
 }
 
+ul#otherMenu li.last {
+  padding-right: 0;
+  border-right: none;
+}
+
 
 /************************
 Navigation and Search
diff --git a/themes/vivo-basic/jsp/identity.jsp b/themes/vivo-basic/jsp/identity.jsp
index c693896f..0681b25d 100644
--- a/themes/vivo-basic/jsp/identity.jsp
+++ b/themes/vivo-basic/jsp/identity.jsp
@@ -106,11 +106,11 @@ portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
         <c:param name="home" value="${currentPortal}" />
       </c:url>
  
-      <li class="border">
+      <li>
         Logged in as <strong><%= loginName %></strong> (<a href="${logoutHref}">Log out</a>)     
       </li>
       
-      <li class="border"><a href="${siteAdminHref}" >Site Admin</a></li>
+      <li><a href="${siteAdminHref}" >Site Admin</a></li>
        
     <%-- A user is not logged in --%>
     <% } else { %>
@@ -120,7 +120,7 @@ portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
         <c:param name="login" value="block"/>
       </c:url>
     
-      <li class="border"><a title="log in to manage this site" href="${loginHref}">Log in</a></li>
+      <li><a title="log in to manage this site" href="${loginHref}">Log in</a></li>
     <% } %>
 
     <c:url var="aboutHref" value="<%= Controllers.ABOUT %>">
@@ -129,11 +129,11 @@ portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
     <c:set var="aboutHref">
       <c:out value="${aboutHref}" escapeXml="true"/>
     </c:set>
-     
-    <li<c:if test="${contactMailSetup}"> class="border"</c:if>><a href="${aboutHref}" title="more about this web site">About</a></li>
+
+    <li<c:if test="${!contactMailSetup}"> class="last"</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>
+    	<li class="last"><a href='<c:url value="/comments"><c:param name="home" value="${currentPortal}"/></c:url>'>Contact Us</a></li>
     </c:if>
   </ul>
 
diff --git a/themes/vivo-basic/jsp/menu.jsp b/themes/vivo-basic/jsp/menu.jsp
index 2aa7ed92..55384952 100644
--- a/themes/vivo-basic/jsp/menu.jsp
+++ b/themes/vivo-basic/jsp/menu.jsp
@@ -45,8 +45,8 @@
 
      String uri = (String)request.getAttribute("javax.servlet.forward.request_uri");
      if(uri != null){
-    	 request.setAttribute("indexClass", uri.indexOf("browsecontroller") > 0 ? "class=\"activeTab\"" : "");
-
+         request.setAttribute("indexClass", uri.endsWith("browsecontroller") ? "class=\"activeTab\"" : "");
+         
          if ( uri.indexOf("about") > 0) {
            request.setAttribute("aboutClass","class=\"activeTab\"");
          }