You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2011/10/10 21:11:18 UTC
svn commit: r1181143 - in
/incubator/rave/trunk/rave-portal-resources/src/main/webapp:
WEB-INF/views/error.jsp WEB-INF/web.xml css/default.css
Author: mfranklin
Date: Mon Oct 10 19:11:18 2011
New Revision: 1181143
URL: http://svn.apache.org/viewvc?rev=1181143&view=rev
Log:
Updated error page style (Supports RAVE-291)
Modified:
incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp
incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml
incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp?rev=1181143&r1=1181142&r2=1181143&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/views/error.jsp Mon Oct 10 19:11:18 2011
@@ -1,11 +1,11 @@
-<%@ page isErrorPage="true" %><%--
---%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%--
---%><%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %><%--
---%><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %><%--
---%><%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %><%--
---%><%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags" %><%--
---%><%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%><%--
---%><rave:rave_generic_page pageTitle="Error: ${exception.message}">
+<%@ page isErrorPage="true" trimDirectiveWhitespaces="true" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%>
+<rave:rave_generic_page pageTitle="Error: ${errorData.statusCode}">
<header>
<h1>
<fmt:message key="page.error.title" />
@@ -17,23 +17,22 @@
title="Error has occurred"/></div>
<div class="errorMessage">
<fmt:message key="page.error.message" />
- <a href="javascript: window.location.reload();"><fmt:message key="page.error.reload" /></a>.<br/>
+ <a href="javascript: window.location.reload();"><fmt:message key="page.error.reload" /></a>.<br/>
<a onclick="document.getElementById('errorStack').style.display = 'block';"><fmt:message key="page.error.details" /></a>
</div>
</div>
<div id="errorStack" title="Error Details" >
- <button type="button"
- style="margin-bottom: 10px;"
- onClick="document.getElementById('errorStack').style.display = 'none';">Close
- </button>
<pre class="errorTrace">
${exception}
Stack Trace:
- <c:forEach var="i" items="${exception.stackTrace}">
+ <c:forEach var="i" items="${exception}">
${i}
</c:forEach>
</pre>
+ <button type="button"
+ onClick="document.getElementById('errorStack').style.display = 'none';">Close
+ </button>
</div>
</div>
</rave:rave_generic_page>
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml?rev=1181143&r1=1181142&r2=1181143&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml Mon Oct 10 19:11:18 2011
@@ -73,7 +73,7 @@
</welcome-file-list>
<error-page>
- <exception-type>java.lang.Exception</exception-type>
+ <exception-type>java.lang.Throwable</exception-type>
<location>/WEB-INF/views/error.jsp</location>
</error-page>
</web-app>
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css?rev=1181143&r1=1181142&r2=1181143&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css Mon Oct 10 19:11:18 2011
@@ -588,6 +588,8 @@ span.error, label.error {
#errorStack {
display: none;
+ width: 30%;
+ margin:auto;
}
.errorMessage {
@@ -711,4 +713,4 @@ span.error, label.error {
}
.largetextcell {
width: 300px
-}
\ No newline at end of file
+}