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

NIHVIVO-1864 Fix menu.jsp to work with changes to menu.ftl and identity.ftl since the initial freemarker transition

Browse source
This commit is contained in:
rjy7 2011-02-03 20:07:00 +00:00
parent 281d2de68f
commit 12406d35d0
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/freemarker/page/partials/search.ftl
View file

@ -16,4 +16,4 @@
<input type="text" name="querytext" id="search" class="search-form-item" value="${querytext!}" size="20" /> <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" /> <input class="search-form-submit" name="submit" type="submit" value="Search" />
</form> </form>
</div> </div> <!-- end searchBlock -->

7
webapp/web/templates/page/freemarkerTransition/menu.jsp
View file

@ -2,7 +2,6 @@
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%> <%-- 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" %> <%@ 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, // 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_menu}
${ftl_search}
</div> <!-- end navAndSearch -->
<div id="breadcrumbs" class="small"><%=BreadCrumbsUtil.getBreadCrumbsDiv(request)%></div>