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

79
webapp/web/error.jsp
View file

@ -12,54 +12,49 @@
Portal portal = vreq.getPortal();
String themeDir = portal!=null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT;
request.setAttribute("bodyJsp", "/errorbody.jsp");
request.setAttribute("title", "Error");
request.setAttribute("css", "");
request.setAttribute("portalBean", portal);
request.setAttribute("appBean", appBean);
request.setAttribute("themeDir", themeDir);
request.setAttribute("appBean", appBean);
request.setAttribute("themeDir", themeDir);
%>
<jsp:include page="/templates/page/doctype.jsp"/>
<head>
<jsp:include page="/templates/page/headContent.jsp"/>
</head>
<body> <!-- generated by error.jsp -->
<div id="wrap">
<jsp:include page="/${themeDir}jsp/identity.jsp" flush="true"/>
<div id="contentwrap">
<jsp:include page="/${themeDir}jsp/menu.jsp" flush="true"/>
<p>There was an error in the system; please try again later.</p>
<div>
<h3>Exception: </h3><%= exception %>
</div>
<div>
<% try{ %>
<h3>Trace:</h3><pre><%= ServletUtils.getStackTraceAsString(exception) %></pre>
<% }catch (Exception e){ %>
No trace is available.
<% } %>
</div>
<div>
<% try{ %>
<h3>Request Info:</h3><%= MiscWebUtils.getReqInfo(request) %>
<% }catch (Exception e){ %>
No request information is available.
<% } %>
</div>
<jsp:include page="/templates/page/doctype.jsp"/>
<head>
<jsp:include page="/templates/page/headContent.jsp"/>
</head>
<body> <!-- generated by error.jsp -->
<div id="wrap">
<jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
</div> <!-- contentwrap -->
<jsp:include page="/${themeDir}jsp/footer.jsp" flush="true"/>
</div> <!-- wrap -->
</body>
</html>
<div id="contentwrap">
<jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
<p>There was an error in the system; please try again later.</p>
<div>
<h3>Exception: </h3><%= exception %>
</div>
<div>
<% try{ %>
<h3>Trace:</h3><pre><%= ServletUtils.getStackTraceAsString(exception) %></pre>
<% }catch (Exception e){ %>
No trace is available.
<% } %>
</div>
<div>
<% try{ %>
<h3>Request Info:</h3><%= MiscWebUtils.getReqInfo(request) %>
<% }catch (Exception e){ %>
No request information is available.
<% } %>
</div>
</div> <!-- contentwrap -->
<jsp:include page="/templates/page/freemarkerTransition/footer.jsp" flush="true"/>
</div> <!-- wrap -->
</body>
</html>