Author: ghuber
Date: Sun Oct 20 09:55:47 2013
New Revision: 1533866
URL: http://svn.apache.org/r1533866
Log:
Tidy up
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/error-page.vm
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/error-parse.vm
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/error-page.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/error-page.vm?rev=1533866&r1=1533865&r2=1533866&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/error-page.vm
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/error-page.vm
Sun Oct 20 09:55:47 2013
@@ -33,14 +33,17 @@
.bannerStatusBox a {color: white;}
.bannerStatusBox a:link {color: white;}
.bannerStatusBox a:visited {color: white;}
+ span.error {display: block;background-color: #fcc;color: #c00;border:
1px solid red;margin: 25px 0px;padding: 10px;font-weight: bold;}
+ span.error ul {list-style-type: none;margin-top: 0px;margin-left:
0;margin-bottom: 0;padding: 3px;}
.dottedtable {border: 1px dotted #CCCCCC;}
</style
</head>
+ <!-- error-page -->
<body>
-
- <div id="banner">
- <div id="bannerStatusBox">
- <table class="bannerStatusBox" cellpadding="0" cellspacing="0">
+
+ <div id="banner">
+ <div id="bannerStatusBox">
+ <table class="bannerStatusBox" cellpadding="0" cellspacing="0">
<tr>
<td class="bannerLeft"></td>
<td class="bannerRight">
@@ -48,13 +51,18 @@
</td>
</tr>
</table>
- </div>
+ </div>
</div>
<div style="padding: 15px 25px 25px 25px">
- <h2 class="error">Velocity template error</h2>
-
- <table width="80%" border="1px" class="dottedtable"
style="border-collapse: collapse;">
+ <h2 class="error">Velocity Template Error</h2>
+ <span class="error">
+ <ul>
+ <li>$text.get("errorPage.title")</li>
+ <li>$text.get("errorPage.message")</li>
+ </ul>
+ </span>
+ <table width="80%" class="dottedtable" style="border-collapse:
collapse;">
<tr>
<td class="dottedtable" width="20%">Velocity Exception</td>
<td class="dottedtable">Velocity template error :
$exceptionDevice</td>
@@ -71,8 +79,8 @@
<td class="dottedtable" width="20%">Exception</td>
<td class="dottedtable">$!exception.getClass().getName()</td>
</tr>
- </table>
- </div>
+ </table>
+ </div>
</body>
</html>
\ No newline at end of file
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/error-parse.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/error-parse.vm?rev=1533866&r1=1533865&r2=1533866&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/error-parse.vm
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/templates/error-parse.vm
Sun Oct 20 09:55:47 2013
@@ -18,47 +18,31 @@
#*
Velocity #parse error include page
*#
-<style>
- span.error {
- display: block;
- background-color: #fcc;
- color: #c00;
- border: 1px solid red;
- margin: 5px 10px 5px 10px;
- padding: 10px;
- font-weight: bold;
- }
- span.error ul {
- list-style-type: none;
- margin-top: 0px;
- margin-left: 0;
- margin-bottom: 0;
- padding: 3px;
- }
- .dottedtable {border: 1px dotted #CCCCCC;}
-</style>
-<span class="error">
- <ul>
- <li>Velocity template error</li>
- </ul>
-</span>
-<div style="padding: 15px 25px 25px 25px">
- <table width="80%" border="1px" class="dottedtable" style="border-collapse:
collapse;">
+<!-- error-parse -->
+<div style="padding: 10px;white-space: normal;">
+ <h2 style="background-color: inherit;color: #CC0000;margin: 0;padding:
0;">Velocity Template Error</h2>
+ <span style="display: block;background-color: #fcc;color: #c00;border: 1px
solid red;margin: 15px 0px;padding: 10px;font-weight: bold;">
+ <ul style="list-style-type: none;margin-top: 0;margin-left:
0;margin-bottom: 0;padding: 3px;">
+ <li>$text.get("errorPage.title")</li>
+ <li>$text.get("errorPage.message")</li>
+ </ul>
+ </span>
+ <table width="100%" style="border-collapse: collapse; border: 1px dotted
#CCCCCC;">
<tr>
- <td class="dottedtable" width="20%">Exception</td>
- <td class="dottedtable">Velocity template error : $exceptionDevice</td>
+ <td style="border: 1px dotted #CCCCCC;" width="25%">Exception</td>
+ <td style="border: 1px dotted #CCCCCC;">Velocity template error :
$exceptionDevice</td>
</tr>
<tr>
- <td class="dottedtable" width="20%">Message</td>
- <td
class="dottedtable">$utils.autoformat($utils.escapeHTML($exception.getMessage()))</td>
+ <td style="border: 1px dotted #CCCCCC;" width="25%">Message</td>
+ <td style="border: 1px dotted
#CCCCCC;">$utils.autoformat($utils.escapeHTML($exception.getMessage()))</td>
</tr>
<tr>
- <td class="dottedtable" width="20%">Type</td>
- <td class="dottedtable">$exceptionSource</td>
+ <td style="border: 1px dotted #CCCCCC;" width="25%">Type</td>
+ <td style="border: 1px dotted #CCCCCC;">$exceptionSource</td>
</tr>
<tr>
- <td class="dottedtable" width="20%">Exception</td>
- <td class="dottedtable">$!exception.getClass().getName()</td>
+ <td style="border: 1px dotted #CCCCCC;" width="25%">Exception</td>
+ <td style="border: 1px dotted
#CCCCCC;">$!exception.getClass().getName()</td>
</tr>
</table>
</div>
