You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2020/02/17 20:26:26 UTC
[wicket] branch master updated: WICKET-6749: move CSS for error
pages to css file
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new ccda6b4 WICKET-6749: move CSS for error pages to css file
ccda6b4 is described below
commit ccda6b44b97e819dfa87da671152af5d46bc4caa
Author: Emond Papegaaij <em...@topicus.nl>
AuthorDate: Mon Feb 17 21:26:01 2020 +0100
WICKET-6749: move CSS for error pages to css file
---
.../markup/html/pages/AbstractErrorPage.java | 11 +++
.../wicket/markup/html/pages/AccessDeniedPage.html | 6 --
.../markup/html/pages/ExceptionErrorPage.html | 13 ----
.../markup/html/pages/InternalErrorPage.html | 6 --
.../markup/html/pages/PageExpiredErrorPage.html | 6 --
.../pages/{AbstractErrorPage.java => error.css} | 86 ++++++++++++----------
6 files changed, 59 insertions(+), 69 deletions(-)
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java
index d33a12c..9b0cacb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java
@@ -16,9 +16,12 @@
*/
package org.apache.wicket.markup.html.pages;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.CssResourceReference;
/**
* A parent page for all pages that are used to show an error to the user. Setups the common
@@ -54,4 +57,12 @@ public abstract class AbstractErrorPage extends WebPage
{
return false;
}
+
+ @Override
+ public void renderHead(IHeaderResponse response)
+ {
+ super.renderHead(response);
+ response.render(CssHeaderItem
+ .forReference(new CssResourceReference(AbstractErrorPage.class, "error.css")));
+ }
}
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.html b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.html
index ed6688b..ec81b39 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.html
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.html
@@ -4,12 +4,6 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
<title>Access Denied Page</title>
-<style type="text/css">
-body {margin-left : 2em;font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans';font-size: 9pt;line-height: 1.8em;}
-h1,h2,h3,h4,h5,h6 {color: #E9601A;}
-h1 {font-size : 1.5em;}
-pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica; font-size : 10pt; line-height:1.2em;}
-</style>
</head>
<body>
<h1>Access Denied</h1>
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html
index 27960d7..7dcfc47 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html
@@ -4,19 +4,6 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
<title>Unexpected RuntimeException</title>
-<style type="text/css">
-body {margin-left : 2em;font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans', sans-serif;font-size: 9pt;line-height: 1.8em;}
-h1,h2,h3,h4,h5,h6 {color: #E9601A;}
-h1 {font-size : 1.5em;}
-h2 {font-size : 1.2em;}
-pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica, serif; font-size : 10pt; line-height:1.2em;}
-pre { border : 1px solid #ddd; margin-left : 2em; }
-.resource { color : blue; }
-.componenttree { margin-left : 2em; border : 1px solid #ddd; }
-.componenttree { padding : 10px; }
-.componenttree th { border-bottom : 1px solid #ddd; }
-td > pre { padding : 10px; }
-</style>
</head>
<body>
<h1>Unexpected RuntimeException</h1>
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.html b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.html
index 8008da6..46175d2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.html
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.html
@@ -20,12 +20,6 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
<title>Internal Error</title>
-<style type="text/css">
-body {margin-left : 2em;font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans', sans-serif; font-size: 9pt;line-height: 1.8em;}
-h1,h2,h3,h4,h5,h6 {color: #E9601A;}
-h1 {font-size : 1.5em;}
-pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica, serif; font-size : 10pt; line-height:1.2em;}
-</style>
</head>
<body>
<h1>Internal error</h1>
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.html b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.html
index 66b1203..c60e6cb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.html
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.html
@@ -20,12 +20,6 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
<title>Page Expired</title>
-<style type="text/css">
-body {margin-left : 2em;font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans', sans-serif;font-size: 9pt;line-height: 1.8em;}
-h1,h2,h3,h4,h5,h6 {color: #E9601A;}
-h1 {font-size : 1.5em;}
-pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica, serif; font-size : 10pt; line-height:1.2em;}
-</style>
</head>
<body>
<h1>Page Expired</h1>
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/error.css
similarity index 51%
copy from wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java
copy to wicket-core/src/main/java/org/apache/wicket/markup/html/pages/error.css
index d33a12c..cd1961a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/AbstractErrorPage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/error.css
@@ -14,44 +14,54 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.markup.html.pages;
+body {
+ margin-left: 2em;
+ font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans',
+ sans-serif;
+ font-size: 9pt;
+ line-height: 1.8em;
+}
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
+h1, h2, h3, h4, h5, h6 {
+ color: #E9601A;
+}
-/**
- * A parent page for all pages that are used to show an error to the user. Setups the common
- * settings for an error page.
- */
-public abstract class AbstractErrorPage extends WebPage
-{
- private static final long serialVersionUID = 1L;
-
- protected AbstractErrorPage()
- {
- super();
- }
-
- protected AbstractErrorPage(final IModel<?> model)
- {
- super(model);
- }
-
- protected AbstractErrorPage(final PageParameters parameters)
- {
- super(parameters);
- }
-
- @Override
- public boolean isErrorPage()
- {
- return true;
- }
-
- @Override
- public boolean isVersioned()
- {
- return false;
- }
+h1 {
+ font-size: 1.5em;
+}
+
+h2 {
+ font-size: 1.2em;
+}
+
+pre, table, td {
+ font-family: 'MS Trebuchet', 'Verdana', Arial, Helvetica, serif;
+ font-size: 10pt;
+ line-height: 1.2em;
+}
+
+pre {
+ border: 1px solid #ddd;
+ margin-left: 2em;
}
+
+.resource {
+ color: blue;
+}
+
+.componenttree {
+ margin-left: 2em;
+ border: 1px solid #ddd;
+}
+
+.componenttree {
+ padding: 10px;
+}
+
+.componenttree th {
+ border-bottom: 1px solid #ddd;
+}
+
+td>pre {
+ padding: 10px;
+}
\ No newline at end of file