You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/06/06 00:30:40 UTC
svn commit: r544661 - in /roller/trunk/apps/weblogger/web/WEB-INF:
classes/struts.xml jsps/errors/403.jsp jsps/errors/404.jsp
jsps/errors/error.jsp jsps/tiles/head.jsp tiles.xml
Author: agilliland
Date: Tue Jun 5 15:30:39 2007
New Revision: 544661
URL: http://svn.apache.org/viewvc?view=rev&rev=544661
Log:
some final cleanup on error pages.
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml
roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/403.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/404.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/error.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp
roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml
Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml?view=diff&rev=544661&r1=544660&r2=544661
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml Tue Jun 5 15:30:39 2007
@@ -67,7 +67,6 @@
<!-- results made available to all actions -->
<global-results>
<result name="access-denied" type="tiles">.denied</result>
- <result name="error" type="tiles">.error</result>
</global-results>
@@ -83,18 +82,6 @@
<action name="logout">
<result>/roller-ui/logout-redirect.jsp</result>
- </action>
-
- <action name="error">
- <result type="tiles">.error</result>
- </action>
-
- <action name="403">
- <result type="tiles">.403</result>
- </action>
-
- <action name="404">
- <result type="tiles">.404</result>
</action>
<action name="setup"
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/403.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/403.jsp?view=diff&rev=544661&r1=544660&r2=544661
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/403.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/403.jsp Tue Jun 5 15:30:39 2007
@@ -16,31 +16,40 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-
-<h2 class="error"><s:text name="error.title.403" /></h2>
-
-<c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" />
-<c:set var="message" value="${requestScope['javax.servlet.error.message']}" />
-<c:set var="type" value="${requestScope['javax.servlet.error.type']}" />
-
-<table width="80%" border="1px" style="border-collapse: collapse;">
- <tr>
- <td width="20%">Status Code</td>
- <td><c:out value="${status_code}" /></td>
- </tr>
- <tr>
- <td width="20%">Message</td>
- <td><c:out value="${message}" /></td>
- </tr>
- <tr>
- <td width="20%">Type</td>
- <td><c:out value="${type}" /></td>
- </tr>
- <tr>
- <td width="20%">Exception</td>
- <td><s:text name="error.text.403" /></td>
- </tr>
-</table>
-
-<br />
-<br />
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title><s:text name="error.title.403" /></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ </head>
+ <body>
+
+ <h2 class="error"><s:text name="error.title.403" /></h2>
+
+ <c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" />
+ <c:set var="message" value="${requestScope['javax.servlet.error.message']}" />
+ <c:set var="type" value="${requestScope['javax.servlet.error.type']}" />
+
+ <table width="80%" border="1px" style="border-collapse: collapse;">
+ <tr>
+ <td width="20%">Status Code</td>
+ <td><c:out value="${status_code}" /></td>
+ </tr>
+ <tr>
+ <td width="20%">Message</td>
+ <td><c:out value="${message}" /></td>
+ </tr>
+ <tr>
+ <td width="20%">Type</td>
+ <td><c:out value="${type}" /></td>
+ </tr>
+ <tr>
+ <td width="20%">Exception</td>
+ <td><s:text name="error.text.403" /></td>
+ </tr>
+ </table>
+
+ <br />
+ <br />
+ </body>
+</html>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/404.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/404.jsp?view=diff&rev=544661&r1=544660&r2=544661
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/404.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/404.jsp Tue Jun 5 15:30:39 2007
@@ -16,31 +16,45 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-
-<h2 class="error"><s:text name="error.title.404" /></h2>
-
-<c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" />
-<c:set var="message" value="${requestScope['javax.servlet.error.message']}" />
-<c:set var="type" value="${requestScope['javax.servlet.error.type']}" />
-
-<table width="80%" border="1px" style="border-collapse: collapse;">
- <tr>
- <td width="20%">Status Code</td>
- <td><c:out value="${status_code}" /></td>
- </tr>
- <tr>
- <td width="20%">Message</td>
- <td><c:out value="${message}" /></td>
- </tr>
- <tr>
- <td width="20%">Type</td>
- <td><c:out value="${type}" /></td>
- </tr>
- <tr>
- <td width="20%">Exception</td>
- <td><s:text name="error.text.404" /></td>
- </tr>
-</table>
-
-<br />
-<br />
+<fmt:setBundle basename="ApplicationResources" />
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title><fmt:message key="error.title.404" /></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <link rel="stylesheet" type="text/css" media="all" href='<c:url value="/roller-ui/styles/roller.css"/>' />
+ </head>
+ <body>
+
+ <div style="padding: 15px 25px 25px 25px">
+ <h2 class="error"><fmt:message key="error.title.404" /></h2>
+
+ <c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" />
+ <c:set var="message" value="${requestScope['javax.servlet.error.message']}" />
+ <c:set var="type" value="${requestScope['javax.servlet.error.type']}" />
+
+ <table width="80%" border="1px" style="border-collapse: collapse;">
+ <tr>
+ <td width="20%">Status Code</td>
+ <td><c:out value="${status_code}" /></td>
+ </tr>
+ <tr>
+ <td width="20%">Message</td>
+ <td><c:out value="${message}" /></td>
+ </tr>
+ <tr>
+ <td width="20%">Type</td>
+ <td><c:out value="${type}" /></td>
+ </tr>
+ <tr>
+ <td width="20%">Exception</td>
+ <td><fmt:message key="error.text.404" /></td>
+ </tr>
+ </table>
+ </div>
+
+ <br />
+ <br />
+ </body>
+</html>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/error.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/error.jsp?view=diff&rev=544661&r1=544660&r2=544661
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/error.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/errors/error.jsp Tue Jun 5 15:30:39 2007
@@ -16,58 +16,45 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-
-<h2 class="error"><s:text name="errorPage.title" /></h2>
-
-<s:if test="!getProp('site.debugMode')">
- <p><s:text name="errorPage.message" /></p>
-</s:if>
-<s:else>
-
- <c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" />
- <c:set var="message" value="${requestScope['javax.servlet.error.message']}" />
- <c:set var="type" value="${requestScope['javax.servlet.error.type']}" />
- <c:set var="exception" value="${requestScope['javax.servlet.error.exception']}" />
-
- <table width="80%" border="1px" style="border-collapse: collapse;">
- <tr>
- <td width="20%">Status Code</td>
- <td><c:out value="${status_code}" /></td>
- </tr>
- <tr>
- <td width="20%">Message</td>
- <td><c:out value="${message}" /></td>
- </tr>
- <tr>
- <td width="20%">Type</td>
- <td><c:out value="${type}" /></td>
- </tr>
- <tr>
- <td width="20%">Exception</td>
- <td><c:out value="${exception}" /></td>
- </tr>
- </table>
-
- <c:if test="${!empty exception}">
- <%
- java.io.StringWriter sw = new java.io.StringWriter();
- Throwable t = (Throwable)pageContext.getAttribute("exception");
- if (t != null) {
- t.printStackTrace(new java.io.PrintWriter(sw));
- String stackTrace = sw.toString();
- if (stackTrace.trim().length() > 0) {
- %>
- <p>Stack Trace:</p>
- <form>
- <textarea rows="30" style="font-size:8pt;width:80%">
- <%= stackTrace %>
- </textarea>
- </form>
- <% }
- } %>
- </c:if>
-
- <br />
- <br />
-
-</s:else>
+<fmt:setBundle basename="ApplicationResources" />
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title><fmt:message key="errorPage.title" /></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <link rel="stylesheet" type="text/css" media="all" href='<c:url value="/roller-ui/styles/roller.css"/>' />
+ </head>
+ <body>
+ <div style="padding: 15px 25px 25px 25px">
+ <h2 class="error"><fmt:message key="errorPage.title" /></h2>
+
+ <c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" />
+ <c:set var="message" value="${requestScope['javax.servlet.error.message']}" />
+ <c:set var="type" value="${requestScope['javax.servlet.error.type']}" />
+ <c:set var="exception" value="${requestScope['javax.servlet.error.exception']}" />
+
+ <table width="80%" border="1px" style="border-collapse: collapse;">
+ <tr>
+ <td width="20%">Status Code</td>
+ <td><c:out value="${status_code}" /></td>
+ </tr>
+ <tr>
+ <td width="20%">Message</td>
+ <td><c:out value="${message}" /></td>
+ </tr>
+ <tr>
+ <td width="20%">Type</td>
+ <td><c:out value="${type}" /></td>
+ </tr>
+ <tr>
+ <td width="20%">Exception</td>
+ <td><fmt:message key="errorPage.message" /></td>
+ </tr>
+ </table>
+ </div>
+
+ <br />
+ <br />
+ </body>
+</html>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp?view=diff&rev=544661&r1=544660&r2=544661
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp Tue Jun 5 15:30:39 2007
@@ -5,7 +5,7 @@
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/layout.css"/>' />
-<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
+<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/styles/menu.css"/>' />
<link rel="stylesheet" type="text/css" media="all"
Modified: roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml?view=diff&rev=544661&r1=544660&r2=544661
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml Tue Jun 5 15:30:39 2007
@@ -64,15 +64,6 @@
<definition name=".denied" extends=".tiles-errorpage" >
<put name="content" value="/WEB-INF/jsps/errors/denied.jsp" />
</definition>
- <definition name=".error" extends=".tiles-errorpage" >
- <put name="content" value="/WEB-INF/jsps/errors/error.jsp" />
- </definition>
- <definition name=".403" extends=".tiles-errorpage" >
- <put name="content" value="/WEB-INF/jsps/errors/403.jsp" />
- </definition>
- <definition name=".404" extends=".tiles-errorpage" >
- <put name="content" value="/WEB-INF/jsps/errors/404.jsp" />
- </definition>
<!-- core pages (and associates) -->