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

Merge r1440 from rel-1.1-maint branch. Moving footer.jsp, identity.jsp, and menu.jsp so they are not tied to vivo-basic and can be used by any theme.

Browse source
This commit is contained in:
nac26 2010-10-04 17:20:03 +00:00
parent 1bd624d550
commit 7e49295417
4 changed files with 82 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

76
productMods/templates/page/basicPage.jsp Normal file
View file

@ -0,0 +1,76 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ page errorPage="/error.jsp"%>
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
<% /***********************************************
Display a single Page in the most basic fashion.
The html <HEAD> is generated followed by the banners and menu.
After that the result of the jsp in the attribute bodyJsp is inserted.
Finally comes the footer.
request.attributes:
"bodyJsp" - jsp of the body of this page.
"title" - title of page
"css" - optional additional css for page
"scripts" - optional name of file containing <script> elements to be included in the page
"bodyAttr" - optional attributes for the <body> tag, e.g. 'onload': use leading space
"portalBean" - PortalBean object for request.
Consider sticking < % = MiscWebUtils.getReqInfo(request) % > in the html output
for debugging info.
bdc34 2006-02-03 created
**********************************************/
/*
String e = "";
if (request.getAttribute("bodyJsp") == null){
e+="basicPage.jsp expects that request parameter 'bodyJsp' be set to the jsp to display as the page body.\n";
}
if (request.getAttribute("title") == null){
e+="basicPage.jsp expects that request parameter 'title' be set to the title to use for page.\n";
}
if (request.getAttribute("css") == null){
e+="basicPage.jsp expects that request parameter 'css' be set to css to include in page.\n";
}
if( request.getAttribute("portalBean") == null){
e+="basicPage.jsp expects that request attribute 'portalBean' be set.\n";
}
if( request.getAttribute("appBean") == null){
e+="basicPage.jsp expects that request attribute 'appBean' be set.\n";
}
if( e.length() > 0 ){
throw new JspException(e);
}
*/
%>
<c:set var="portal" value="${requestScope.portalBean}"/>
<c:set var="themeDir"><c:out value="${portal.themeDir}" /></c:set>
<c:set var="bodyJsp"><c:out value="${requestScope.bodyJsp}" default="/debug.jsp"/></c:set>
<jsp:include page="doctype.jsp"/>
<head>
<jsp:include page="headContent.jsp"/>
</head>
<body ${requestScope.bodyAttr}>
<div id="wrap" class="container">
<div id="header">
<jsp:include page="jsp/identity.jsp" flush="true"/>
<jsp:include page="jsp/menu.jsp" flush="true"/>
</div><!--header-->
<hr class="hidden" />
<div id="contentwrap">
<c:import url="${bodyJsp}"/>
</div> <!-- contentwrap -->
<jsp:include page="jsp/footer.jsp" flush="true"/>
</div> <!-- wrap -->
</body>
</html>

4
productMods/themes/vivo-basic/jsp/footer.jsp → productMods/templates/page/jsp/footer.jsp
View file

@ -2,13 +2,13 @@
<%-- 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.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,
// 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");
if (footer == null) { if (footer == null) {
FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp(request);
} }
%> %>

4
productMods/themes/vivo-basic/jsp/identity.jsp → productMods/templates/page/jsp/identity.jsp
View file

@ -2,9 +2,9 @@
<%-- 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.controller.freemarker.FreemarkerHttpServlet" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet" %>
<% <%
FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp(request);
%> %>
${ftl_identity} ${ftl_identity}

4
productMods/themes/vivo-basic/jsp/menu.jsp → productMods/templates/page/jsp/menu.jsp
View file

@ -3,13 +3,13 @@
<%-- 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.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,
// 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");
if (menu == null) { if (menu == null) {
FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp(request);
} }
%> %>