Author: kpreisser Date: Wed Sep 25 16:31:22 2013 New Revision: 1526224 URL: http://svn.apache.org/r1526224 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55383 Improve HTML markup of the ErrorReportValve. The design/layout is still the same, but I'm looking into how it can be improved.
Modified: tomcat/trunk/java/org/apache/catalina/util/TomcatCSS.java tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Modified: tomcat/trunk/java/org/apache/catalina/util/TomcatCSS.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/TomcatCSS.java?rev=1526224&r1=1526223&r2=1526224&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/TomcatCSS.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/TomcatCSS.java Wed Sep 25 16:31:22 2013 @@ -30,7 +30,7 @@ public class TomcatCSS { "P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}" + "A {color : black;}" + "A.name {color : black;}" + - "HR {color : #525D76;}"; + ".line {height: 1px; background-color: #525D76; border: none;}"; } Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1526224&r1=1526223&r2=1526224&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Wed Sep 25 16:31:22 2013 @@ -177,18 +177,18 @@ public class ErrorReportValve extends Va StringBuilder sb = new StringBuilder(); - sb.append("<html><head><title>"); + sb.append("<!DOCTYPE html><html><head><title>"); sb.append(ServerInfo.getServerInfo()).append(" - "); sb.append(smClient.getString("errorReportValve.errorReport")); sb.append("</title>"); - sb.append("<style><!--"); + sb.append("<style type=\"text/css\">"); sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS); - sb.append("--></style> "); + sb.append("</style> "); sb.append("</head><body>"); sb.append("<h1>"); sb.append(smClient.getString("errorReportValve.statusHeader", "" + statusCode, message)).append("</h1>"); - sb.append("<HR size=\"1\" noshade=\"noshade\">"); + sb.append("<div class=\"line\"></div>"); sb.append("<p><b>type</b> "); if (throwable != null) { sb.append(smClient.getString("errorReportValve.exceptionReport")); @@ -211,9 +211,9 @@ public class ErrorReportValve extends Va String stackTrace = getPartialServletStackTrace(throwable); sb.append("<p><b>"); sb.append(smClient.getString("errorReportValve.exception")); - sb.append("</b> <pre>"); + sb.append("</b></p><pre>"); sb.append(RequestUtil.filter(stackTrace)); - sb.append("</pre></p>"); + sb.append("</pre>"); int loops = 0; Throwable rootCause = throwable.getCause(); @@ -221,9 +221,9 @@ public class ErrorReportValve extends Va stackTrace = getPartialServletStackTrace(rootCause); sb.append("<p><b>"); sb.append(smClient.getString("errorReportValve.rootCause")); - sb.append("</b> <pre>"); + sb.append("</b></p><pre>"); sb.append(RequestUtil.filter(stackTrace)); - sb.append("</pre></p>"); + sb.append("</pre>"); // In case root cause is somehow heavily nested rootCause = rootCause.getCause(); loops++; @@ -238,7 +238,7 @@ public class ErrorReportValve extends Va } - sb.append("<HR size=\"1\" noshade=\"noshade\">"); + sb.append("<hr class=\"line\">"); sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>"); sb.append("</body></html>"); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org