Updated Branches: refs/heads/wicket-6.x 2eed194ad -> 1f1e16b91
WICKET-5477 add CSS for styled columns as other column based toolbars Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1f1e16b9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1f1e16b9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1f1e16b9 Branch: refs/heads/wicket-6.x Commit: 1f1e16b91324b91d5af52c667fccb71fdf6e6e67 Parents: 2eed194 Author: svenmeier <[email protected]> Authored: Mon Jan 20 16:54:11 2014 +0100 Committer: svenmeier <[email protected]> Committed: Mon Jan 20 16:54:11 2014 +0100 ---------------------------------------------------------------------- .../data/table/filter/FilterToolbar.java | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1f1e16b9/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java index b7e3a3f..ebea180 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java @@ -20,13 +20,17 @@ import java.util.LinkedList; import java.util.List; import org.apache.wicket.Component; +import org.apache.wicket.behavior.Behavior; import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractToolbar; import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; +import org.apache.wicket.extensions.markup.html.repeater.data.table.IStyledColumn; +import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; +import org.apache.wicket.util.string.Strings; /** @@ -120,6 +124,27 @@ public class FilterToolbar extends AbstractToolbar } } + if (col instanceof IStyledColumn) + { + filter.add(new Behavior() + { + private static final long serialVersionUID = 1L; + + /** + * @see Behavior#onComponentTag(Component, ComponentTag) + */ + @Override + public void onComponentTag(final Component component, final ComponentTag tag) + { + String className = ((IStyledColumn<?, S>)col).getCssClass(); + if (!Strings.isEmpty(className)) + { + tag.append("class", className, " "); + } + } + }); + } + item.add(filter); } };
