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

Miscellaneous minor changes for Freemarker implementation. Restored old entitylist instead of new individuallist until url errors in the latter are fixed.

Browse source
This commit is contained in:
rjy7 2010-06-02 21:20:02 +00:00
parent 74297a14af
commit 0c9d9c4d80
4 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
productMods/themes/vivo-basic/jsp/footer.jsp
View file

@ -4,7 +4,6 @@
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet" %>
<% <%
// If the request was for a jsp rather than a servlet, we didn't get these yet.
// 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,
// since it's the first jsp we hit. // since it's the first jsp we hit.
String footer = (String) request.getAttribute("ftl_footer"); String footer = (String) request.getAttribute("ftl_footer");

1
productMods/themes/vivo-basic/jsp/menu.jsp
View file

@ -5,7 +5,6 @@
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil" %> <%@ 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" %>
<% <%
// If the request was for a jsp rather than a servlet, we didn't get these yet.
// 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,
// since it's the first jsp we hit. // since it's the first jsp we hit.
String menu = (String) request.getAttribute("ftl_menu"); String menu = (String) request.getAttribute("ftl_menu");

2
themes/vivo-basic/ftl/page/partials/footer.ftl
View file

@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#import "/macros/list.ftl" as l> <#import "/lib/list.ftl" as l>
<div id="footer"> <div id="footer">

2
themes/vivo-basic/ftl/page/partials/identity.ftl
View file

@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#import "/macros/list.ftl" as l> <#import "/lib/list.ftl" as l>
<div id="identity"> <div id="identity">