ISIS-537: width of icon column for standalone collections with bulk actions (where the column is 2nd, not 1st).
Also: change to use width: 3% rather than width: 30px. Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f58902e2 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f58902e2 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f58902e2 Branch: refs/heads/master Commit: f58902e288f62751ec532f6dace9f9f4f4232b03 Parents: 9517e5b Author: Dan Haywood <[email protected]> Authored: Thu Nov 27 14:24:32 2014 +0000 Committer: Dan Haywood <[email protected]> Committed: Thu Nov 27 14:24:32 2014 +0000 ---------------------------------------------------------------------- .../ajaxtable/CollectionContentsAsAjaxTablePanel.css | 8 ++++++-- .../ajaxtable/columns/ObjectAdapterTitleColumn.java | 2 ++ .../ajaxtable/columns/ObjectAdapterToggleboxColumn.java | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/f58902e2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css index acff569..275b27c 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css @@ -85,8 +85,12 @@ height: 16px; } -.collectionContentsAsAjaxTablePanel table.contents tbody td:first-child { - width: 30px; +.collectionContentsAsAjaxTablePanel table.contents tbody .togglebox-column { + width: 2%; +} +.collectionContentsAsAjaxTablePanel table.contents tbody .title-column { + text-align: center; + width: 3%; } .collectionContentsAsAjaxTablePanel table.contents a:hover { http://git-wip-us.apache.org/repos/asf/isis/blob/f58902e2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java index f4fb00f..dc58532 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java @@ -30,6 +30,7 @@ import org.apache.isis.viewer.wicket.model.models.EntityModel; import org.apache.isis.viewer.wicket.model.models.EntityModel.RenderingHint; import org.apache.isis.viewer.wicket.ui.ComponentFactory; import org.apache.isis.viewer.wicket.ui.ComponentType; +import org.apache.isis.viewer.wicket.ui.util.CssClassAppender; public class ObjectAdapterTitleColumn extends ColumnAbstract<ObjectAdapter> { @@ -52,6 +53,7 @@ public class ObjectAdapterTitleColumn extends ColumnAbstract<ObjectAdapter> { public void populateItem(final Item<ICellPopulator<ObjectAdapter>> cellItem, final String componentId, final IModel<ObjectAdapter> rowModel) { final Component component = createComponent(componentId, rowModel); cellItem.add(component); + cellItem.add(new CssClassAppender("title-column")); } private Component createComponent(final String id, final IModel<ObjectAdapter> rowModel) { http://git-wip-us.apache.org/repos/asf/isis/blob/f58902e2/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java index 612abcd..8dde6ff 100644 --- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java +++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java @@ -90,13 +90,17 @@ public final class ObjectAdapterToggleboxColumn extends ColumnAbstract<ObjectAda } } }; - return toggle; + toggle.add(new CssClassAppender("title-column")); + return toggle; } private final List<ContainedToggleboxPanel> rowToggles = Lists.newArrayList(); @Override public void populateItem(final Item<ICellPopulator<ObjectAdapter>> cellItem, final String componentId, final IModel<ObjectAdapter> rowModel) { + + cellItem.add(new CssClassAppender("togglebox-column")); + final MarkupContainer row = cellItem.getParent().getParent(); row.setOutputMarkupId(true); final EntityModel entityModel = (EntityModel) rowModel;
