ISIS-1492: Added css-class to object form
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/92de6a99 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/92de6a99 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/92de6a99 Branch: refs/heads/master Commit: 92de6a994d3a0e17909f467b18325194239bcc4a Parents: 0a1a968 Author: Erik de Hair <[email protected]> Authored: Wed Sep 21 12:29:38 2016 +0200 Committer: Dan Haywood <[email protected]> Committed: Wed Sep 21 18:20:53 2016 +0100 ---------------------------------------------------------------------- .../wicket/ui/pages/entity/EntityPage.java | 29 ++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/92de6a99/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java index 9574b18..f4d9bb0 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java @@ -19,20 +19,13 @@ package org.apache.isis.viewer.wicket.ui.pages.entity; -import org.apache.wicket.Application; -import org.apache.wicket.RestartResponseException; -import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; -import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.link.BookmarkablePageLink; -import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.util.string.Strings; - import org.apache.isis.applib.layout.component.Grid; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking; import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException; import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy; import org.apache.isis.core.metamodel.deployment.DeploymentCategory; +import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet; import org.apache.isis.core.metamodel.facets.object.grid.GridFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.metamodel.spec.feature.ObjectMember; @@ -43,6 +36,13 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.Breadcrum import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider; import org.apache.isis.viewer.wicket.ui.pages.PageAbstract; import org.apache.isis.viewer.wicket.ui.util.CssClassAppender; +import org.apache.wicket.Application; +import org.apache.wicket.RestartResponseException; +import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; +import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.html.link.BookmarkablePageLink; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.util.string.Strings; /** * Web page representing an entity. @@ -167,12 +167,12 @@ public class EntityPage extends PageAbstract { } final ObjectSpecification objectSpec = model.getTypeOfSpecification(); - final GridFacet facet = objectSpec.getFacet(GridFacet.class); - if(facet != null) { + final GridFacet gridFacet = objectSpec.getFacet(GridFacet.class); + if(gridFacet != null) { // the facet should always exist, in fact // just enough to ask for the metadata. // This will cause the current ObjectSpec to be updated as a side effect. - final Grid unused = facet.getGrid(); + final Grid unused = gridFacet.getGrid(); } if(titleString == null) { @@ -183,6 +183,13 @@ public class EntityPage extends PageAbstract { WebMarkupContainer entityPageContainer = new WebMarkupContainer("entityPageContainer"); CssClassAppender.appendCssClassTo(entityPageContainer, objectSpec.getFullIdentifier().replace('.','-')); CssClassAppender.appendCssClassTo(entityPageContainer, objectSpec.getCorrespondingClass().getSimpleName()); + + CssClassFacet cssClassFacet = objectSpec.getFacet(CssClassFacet.class); + if(cssClassFacet != null) { + final String cssClass = cssClassFacet.cssClass(objectAdapter); + CssClassAppender.appendCssClassTo(entityPageContainer, cssClass); + } + themeDiv.addOrReplace(entityPageContainer); addChildComponents(entityPageContainer, model);
