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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/web/admin/gotoIndividual.jsp
View file

@ -34,9 +34,9 @@ if( request.getParameter("uri") != null ){
<% /* BJL23 put this is in a catch block because it seems to fail ungracefully for <% /* BJL23 put this is in a catch block because it seems to fail ungracefully for
some clones */ %> some clones */ %>
<c:catch> <c:catch>
<jsp:include page="/${themeDir}jsp/identity.jsp" flush="true"/> <jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
<div id="contentwrap"> <div id="contentwrap">
<jsp:include page="/${themeDir}jsp/menu.jsp" flush="true"/> <jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
<!-- end of formPrefix.jsp --> <!-- end of formPrefix.jsp -->
</c:catch> </c:catch>

5
webapp/web/edit/formPrefix.jsp
View file

@ -61,7 +61,6 @@
<% } %> <% } %>
<% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false"; <% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false";
if (useAutoComplete.equalsIgnoreCase("true")) { %> if (useAutoComplete.equalsIgnoreCase("true")) { %>
<link rel="stylesheet" type="text/css" href="<c:url value="/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.css"/>" /> <link rel="stylesheet" type="text/css" href="<c:url value="/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.css"/>" />
@ -80,8 +79,8 @@
</head> </head>
<body class="formsEdit"> <body class="formsEdit">
<div id="wrap" class="container"> <div id="wrap" class="container">
<jsp:include page="/${themeDir}jsp/identity.jsp" flush="true"/> <jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
<jsp:include page="/${themeDir}jsp/menu.jsp" flush="true"/> <jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
<div id="contentwrap"> <div id="contentwrap">
<div id="content" class="form"> <div id="content" class="form">
<!-- end of formPrefix.jsp --> <!-- end of formPrefix.jsp -->

2
webapp/web/edit/formSuffix.jsp
View file

@ -9,7 +9,7 @@
</div> </div>
<div class="push"></div> <div class="push"></div>
<jsp:include page="/${themeDir}jsp/footer.jsp" flush="true"/> <jsp:include page="/templates/page/freemarkerTransition/footer.jsp" flush="true"/>
</div><!-- end wrap --> </div><!-- end wrap -->

27
webapp/web/error.jsp
View file

@ -22,21 +22,18 @@
request.setAttribute("themeDir", themeDir); request.setAttribute("themeDir", themeDir);
%> %>
<jsp:include page="/templates/page/doctype.jsp"/>
<head> <jsp:include page="/templates/page/doctype.jsp"/>
<head>
<jsp:include page="/templates/page/headContent.jsp"/> <jsp:include page="/templates/page/headContent.jsp"/>
</head> </head>
<body> <!-- generated by error.jsp --> <body> <!-- generated by error.jsp -->
<div id="wrap"> <div id="wrap">
<jsp:include page="/${themeDir}jsp/identity.jsp" flush="true"/> <jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
<div id="contentwrap"> <div id="contentwrap">
<jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
<jsp:include page="/${themeDir}jsp/menu.jsp" flush="true"/>
<p>There was an error in the system; please try again later.</p> <p>There was an error in the system; please try again later.</p>
<div> <div>
<h3>Exception: </h3><%= exception %> <h3>Exception: </h3><%= exception %>
</div> </div>
@ -56,10 +53,8 @@
No request information is available. No request information is available.
<% } %> <% } %>
</div> </div>
</div> <!-- contentwrap --> </div> <!-- contentwrap -->
<jsp:include page="/${themeDir}jsp/footer.jsp" flush="true"/> <jsp:include page="/templates/page/freemarkerTransition/footer.jsp" flush="true"/>
</div> <!-- wrap --> </div> <!-- wrap -->
</body> </body>
</html> </html>

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

@ -56,21 +56,20 @@
<c:set var="bodyJsp"><c:out value="${requestScope.bodyJsp}" default="/debug.jsp"/></c:set> <c:set var="bodyJsp"><c:out value="${requestScope.bodyJsp}" default="/debug.jsp"/></c:set>
<jsp:include page="doctype.jsp"/> <jsp:include page="doctype.jsp"/>
<head> <head>
<jsp:include page="headContent.jsp"/> <jsp:include page="headContent.jsp"/>
</head> </head>
<body ${requestScope.bodyAttr}> <body ${requestScope.bodyAttr}>
<div id="wrap" class="container"> <div id="wrap" class="container">
<div id="header"> <div id="header">
<jsp:include page="/${themeDir}jsp/identity.jsp" flush="true"/> <jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
<jsp:include page="/${themeDir}jsp/menu.jsp" flush="true"/> <jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
</div><!--header--> </div><!-- #header -->
<hr class="hidden" /> <hr class="hidden" />
<div id="contentwrap"> <div id="contentwrap">
<c:import url="${bodyJsp}"/> <c:import url="${bodyJsp}"/>
</div> <!-- contentwrap --> </div> <!-- #contentwrap -->
<jsp:include page="/${themeDir}jsp/footer.jsp" flush="true"/> <jsp:include page="/templates/page/freemarkerTransition/footer.jsp" flush="true"/>
</div> <!-- wrap --> </div> <!-- #wrap -->
</body> </body>
</html> </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>