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

Merge r6025 from nihvivo-rel-1.1-maint branch. Moved footer.jsp, identity.jsp, and menu.jsp to vitro core (were temporarily in vivo/productMods) so they are not tied to vivo-basic and can be used by any theme. Updated include paths for all templates that include these 3 files.

Browse source
This commit is contained in:
nac26 2010-10-05 03:13:14 +00:00
parent c6679d1e4e
commit ae449f9f2c
8 changed files with 174 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

55
webapp/web/templates/page/basicPage.jsp
View file

@ -21,28 +21,28 @@
"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
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";
}
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";
}
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";
}
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";
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";
e+="basicPage.jsp expects that request attribute 'appBean' be set.\n";
}
if( e.length() > 0 ){
throw new JspException(e);
@ -56,21 +56,20 @@
<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="/${themeDir}jsp/identity.jsp" flush="true"/>
<jsp:include page="/${themeDir}jsp/menu.jsp" flush="true"/>
</div><!--header-->
<hr class="hidden" />
<div id="contentwrap">
<c:import url="${bodyJsp}"/>
</div> <!-- contentwrap -->
<jsp:include page="/${themeDir}jsp/footer.jsp" flush="true"/>
</div> <!-- wrap -->
</body>
</html>
<head>
<jsp:include page="headContent.jsp"/>
</head>
<body ${requestScope.bodyAttr}>
<div id="wrap" class="container">
<div id="header">
<jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
<jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
</div><!-- #header -->
<hr class="hidden" />
<div id="contentwrap">
<c:import url="${bodyJsp}"/>
</div> <!-- #contentwrap -->
<jsp:include page="/templates/page/freemarkerTransition/footer.jsp" flush="true"/>
</div> <!-- #wrap -->
</body>
</html>

16
webapp/web/templates/page/freemarkerTransition/footer.jsp Normal file
View file

@ -0,0 +1,16 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
<%@ 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,
// since it's the first jsp we hit.
String footer = (String) request.getAttribute("ftl_footer");
if (footer == null) {
FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
}
%>
${ftl_footer}
${ftl_googleAnalytics}

11
webapp/web/templates/page/freemarkerTransition/identity.jsp Normal file
View file

@ -0,0 +1,11 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
<%
FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
%>
${ftl_identity}

22
webapp/web/templates/page/freemarkerTransition/menu.jsp Normal file
View file

@ -0,0 +1,22 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%-- 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,
// since it's the first jsp we hit.
String menu = (String) request.getAttribute("ftl_menu");
if (menu == null) {
FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
}
%>
<div id="navAndSearch" class="block">
${ftl_menu}
${ftl_search}
</div> <!-- end navAndSearch -->
<div id="breadcrumbs" class="small"><%=BreadCrumbsUtil.getBreadCrumbsDiv(request)%></div>