This is an automated email from the ASF dual-hosted git repository. papegaaij pushed a commit to branch csp-examples in repository https://gitbox.apache.org/repos/asf/wicket.git
commit e05af4a2a7b4149029fd5dced15d78982689ddd1 Author: Emond Papegaaij <[email protected]> AuthorDate: Thu Jan 30 21:50:43 2020 +0100 WICKET-6737: moved inline styling to css files --- .../apache/wicket/markup/html/debug/PageView.html | 12 -- .../apache/wicket/markup/html/debug/PageView.java | 12 +- .../html/debug/PageViewCSSResourceReference.java | 36 +++++ .../apache/wicket/markup/html/debug/pageview.css | 25 +++ .../org/apache/wicket/devutils/DevUtilsPage.html | 48 ------ .../org/apache/wicket/devutils/DevUtilsPage.java | 10 ++ .../devutils/inspector/EnhancedPageView.html | 47 ------ .../devutils/inspector/EnhancedPageView.java | 12 +- .../wicket/devutils/inspector/enhancedpageview.css | 57 +++++++ .../wicket/examples/WicketExampleApplication.java | 4 + .../apache/wicket/examples/WicketExamplePage.java | 4 + .../compref/CheckBoxMultipleChoicePage.html | 2 +- .../wicket/examples/compref/CheckBoxPage.html | 2 +- .../wicket/examples/compref/CheckGroupPage.html | 2 +- .../wicket/examples/compref/CheckGroupPage2.html | 2 +- .../examples/compref/DropDownChoicePage.html | 2 +- .../wicket/examples/compref/FragmentPage.html | 4 +- .../org/apache/wicket/examples/compref/Index.html | 2 +- .../wicket/examples/compref/ListChoicePage.html | 2 +- .../examples/compref/ListMultipleChoicePage.html | 2 +- .../apache/wicket/examples/compref/MyBorder.html | 2 +- .../wicket/examples/compref/PalettePage.html | 8 - .../wicket/examples/compref/PalettePage.java | 12 ++ .../wicket/examples/compref/RadioChoicePage.html | 2 +- .../wicket/examples/compref/RadioGroupPage.html | 2 +- .../wicket/examples/compref/RadioGroupPage2.html | 2 +- .../apache/wicket/examples/compref/SelectPage.html | 6 +- .../wicket/examples/compref/TextAreaPage.html | 2 +- .../wicket/examples/compref/TextFieldPage.html | 2 +- .../apache/wicket/examples/compref/palettepage.css | 22 +++ .../wicket/examples/forminput/FormInput.html | 4 +- .../apache/wicket/examples/source/SourcesPage.html | 155 ------------------- .../apache/wicket/examples/source/SourcesPage.java | 12 ++ .../org/apache/wicket/examples/template/Index.html | 2 +- .../wicket/examples/velocity/DynamicPage.html | 2 +- .../org/apache/wicket/examples/velocity/Home.html | 2 +- .../org/apache/wicket/examples/source/style.css | 169 +++++++++++++++++++++ .../resources/org/apache/wicket/examples/style.css | 20 ++- .../src/main/webapp/to_be_included.html | 4 +- 39 files changed, 417 insertions(+), 300 deletions(-) diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.html b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.html index c7ad02d..6673679 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.html +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.html @@ -16,18 +16,6 @@ limitations under the License. --> <html xmlns:wicket="http://wicket.apache.org";> -<head> -<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;font-size : -1;} -pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica, serif; font-size : 10pt; line-height:1.2em;} -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; } -.tablestyle { margin-left : 2em; border : 1px solid #bbb; } -</style> -</head> <body> <wicket:panel> <h2>Page</h2> diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java index 8df984d..15d0029 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.java @@ -22,13 +22,16 @@ import java.util.Comparator; import java.util.List; import org.apache.wicket.Component; -import org.apache.wicket.util.io.IClusterable; import org.apache.wicket.MetaDataKey; import org.apache.wicket.Page; +import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.Panel; +import org.apache.wicket.request.resource.CssResourceReference; +import org.apache.wicket.util.io.IClusterable; import org.apache.wicket.util.lang.Bytes; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.visit.IVisit; @@ -225,4 +228,11 @@ public final class PageView extends Panel return data; } + + @Override + public void renderHead(IHeaderResponse response) + { + super.renderHead(response); + response.render(CssHeaderItem.forReference(PageViewCSSResourceReference.get())); + } } diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageViewCSSResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageViewCSSResourceReference.java new file mode 100644 index 0000000..5a0eabf --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageViewCSSResourceReference.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.markup.html.debug; + +import org.apache.wicket.request.resource.CssResourceReference; + +public final class PageViewCSSResourceReference extends CssResourceReference +{ + private static final long serialVersionUID = 6795863553105608280L; + + private static final PageViewCSSResourceReference INSTANCE = new PageViewCSSResourceReference(); + + public static PageViewCSSResourceReference get() + { + return INSTANCE; + } + + private PageViewCSSResourceReference() + { + super(PageViewCSSResourceReference.class, "pageview.css"); + } +} diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/pageview.css b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/pageview.css new file mode 100644 index 0000000..3d41352 --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/pageview.css @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +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;font-size : -1;} +pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica, serif; font-size : 10pt; line-height:1.2em;} +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; } +h1 img { vertical-align: middle; } +.resource { color : blue; } +.tablestyle { margin-left : 2em; border : 1px solid #bbb; } diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html index 98a45ee..b2d2665 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html @@ -18,54 +18,6 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>DevUtilsPage.html</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,h7,h8 { - color: #E9601A; - font-size: -1; -} - -pre,table,td { - font-family: 'MS Trebuchet', 'Verdana', Arial, Helvetica; - font-size: 10pt; - line-height: 1.2em; -} - -h2 { - font-size: 1.2em; -} - -pre,table,td { - font-family: 'MS Trebuchet', 'Verdana', Arial, Helvetica; - font-size: 10pt; - line-height: 1.2em; -} - -pre { - border: 1px solid #ddd; - margin-left: 2em; -} - -h1 img { - vertical-align: middle; -} - -.resource { - color: blue; -} - -.tablestyle { - margin-left: 2em; - border: 1px solid #bbb; -} -</style> -<title>Requests Page</title> </head> <body> <div wicket:id="debug"></div> diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java index 16e5954..86e81aa 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java @@ -17,7 +17,10 @@ package org.apache.wicket.devutils; import org.apache.wicket.devutils.debugbar.DebugBar; +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.markup.html.debug.PageViewCSSResourceReference; import org.apache.wicket.model.IModel; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -72,4 +75,11 @@ public class DevUtilsPage extends WebPage super.onBeforeRender(); DevelopmentUtilitiesNotEnabledException.check(); } + + @Override + public void renderHead(IHeaderResponse response) + { + super.renderHead(response); + response.render(CssHeaderItem.forReference(PageViewCSSResourceReference.get())); + } } diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.html index f06cf2c..35a2b31 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.html @@ -16,53 +16,6 @@ limitations under the License. --> <html xmlns:wicket="http://wicket.apache.org";> -<head> -<wicket:head> - <style> -.enhancedViewPage table { - border: 1px solid #DDDDDD; -} - -.enhancedViewPage th { - background: #C3C3C3; - color: white; - font-weight: bold; - padding: 0.2em; -} - -.enhancedViewPage tr.even { - background-color: #FFFFFF; -} - -.enhancedViewPage tr.odd { - background-color: #EEEEEE; -} - -.enhancedViewPage td { - padding: 0 0.2em; -} - -.enhancedViewPage .col_size { - text-align: left; - white-space: nowrap; -} - -.enhancedViewPage .col_renderTime { - text-align: center; - white-space: nowrap; -} - -.enhancedViewPage .col_path { - text-align: left; - min-width: 15em; -} - -.enhancedViewPage .col_stateless { - text-align: center; -} -</style> -</wicket:head> -</head> <body> <wicket:panel> <h2>Page</h2> diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java index 61deca5..cf90ff9 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java @@ -30,7 +30,6 @@ import java.util.Set; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.Page; -import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; import org.apache.wicket.ajax.markup.html.form.AjaxFallbackButton; @@ -44,6 +43,8 @@ import org.apache.wicket.extensions.markup.html.repeater.tree.AbstractTree; import org.apache.wicket.extensions.markup.html.repeater.tree.DefaultTableTree; import org.apache.wicket.extensions.markup.html.repeater.tree.table.TreeColumn; import org.apache.wicket.extensions.markup.html.repeater.util.SortableTreeProvider; +import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.debug.PageView; import org.apache.wicket.markup.html.form.CheckBox; @@ -56,6 +57,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; +import org.apache.wicket.request.resource.CssResourceReference; import org.apache.wicket.util.io.IClusterable; import org.apache.wicket.util.lang.Bytes; import org.apache.wicket.util.string.Strings; @@ -792,4 +794,12 @@ public final class EnhancedPageView extends GenericPanel<Page> throw new UnsupportedOperationException(); } } + + @Override + public void renderHead(IHeaderResponse response) + { + super.renderHead(response); + response.render(CssHeaderItem.forReference( + new CssResourceReference(EnhancedPageView.class, "enhancedpageview.css"))); + } } diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/enhancedpageview.css b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/enhancedpageview.css new file mode 100644 index 0000000..9db29b5 --- /dev/null +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/enhancedpageview.css @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +.enhancedViewPage table { + border: 1px solid #DDDDDD; +} + +.enhancedViewPage th { + background: #C3C3C3; + color: white; + font-weight: bold; + padding: 0.2em; +} + +.enhancedViewPage tr.even { + background-color: #FFFFFF; +} + +.enhancedViewPage tr.odd { + background-color: #EEEEEE; +} + +.enhancedViewPage td { + padding: 0 0.2em; +} + +.enhancedViewPage .col_size { + text-align: left; + white-space: nowrap; +} + +.enhancedViewPage .col_renderTime { + text-align: center; + white-space: nowrap; +} + +.enhancedViewPage .col_path { + text-align: left; + min-width: 15em; +} + +.enhancedViewPage .col_stateless { + text-align: center; +} diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java index 3794cbf..b63c0ac 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java @@ -57,5 +57,9 @@ public abstract class WicketExampleApplication extends WebApplication getDebugSettings().setDevelopmentUtilitiesEnabled(true); getResourceSettings().setCssCompressor(new CssUrlReplacer()); + getCsp().blocking().strict().reportBack() + .add(CSPDirective.STYLE_SRC, + "https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css";) + .add(CSPDirective.FONT_SRC, "https://maxcdn.bootstrapcdn.com";); } } diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java index 37faad4..f997778 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java @@ -100,6 +100,10 @@ public class WicketExamplePage extends WebPage @Override public void renderHead(IHeaderResponse response) { + response.render(CssHeaderItem.forReference( + new CssResourceReference(WicketExamplePage.class, "fonts/source-code-pro/stylesheet.css"), "screen")); + response.render(CssHeaderItem.forReference( + new CssResourceReference(WicketExamplePage.class, "fonts/source-sans-pro/stylesheet.css"), "screen")); response.render(CssHeaderItem.forReference(new CssResourceReference(WicketExamplePage.class, "style.css"),"screen")); } } diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html index 619bb00..eebf478 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html @@ -15,7 +15,7 @@ <p> <form wicket:id="form"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">Select your favorite sites</td> <td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html index 9c731c5..7fa4c07 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html @@ -16,7 +16,7 @@ <p> <form wicket:id="form"> - <table style="border: 2px dotted #fc0; width: 300px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">I want it checked!</td> <td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html index 7245ce0..4f99d81 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html @@ -15,7 +15,7 @@ <p> <form wicket:id="form"> <span wicket:id="group"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">Select persons</td> <td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html index ac4c40c..23f7fc7 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html @@ -16,7 +16,7 @@ <form wicket:id="form"> <wicket:container wicket:id="group"> <wicket:container wicket:id="group2"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">Select persons</td> <td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html index 9a3514d..393f075 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html @@ -16,7 +16,7 @@ <p> <form wicket:id="form"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">Select your favorite site</td> <td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html index 9cb8740..c56540b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html @@ -20,7 +20,7 @@ </body> <wicket:fragment wicket:id="fragmentid"> - <p style="border: 2px dotted #fc0; padding: 5px;"> + <p class="dotted-box"> A fragment is like a panel, but can be 'inlined', meaning it does not need it's own markup file, but can be defined in the markup file of another. For this @@ -33,4 +33,4 @@ </p> </wicket:fragment> -</html> \ No newline at end of file +</html> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html index 0d574e7..9bd571b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html @@ -8,7 +8,7 @@ <h1>Component reference</h1> - <p style="border: 2px dotted #fc0; width: 500px; padding: 5px;"> + <p class="dotted-box"> This example makes up Wicket's component reference. It lists the main component set of Wicket, and shows you how to use them with short examples. Read the comments on diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html index deb197b..1dfc55f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html @@ -15,7 +15,7 @@ <p> <form wicket:id="form"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">Select your favorite site</td> <td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html index 0a7b9e6..e419d4f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html @@ -15,7 +15,7 @@ <p> <form wicket:id="form"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">Select your favorite sites</td> <td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyBorder.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyBorder.html index a645743..374e92c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyBorder.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MyBorder.html @@ -10,7 +10,7 @@ Might be handy as preview code. <wicket:border> - <div style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <div class="dotted-box"> before the border contents <br /> <wicket:body/> <br />after the border contents <br /> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html index 22c084f..af70106 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html @@ -3,14 +3,6 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - component reference</title> -<style> - table.palette { border:0; } - table.palette td.header { font-weight: bold; font-size: 12pt; background-color: #eef7ff; padding: 2px; border-top: 1px solid #729ac2; border-bottom: 1px solid #729ac2;} - table.palette td.pane { width: 100px; text-align: center; } - table.palette td.pane select { width: 200px; } - table.palette td.buttons { text-align: center; padding-left: 10px; padding-right: 10px; } - table.palette td.buttons button { width: 28px; height: 28px; } -</style> </head> <body> <wicket:extend> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java index 5cc6f49..ed96996 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java @@ -22,12 +22,16 @@ import java.util.List; import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.extensions.markup.html.form.palette.Palette; import org.apache.wicket.extensions.markup.html.form.palette.theme.DefaultTheme; +import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.html.debug.PageViewCSSResourceReference; import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.util.CollectionModel; import org.apache.wicket.model.util.ListModel; +import org.apache.wicket.request.resource.CssResourceReference; /** @@ -86,4 +90,12 @@ public class PalettePage extends WicketExamplePage + " persons), renderer, 10, true);<br/>"; add(new ExplainPanel(html, code)); } + + @Override + public void renderHead(IHeaderResponse response) + { + super.renderHead(response); + response.render(CssHeaderItem + .forReference(new CssResourceReference(PalettePage.class, "palettepage.css"))); + } } diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html index 766f622..8f76f16 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html @@ -15,7 +15,7 @@ <p> <form wicket:id="form"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">Select your favorite site</td> <td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html index cdc6561..dac6ea8 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html @@ -15,7 +15,7 @@ <p> <form wicket:id="form"> <span wicket:id="group"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">Select a person</td> <td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html index 797e8fc..4f88b6f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html @@ -16,7 +16,7 @@ <form wicket:id="form"> <wicket:container wicket:id="group"> <wicket:container wicket:id="group2"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">Select a person</td> <td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html index 4ccb3f7..c44468d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html @@ -15,14 +15,14 @@ <p> <form wicket:id="form"> - <table style="border: 2px dotted #fc0; width: 400px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">Select your favorite sites</td> <td> <select wicket:id="site"> <optgroup label="java sites"> - <option wicket:id="site1" style="color:green;">The Server Side (tss)</option> - <option wicket:id="site2" style="color:red;">JavaLobby (jl)</option> + <option wicket:id="site1" class="color-green">The Server Side (tss)</option> + <option wicket:id="site2" class="color-red">JavaLobby (jl)</option> </optgroup> <optgroup label="news sites"> <option wicket:id="site3">Slashdot.org (sd)</option> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html index cef549e..e6288ad 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html @@ -15,7 +15,7 @@ <p> <form wicket:id="form"> - <table style="border: 2px dotted #fc0; width: 300px; padding: 5px;"> + <table class="dotted-box"> <tr> <td valign="top">multiple lines of text</td> <td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html index 9de8985..54dde76 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html @@ -17,7 +17,7 @@ <p> <form wicket:id="form"> - <table style="border: 2px dotted #fc0; width: 300px; padding: 5px;"> + <table class="dotted-box"> <tr> <td>some plain text</td> <td><input type="text" wicket:id="text" /></td> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/palettepage.css b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/palettepage.css new file mode 100644 index 0000000..7f3fd10 --- /dev/null +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/palettepage.css @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +table.palette { border:0; } +table.palette td.header { font-weight: bold; font-size: 12pt; background-color: #eef7ff; padding: 2px; border-top: 1px solid #729ac2; border-bottom: 1px solid #729ac2;} +table.palette td.pane { width: 100px; text-align: center; } +table.palette td.pane select { width: 200px; } +table.palette td.buttons { text-align: center; padding-left: 10px; padding-right: 10px; } +table.palette td.buttons button { width: 28px; height: 28px; } diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html index f57d849..d8e7c4f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html @@ -52,13 +52,13 @@ <span wicket:id="numbersGroup"> <label><wicket:message key="select.a.number" /> (RadioGroup)</label> <span wicket:id="numbers"> - <input type="radio" wicket:id="radio"/><label wicket:id="number" style="display:inline"></label> + <input type="radio" wicket:id="radio"/><label wicket:id="number" class="display-inline"></label> </span> </span> <span wicket:id="numbersCheckGroup"> <label><wicket:message key="select.one.or.more.numbers" /> (CheckGroup)</label> <span wicket:id="numbers"> - <input type="checkbox" wicket:id="check"/><label wicket:id="number" style="display:inline;"></label> + <input type="checkbox" wicket:id="check"/><label wicket:id="number" class="display-inline"></label> </span> </span> <label for="siteSelection"><wicket:message key="your.favorite.sites" /></label> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.html index 5609233..db51dfa 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.html @@ -2,161 +2,6 @@ <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> <title>Wicket Examples - sourcecode</title> - <style type="text/css"> - html, body { - padding: 0; - margin: 0; - height: 100%; - background-image: none; - } - - #header { - position: absolute; - top: 0px; - left: 0px; - width: 100%; - margin-left: -17px; - height: 2em; - z-index: 11; - background-color: gray; - } - - #header .inner { - margin-left: 17px; - } - - #header .left { - float: left; - padding-left: 10px; - color: white; - } - - #header .right { - margin-left: 17em; - color: white; - } - - #header span.close { - float: right; - padding-right: 1em; - color: white; - } - - #header span.close a { - color: #ff5555; - } - - #footer { - display: none; - } - - #body .left { - position: absolute; - top: 2em; - left: 0px; - width: 16.5em; - background-color: #eee; - _height: 90%; - bottom: 0px; - z-index: 10; - - overflow: auto; - } - - #body .right { - position: absolute; - top: 0px; - left: 17em; - right: 0px; - bottom: 0px; - _left: 0px; - _height: 100%; - _width: 100%; - overflow: auto; - z-index: 9; - } - - - ul { - list-style-type : none; - font-size: 85%; - margin : 0px; - padding : 10px; - } - - .code-container { - _margin-left: 17em; - margin-top: 2em; - } - - code { - color: rgb(0,0,0); - white-space: nowrap; - font-size : 11px; - font-family : Lucida Console, Monospace, Courier New, Courier, Fixed; - } - .java_type { - color: rgb(0,44,221); - } - .java_comment { - color: rgb(147,147,147); background-color: rgb(247,247,247); - } - .java_operator { - color: rgb(0,124,31); - } - .java_separator { - color: rgb(0,33,255); - } - .java_plain { - color: rgb(0,0,0); - } - .java_javadoc_comment { - color: rgb(147,147,147); background-color: rgb(247,247,247); font-style: italic; - } - .java_keyword { - color: rgb(0,0,0); font-weight: bold; - } - .java_literal { - color: rgb(188,0,0); - } - .java_javadoc_tag { - color: rgb(147,147,147); background-color: rgb(247,247,247); font-style: italic; font-weight: bold; - } - - e { - color: rgb(0,0,0); font-family: monospace; font-size: 12px; white-space: nowrap; - } - .xml_tag_symbols { - color: rgb(0,59,255); - } - .xml_rife_tag { - color: rgb(0,0,0); background-color: rgb(228,230,160); - } - .xml_plain { - color: rgb(0,0,0); - } - .xml_comment { - color: rgb(147,147,147); background-color: rgb(247,247,247); - } - .xml_attribute_name { - color: rgb(0,0,0); font-weight: bold; - } - .xml_tag_name { - color: rgb(0,55,255); - } - .xml_char_data { - color: rgb(0,0,0); - } - .xml_processing_instruction { - color: rgb(0,0,0); font-weight: bold; font-style: italic; - } - .xml_attribute_value { - color: rgb(193,0,0); - } - .xml_rife_name { - color: rgb(0,0,196); background-color: rgb(228,230,160); - } - </style> </head> <body> <div id="header"> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java index 1f95f08..a42cb01 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java @@ -43,6 +43,9 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; import org.apache.wicket.authorization.UnauthorizedInstantiationException; import org.apache.wicket.core.util.lang.WicketObjects; +import org.apache.wicket.examples.WicketExamplePage; +import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; @@ -52,6 +55,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.request.http.handler.ErrorCodeRequestHandler; import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.request.resource.CssResourceReference; import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.lang.PackageName; import org.apache.wicket.util.string.AppendingStringBuffer; @@ -478,4 +482,12 @@ public class SourcesPage extends WebPage } return page; } + + @Override + public void renderHead(IHeaderResponse response) + { + super.renderHead(response); + response.render( + CssHeaderItem.forReference(new CssResourceReference(SourcesPage.class, "style.css"))); + } } diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html index d01203d..94837fd 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html @@ -8,7 +8,7 @@ <h1>Template example</h1> - <p style="border: 2px dotted #fc0; padding: 5px;"> + <p class="dotted-box"> This example shows two different ways of building your page up from shared parts. The first example uses what we commonly call 'markup inheritence', and the second example shows how to achieve roughly the same diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html index abf1e52..aa0aeae 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html @@ -6,7 +6,7 @@ <wicket:extend> - <div style="border: 2px dotted #fc0; padding: 5px; margin-right: 25%;"> + <div class="dotted-box"> The fields in this page are driven by your data model, creating a new field will automatically add it to the layout. This allows to build generic editors <b>without writing the associated Wicket template</b>. </div> diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html index 9cd6644..7d4c3f9 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html @@ -6,7 +6,7 @@ <wicket:extend> <h3>Velocity Template Component</h3> - <div style="border: 2px dotted #fc0; padding: 5px; margin-right: 25%;"> + <div class="dotted-box"> <p> The VelocityPanel is useful for CMS-like functionality, where you want to enable users to do basic scripting in predefined areas of your web diff --git a/wicket-examples/src/main/resources/org/apache/wicket/examples/source/style.css b/wicket-examples/src/main/resources/org/apache/wicket/examples/source/style.css new file mode 100644 index 0000000..e57be1a --- /dev/null +++ b/wicket-examples/src/main/resources/org/apache/wicket/examples/source/style.css @@ -0,0 +1,169 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +html, body { + padding: 0; + margin: 0; + height: 100%; + background-image: none; +} + +#header { + position: absolute; + top: 0px; + left: 0px; + width: 100%; + margin-left: -17px; + height: 2em; + z-index: 11; + background-color: gray; +} + +#header .inner { + margin-left: 17px; +} + +#header .left { + float: left; + padding-left: 10px; + color: white; +} + +#header .right { + margin-left: 17em; + color: white; +} + +#header span.close { + float: right; + padding-right: 1em; + color: white; +} + +#header span.close a { + color: #ff5555; +} + +#footer { + display: none; +} + +#body .left { + position: absolute; + top: 2em; + left: 0px; + width: 16.5em; + background-color: #eee; + _height: 90%; + bottom: 0px; + z-index: 10; + + overflow: auto; +} + +#body .right { + position: absolute; + top: 0px; + left: 17em; + right: 0px; + bottom: 0px; + _left: 0px; + _height: 100%; + _width: 100%; + overflow: auto; + z-index: 9; +} + + +ul { + list-style-type : none; + font-size: 85%; + margin : 0px; + padding : 10px; +} + +.code-container { + _margin-left: 17em; + margin-top: 2em; +} + +code { + color: rgb(0,0,0); + white-space: nowrap; + font-size : 11px; + font-family : Lucida Console, Monospace, Courier New, Courier, Fixed; +} +.java_type { + color: rgb(0,44,221); +} +.java_comment { + color: rgb(147,147,147); background-color: rgb(247,247,247); +} +.java_operator { + color: rgb(0,124,31); +} +.java_separator { + color: rgb(0,33,255); +} +.java_plain { + color: rgb(0,0,0); +} +.java_javadoc_comment { + color: rgb(147,147,147); background-color: rgb(247,247,247); font-style: italic; +} +.java_keyword { + color: rgb(0,0,0); font-weight: bold; +} +.java_literal { + color: rgb(188,0,0); +} +.java_javadoc_tag { + color: rgb(147,147,147); background-color: rgb(247,247,247); font-style: italic; font-weight: bold; +} + +e { + color: rgb(0,0,0); font-family: monospace; font-size: 12px; white-space: nowrap; +} +.xml_tag_symbols { + color: rgb(0,59,255); +} +.xml_rife_tag { + color: rgb(0,0,0); background-color: rgb(228,230,160); +} +.xml_plain { + color: rgb(0,0,0); +} +.xml_comment { + color: rgb(147,147,147); background-color: rgb(247,247,247); +} +.xml_attribute_name { + color: rgb(0,0,0); font-weight: bold; +} +.xml_tag_name { + color: rgb(0,55,255); +} +.xml_char_data { + color: rgb(0,0,0); +} +.xml_processing_instruction { + color: rgb(0,0,0); font-weight: bold; font-style: italic; +} +.xml_attribute_value { + color: rgb(193,0,0); +} +.xml_rife_name { + color: rgb(0,0,196); background-color: rgb(228,230,160); +} diff --git a/wicket-examples/src/main/resources/org/apache/wicket/examples/style.css b/wicket-examples/src/main/resources/org/apache/wicket/examples/style.css index bd2c42f..1705208 100644 --- a/wicket-examples/src/main/resources/org/apache/wicket/examples/style.css +++ b/wicket-examples/src/main/resources/org/apache/wicket/examples/style.css @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import url(./fonts/source-code-pro/stylesheet.css); -@import url(./fonts/source-sans-pro/stylesheet.css); html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; padding: 0; @@ -1307,3 +1305,21 @@ div.tabpanel4 div.tab-row li.selected a:link, div.tabpanel4 div.tab-row a:visite div.tabpanel4 div.tab-row a:hover { background: #fff; } + +.display-inline { + display: inline; +} + +.dotted-box { + border: 2px dotted #fc0; + width: 500px; + padding: 5px; +} + +.color-green { + color: green; +} + +.color-red { + color: red; +} \ No newline at end of file diff --git a/wicket-examples/src/main/webapp/to_be_included.html b/wicket-examples/src/main/webapp/to_be_included.html index 5c31d2a..8844a26 100644 --- a/wicket-examples/src/main/webapp/to_be_included.html +++ b/wicket-examples/src/main/webapp/to_be_included.html @@ -1,3 +1,3 @@ -<div style="border: 2px dotted #fc0; width: 300px; padding: 5px;"> +<div class="dotted-box"> I am a static html page. -</div> \ No newline at end of file +</div>
