From 12406d35d0e016247569c33913b471ee6f6ea70b Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 3 Feb 2011 20:07:00 +0000
Subject: [PATCH] NIHVIVO-1864 Fix menu.jsp to work with changes to menu.ftl
 and identity.ftl since the initial freemarker transition

---
 webapp/web/templates/freemarker/page/partials/search.ftl | 2 +-
 webapp/web/templates/page/freemarkerTransition/menu.jsp  | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/webapp/web/templates/freemarker/page/partials/search.ftl b/webapp/web/templates/freemarker/page/partials/search.ftl
index ee3e410e8..cd84fc1e6 100644
--- a/webapp/web/templates/freemarker/page/partials/search.ftl
+++ b/webapp/web/templates/freemarker/page/partials/search.ftl
@@ -16,4 +16,4 @@
         <input type="text" name="querytext" id="search" class="search-form-item" value="${querytext!}" size="20" />
         <input class="search-form-submit" name="submit" type="submit"  value="Search" />
     </form>
-</div>
\ No newline at end of file
+</div> <!-- end searchBlock -->
\ No newline at end of file
diff --git a/webapp/web/templates/page/freemarkerTransition/menu.jsp b/webapp/web/templates/page/freemarkerTransition/menu.jsp
index 21f61ac0a..0c1989d2a 100644
--- a/webapp/web/templates/page/freemarkerTransition/menu.jsp
+++ b/webapp/web/templates/page/freemarkerTransition/menu.jsp
@@ -2,7 +2,6 @@
 
 <%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
 
-<%@ page import="edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
 <% 
     // This is here as a safety net. We should have gotten the values in identity.jsp,
@@ -13,10 +12,6 @@
     } 
 %>
 
-<div id="navAndSearch" class="block">
-    ${ftl_menu}
-    ${ftl_search}
-</div> <!--  end navAndSearch -->
+${ftl_menu}
 
-<div id="breadcrumbs" class="small"><%=BreadCrumbsUtil.getBreadCrumbsDiv(request)%></div>