This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/csp by this push:
new 5d2b98c WICKET-6737: Moved inline styling to css files
5d2b98c is described below
commit 5d2b98ca6e538c72e0565539ada57678ac5092f0
Author: Emond Papegaaij <[email protected]>
AuthorDate: Thu Feb 6 21:29:56 2020 +0100
WICKET-6737: Moved inline styling to css files
---
.../examples/ajax/builtin/AjaxApplication.java | 2 -
.../ajax/prototype/PrototypeApplication.java | 2 -
.../wicket/examples/images/ImagesApplication.java | 2 +
.../apache/wicket/examples/navomatic/Page1.html | 4 +-
.../apache/wicket/examples/navomatic/Page2.html | 4 +-
.../apache/wicket/examples/navomatic/Page3.html | 4 +-
.../examples/repeater/AjaxDataTablePage.html | 2 +-
.../apache/wicket/examples/repeater/BasePage.html | 4 +-
.../apache/wicket/examples/repeater/BasePage.java | 11 +++
.../wicket/examples/repeater/DataGridPage.html | 17 +----
.../repeater/DataTableFilterToolbarPage.html | 19 ++---
.../wicket/examples/repeater/DataTablePage.html | 15 +---
.../wicket/examples/repeater/DataTablePage.java | 11 ++-
.../apache/wicket/examples/repeater/FormPage.html | 2 +-
.../wicket/examples/repeater/GridViewPage.html | 19 +----
.../apache/wicket/examples/repeater/OIRPage.html | 2 +-
.../apache/wicket/examples/repeater/OIRPage.java | 14 +---
.../wicket/examples/repeater/PagingPage.html | 2 +-
.../wicket/examples/repeater/RefreshingPage.html | 2 +-
.../examples/repeater/RepeaterApplication.java | 3 +-
.../wicket/examples/repeater/RepeatingPage.html | 2 +-
.../wicket/examples/repeater/SimplePage.html | 2 +-
.../wicket/examples/repeater/SortingPage.html | 2 +-
.../repeater.css} | 80 +++++++++++++++-------
.../wicket/examples/tree/AbstractTreePage.java | 10 +++
.../org/apache/wicket/examples/tree/FooPanel.html | 17 -----
.../wicket/examples/tree/NestedTreePage.html | 12 ----
.../apache/wicket/examples/tree/TableTreePage.html | 20 ------
.../wicket/examples/tree/TreeApplication.java | 3 +-
.../tree/{AbstractTreePage.java => tree.css} | 40 ++++++++---
.../examples/websocket/JSR356Application.java | 1 +
.../websocket/WebSocketBehaviorDemoPage.java | 4 ++
32 files changed, 144 insertions(+), 190 deletions(-)
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
index 01d3cd5..77ad598 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java
@@ -41,8 +41,6 @@ public class AjaxApplication extends WicketExampleApplication
getResourceSettings().setThrowExceptionOnMissingResource(false);
- getRequestCycleSettings().addResponseFilter(new
AjaxServerAndClientTimeFilter());
-
getComponentInitializationListeners().add(new
IComponentInitializationListener()
{
@Override
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
index 1d40677..c0531b7 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
@@ -34,8 +34,6 @@ public class PrototypeApplication extends
WicketExampleApplication
super.init();
getResourceSettings().setThrowExceptionOnMissingResource(false);
-
- getRequestCycleSettings().addResponseFilter(new
AjaxServerAndClientTimeFilter());
}
@Override
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
index 9078eb7..bcfbebf 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
@@ -17,6 +17,7 @@
package org.apache.wicket.examples.images;
import org.apache.wicket.Page;
+import org.apache.wicket.csp.CSPDirective;
import org.apache.wicket.examples.WicketExampleApplication;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
@@ -40,6 +41,7 @@ public class ImagesApplication extends
WicketExampleApplication
super.init();
getSharedResources().add("cancelButton", new
DefaultButtonImageResource("Cancel"));
+ getCsp().blocking().add(CSPDirective.IMG_SRC, "data:");
}
}
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html
index b1df157..48c67c7 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html
@@ -5,8 +5,8 @@
<body>
<wicket:extend>
<div wicket:id = "navomaticBorder">
- <div style = "width:250px">
- <div style="text-align: center;"><h3>Page 1</h3></div>
+ <div>
+ <div><h3>Page 1</h3></div>
Welcome to Navomatic. The navigation links on the left
will allow you to navigate between three pages. Notice
that the current page
(Page1) is displayed in the "Navigation Links" area as
italicized text,
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html
index 52b57b6..f2d60e6 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html
@@ -5,8 +5,8 @@
<body>
<wicket:extend>
<div wicket:id = "navomaticBorder">
- <div style = "width:250px">
- <div style="text-align: center;"><h3>Page 2</h3></div>
+ <div>
+ <div><h3>Page 2</h3></div>
Welcome to Page 2 of Navomatic. Notice that the Page1
link is now clickable
(so that you can return to Page1 if you want to) and
the Page2 link is
italicized text. Go ahead and click the Page3 link.
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html
index baa05cd..268e107 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html
@@ -5,8 +5,8 @@
<body>
<wicket:extend>
<div wicket:id = "navomaticBorder">
- <div style = "width:400px">
- <div style="text-align: center;"><h3>Page 3</h3></div>
+ <div>
+ <div><h3>Page 3</h3></div>
The links on the left are enabled and disabled without
any code at all. Here is the HTML for the navigation
area,
which can be found in NavomaticBorder.html:
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html
index f5f5e38..0407e9b 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html
@@ -10,7 +10,7 @@ This is a demo of the DataTable (DataView wrapper). Provided
features:<br/>
<li>Adds a navigator message</li>
</ul>
<br/>
-<div style="overflow-x:auto;">
+<div>
<table class="dataview" cellspacing="0" wicket:id="table">[table]</table>
</div>
</wicket:extend>
\ No newline at end of file
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.html
index 7436717..e6ae6ce 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.html
@@ -1,7 +1,7 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org";>
-<span style="display: block; border: 1px solid black;">
+<strong>
Selected Contact: <span wicket:id="selectedLabel">[selected contact]</span>
-</span><br/>
+</strong><br/>
<span wicket:id="feedback">Feedback messages go here</span>
<wicket:child/>
</wicket:extend>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
index 25b2d1f..092dbeb 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
@@ -16,12 +16,15 @@
*/
package org.apache.wicket.examples.repeater;
+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.link.Link;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.request.resource.CssResourceReference;
/**
* Base page for component demo pages.
@@ -96,4 +99,12 @@ public class BasePage extends ExamplePage
addStateChange();
this.selected = selected;
}
+
+ @Override
+ public void renderHead(IHeaderResponse response)
+ {
+ super.renderHead(response);
+ response.render(
+ CssHeaderItem.forReference(new
CssResourceReference(BasePage.class, "repeater.css")));
+ }
}
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html
index ea99664..b2458cb 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html
@@ -1,19 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:head xmlns:wicket="http://wicket.apache.org";>
-<style type="text/css">
-table {
- border-collapse:collapse;
-}
-
-td {
- padding: 2px;
-}
-
-table, th, td {
- border: 1px solid black;
-}
-</style>
-</wicket:head>
<body>
<wicket:extend xmlns:wicket="http://wicket.apache.org";>
@@ -23,7 +8,7 @@ This is a demo of the DataGridView (builds on top of
DataView). Provided feature
<li>Easy ordering and selection of columns from code</li>
</ul>
<br/>
-<div style="overflow-x:auto;">
+<div class="gridpage">
<table cellspacing="0" cellpadding="2" border="1">
<tr wicket:id="rows">
<td wicket:id="cells">
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html
index 5866393..c2752a1 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html
@@ -1,15 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:head>
- <style type="text/css">
- th.last-name *, td.last-name {
- font-weight: bold;
- color: #AA0000;
- }
- th.numeric, td.numeric {
- text-align: right !important;
- }
- </style>
-</wicket:head>
<wicket:extend>
@@ -17,12 +6,12 @@ This table has a toolbar filter. We can specify a valid
range for contact's born
<br/>
<form wicket:id="filterForm">
- <fieldset style="display: inline-block;">
+ <fieldset class="inline-block">
<legend>Born date</legend>
- <span style="float: right;">from: <input
wicket:id="dateFrom"/></span> <br/>
- <span style="float: right;">to: <input
wicket:id="dateTo"/></span>
+ <span class="float-right">from: <input
wicket:id="dateFrom"/></span> <br/>
+ <span class="float-right">to: <input wicket:id="dateTo"/></span>
</fieldset>
- <div style="overflow-x:auto;">
+ <div>
<table class="dataview"
wicket:id="tableWithFilterForm">[table]</table>
</div>
</form>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html
index 09e5eae..48417e5 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html
@@ -1,15 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:head>
- <style type="text/css">
- th.last-name *, td.last-name {
- font-weight: bold;
- color: #AA0000;
- }
- th.numeric, td.numeric {
- text-align: right !important;
- }
- </style>
-</wicket:head>
<wicket:extend>
@@ -24,7 +13,7 @@ This is a demo of the DataTable (DataView wrapper). Provided
features:<br/>
<li>Export to CSV toolbar</li>
</ul>
<br/>
- <div style="overflow-x:auto;">
+ <div>
<table class="dataview" cellspacing="0"
wicket:id="table">[table]</table>
</div>
<br/>
@@ -33,7 +22,7 @@ This is a demo of the DataTable (DataView wrapper). Provided
features:<br/>
<span>This is a table that uses
<em>org.apache.wicket.extensions.markup.html.repeater.data.table.ColGroup</em>
to style the columns</span>:
- <div style="overflow-x:auto;">
+ <div>
<table class="dataview" wicket:id="tableWithColGroup">[table]</table>
</div>
</wicket:extend>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
index 8383796..f5f0a3d 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
@@ -127,13 +127,12 @@ public class DataTablePage extends BasePage
//This is a table that uses ColGroup to style the columns:
ColGroup colgroup = tableWithColGroup.getColGroup();
- colgroup.add(AttributeModifier.append("style", "border: solid
1px green;"));
- colgroup.addCol(colgroup.new
Col(AttributeModifier.append("style", "background-color: lightblue;")));
- colgroup.addCol(colgroup.new
Col(AttributeModifier.append("style", "background-color: lightgreen")));
- colgroup.addCol(colgroup.new
Col(AttributeModifier.append("style", "background-color: pink")));
- colgroup.addCol(colgroup.new
Col(AttributeModifier.append("style", "background-color: yellow")));
+ colgroup.addCol(colgroup.new
Col(AttributeModifier.append("class", "lightblue")));
+ colgroup.addCol(colgroup.new
Col(AttributeModifier.append("class", "lightgreen")));
+ colgroup.addCol(colgroup.new
Col(AttributeModifier.append("class", "pink")));
+ colgroup.addCol(colgroup.new
Col(AttributeModifier.append("class", "yellow")));
colgroup.addCol(colgroup.new
Col(AttributeModifier.append("span", "2"),
- AttributeModifier.append("style",
"background-color: #CC6633")));
+ AttributeModifier.append("class", "brown")));
}
/**
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html
index 79089b1..2e1292e 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html
@@ -5,7 +5,7 @@ RefreshingView in a form, with a <tt>remove</tt> link along
with each item.
<br/><br/>
<form wicket:id="form">
-<div style="overflow-x:auto;">
+<div>
<table cellspacing="0" class="dataview">
<tr>
<th>Actions</th>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html
index abcd397..d713b4c 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html
@@ -1,21 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org";>
-<head>
-<wicket:head>
-<style type="text/css">
-table {
- border-collapse:collapse;
-}
-
-td {
- padding: 2px;
-}
-
-table, th, td {
- border: 1px solid black;
-}
-</style>
-</wicket:head>
-</head>
<body>
<wicket:extend>
@@ -24,7 +7,7 @@ This page demonstrates the GridView component
<span wicket:id="navigator">[dataview navigator]</span>
-<div style="overflow-x:auto;">
+<div class="gridpage">
<table cellspacing="0" cellpadding="2" border="1">
<tr wicket:id="rows">
<td wicket:id="cols"><span
wicket:id="firstName">[firstname]</span></td>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.html
index 4a62721..c191a64 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.html
@@ -9,7 +9,7 @@ Notice that when you click the 'toggle highlite' link the item
stays highlited u
<span wicket:id="navigator">[dataview navigator]</span>
-<div style="overflow-x:auto;">
+<div>
<table cellspacing="0" class="dataview">
<tr>
<th colspan="2">Actions</th>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
index a1f1cef..d632f89 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.repeater;
import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
import
org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByBorder;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
@@ -60,16 +59,7 @@ public class OIRPage extends BasePage
public HighlitableDataItem(String id, int index, IModel<T>
model)
{
super(id, index, model);
- add(new AttributeModifier("style",
"background-color:#80b6ed;")
- {
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean isEnabled(Component component)
- {
- return
HighlitableDataItem.this.highlite;
- }
- });
+ add(AttributeModifier.append("class", () -> highlite ?
"highlight" : null));
}
}
@@ -104,7 +94,7 @@ public class OIRPage extends BasePage
item.add(new Label("homephone",
contact.getHomePhone()));
item.add(new Label("cellphone",
contact.getCellPhone()));
- item.add(AttributeModifier.replace("class",
+ item.add(AttributeModifier.append("class",
() -> (item.getIndex() % 2 == 1) ?
"even" : "odd"));
}
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.html
index 29628d9..3beeddb 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.html
@@ -4,7 +4,7 @@ This page demonstrates DataView with paging enabled as well as
wicket's page nav
<br/><br/>
<span wicket:id="navigator">[dataview navigator]</span>
-<div style="overflow-x:auto;">
+<div>
<table cellspacing="0" class="dataview">
<tr>
<th>Actions</th>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.html
index 05060c3..696b679 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.html
@@ -2,7 +2,7 @@
This page demonstrates a simple RefreshingView. Notice that when you click
refresh or make a selection the id of item object changes because it is
regenerated unlike items in the OrderedRepeatingView.
<br/><br/>
<a href="#" wicket:id="refreshLink">refresh</a><br/><br/>
-<div style="overflow-x:auto;">
+<div>
<table cellspacing="0" class="dataview">
<tr>
<th>Item Id</th>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
index b304299..5e3f6b4 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
@@ -33,10 +33,9 @@ public class RepeaterApplication extends
WicketExampleApplication
@Override
protected void init()
{
+ super.init();
getDebugSettings().setDevelopmentUtilitiesEnabled(true);
- getRequestCycleSettings().addResponseFilter(new
ServerAndClientTimeFilter());
-
getMarkupSettings().setStripWicketTags(true);
}
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.html
index 1e58f24..41d326d 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.html
@@ -5,7 +5,7 @@ You simply add your items to the repeating view and its body
markup will be used to render each one in the order added.
<br/><br/>
-<div style="overflow-x:auto;">
+<div>
<table cellspacing="0" class="dataview">
<tr>
<th>Actions</th>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.html
index 291d019..877fd5a 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.html
@@ -2,7 +2,7 @@
This page demonstrates a very basic DataView. The implementation is exactly
the same as ListView except IDataProvider is used to provide data instead of a
list.
<br/><br/>
-<div style="overflow-x:auto;">
+<div>
<table cellspacing="0" class="dataview">
<tr>
<th>Actions</th>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.html
index f6c22a9..a2fee74 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.html
@@ -5,7 +5,7 @@ This example demonstrates how easy it is to implement sorting.
Simply implement
<span wicket:id="navigator">[dataview navigator]</span>
-<div style="overflow-x:auto;">
+<div>
<table cellspacing="0" class="dataview">
<tr>
<th>Actions</th>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/repeater.css
similarity index 54%
copy from
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
copy to
wicket-examples/src/main/java/org/apache/wicket/examples/repeater/repeater.css
index 1d40677..62f9163 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/PrototypeApplication.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/repeater.css
@@ -14,33 +14,61 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.examples.ajax.prototype;
+.highlight {
+ background-color: #80b6ed!important;
+}
+
+th.last-name *,
+td.last-name {
+ font-weight: bold;
+ color: #AA0000;
+}
-import org.apache.wicket.Page;
-import org.apache.wicket.examples.WicketExampleApplication;
-import org.apache.wicket.response.filter.AjaxServerAndClientTimeFilter;
+th.numeric,
+td.numeric {
+ text-align: right !important;
+}
+.float-right {
+ float: right;
+}
-/**
- * Application object for the Prototype.js ajax demo page.
- *
- * @author ivaynberg
- */
-public class PrototypeApplication extends WicketExampleApplication
-{
- @Override
- protected void init()
- {
- super.init();
-
- getResourceSettings().setThrowExceptionOnMissingResource(false);
-
- getRequestCycleSettings().addResponseFilter(new
AjaxServerAndClientTimeFilter());
- }
-
- @Override
- public Class<? extends Page> getHomePage()
- {
- return Index.class;
- }
+.inline-block {
+ display: inline-block;
+}
+
+.gridpage table {
+ border-collapse:collapse;
+}
+
+.gridpage td {
+ padding: 2px;
+}
+
+.gridpage table, .gridpage th, .gridpage td {
+ border: 1px solid black;
+}
+
+colgroup {
+ border: solid 1px green;
+}
+
+col.lightblue {
+ background-color: lightblue;
+}
+
+col.lightgreen {
+ background-color: lightgreen;
+}
+
+col.pink {
+ background-color: pink;
+}
+
+col.yellow {
+ background-color: yellow;
+}
+
+col.brown {
+ background-color: #CC6633;
}
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
index edf44b0..2824b2c 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
@@ -17,6 +17,9 @@
package org.apache.wicket.examples.tree;
import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.request.resource.CssResourceReference;
/**
* @author Sven Meier
@@ -26,4 +29,11 @@ public abstract class AbstractTreePage extends
WicketExamplePage
private static final long serialVersionUID = 1L;
+ @Override
+ public void renderHead(IHeaderResponse response)
+ {
+ super.renderHead(response);
+ response.render(CssHeaderItem
+ .forReference(new
CssResourceReference(AbstractTreePage.class, "tree.css")));
+ }
}
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooPanel.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooPanel.html
index 7e3b31a..670957b 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooPanel.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooPanel.html
@@ -17,23 +17,6 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd"; >
- <head>
- <wicket:head>
-<style>
-div.foo-outer {
- margin-bottom: 4px;
- border: 1px dotted black;
- padding-left: 18px;
- background-color: #BBBBBB;
-}
-
-div.foo-inner {
- padding: 2px;
- background-color: #FFFFFF;
-}
-</style>
- </wicket:head>
- </head>
<body>
<wicket:panel>
<div class="foo-outer">
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/NestedTreePage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/NestedTreePage.html
index 1b8a840..98e7253 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/NestedTreePage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/NestedTreePage.html
@@ -17,18 +17,6 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd"; >
- <head>
- <wicket:head>
-<style>
-ul.tree {
- width: 480px;
- height: 240px;
- overflow: auto;
- border: 1px solid #DDDDDD;
-}
-</style>
- </wicket:head>
- </head>
<body>
<wicket:extend>
<div wicket:id="tree">[tree]</div>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.html
b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.html
index f70f383..98e7253 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.html
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.html
@@ -17,26 +17,6 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd"; >
- <head>
- <wicket:head>
-<style>
-table {
- width: 100%;
- border: 1px solid #DDDDDD;
-}
-tr.even {
- background-color: #FFFFFF;
-}
-tr.odd {
- background-color: #EEEEEE;
-}
-td.number {
- text-align: right;
- padding-right: 1em;
-}
-</style>
- </wicket:head>
- </head>
<body>
<wicket:extend>
<div wicket:id="tree">[tree]</div>
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java
index babc8a6..e58808c 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java
@@ -84,9 +84,8 @@ public class TreeApplication extends WicketExampleApplication
@Override
protected void init()
{
+ super.init();
getDebugSettings().setDevelopmentUtilitiesEnabled(true);
-
- getRequestCycleSettings().addResponseFilter(new
ServerAndClientTimeFilter());
}
@Override
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/tree.css
similarity index 63%
copy from
wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
copy to wicket-examples/src/main/java/org/apache/wicket/examples/tree/tree.css
index edf44b0..0b63101 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/tree.css
@@ -14,16 +14,34 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.examples.tree;
-
-import org.apache.wicket.examples.WicketExamplePage;
-
-/**
- * @author Sven Meier
- */
-public abstract class AbstractTreePage extends WicketExamplePage
-{
-
- private static final long serialVersionUID = 1L;
+table {
+ width: 100%;
+ border: 1px solid #DDDDDD;
+}
+tr.even {
+ background-color: #FFFFFF;
+}
+tr.odd {
+ background-color: #EEEEEE;
+}
+td.number {
+ text-align: right;
+ padding-right: 1em;
+}
+ul.tree {
+ width: 480px;
+ height: 240px;
+ overflow: auto;
+ border: 1px solid #DDDDDD;
+}
+div.foo-outer {
+ margin-bottom: 4px;
+ border: 1px dotted black;
+ padding-left: 18px;
+ background-color: #BBBBBB;
+}
+div.foo-inner {
+ padding: 2px;
+ background-color: #FFFFFF;
}
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/JSR356Application.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/JSR356Application.java
index cf2992e..f07965e 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/JSR356Application.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/JSR356Application.java
@@ -66,6 +66,7 @@ public class JSR356Application extends
WicketExampleApplication
getCsp().blocking().add(CSPDirective.SCRIPT_SRC,
"https://www.google.com";)
.add(CSPDirective.STYLE_SRC,
"https://www.google.com";, "https://ajax.googleapis.com";);
+ getCsp().blocking().disabled();
}
@Override
diff --git
a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketBehaviorDemoPage.java
b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketBehaviorDemoPage.java
index 8d038aa..01251a6 100644
---
a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketBehaviorDemoPage.java
+++
b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketBehaviorDemoPage.java
@@ -116,6 +116,10 @@ public class WebSocketBehaviorDemoPage extends
WicketExamplePage
{
download.initiate(handler);
}
+ if ("other".equals(message.getText()))
+ {
+ download.initiate(handler);
+ }
}
});
}
