You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/03/02 18:03:04 UTC
[isis] branch maint-1.16.2 updated: ISIS-1888: further tidy up of
some CSS classes
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/maint-1.16.2 by this push:
new 8c0deb8 ISIS-1888: further tidy up of some CSS classes
8c0deb8 is described below
commit 8c0deb8c8e3e2068009239554b9c1d62ff89ca0a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 2 18:02:49 2018 +0000
ISIS-1888: further tidy up of some CSS classes
---
.../ajaxtable/CollectionContentsAsAjaxTablePanel.java | 2 +-
.../ajaxtable/columns/ObjectAdapterPropertyColumn.java | 3 ++-
.../java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index b329237..0ca73a4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -261,7 +261,7 @@ public class CollectionContentsAsAjaxTablePanel
final NamedFacet facet = property.getFacet(NamedFacet.class);
final boolean escaped = facet == null || facet.escaped();
- final String parentTypeName = property.getOnType().getShortIdentifier();
+ final String parentTypeName = property.getOnType().getSpecId().asString();
return new ObjectAdapterPropertyColumn(getModel().getType(), Model.of(property.getName()), property.getId(), property.getId(), escaped, parentTypeName);
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
index e94de22..37e1e0a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
@@ -37,6 +37,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanel;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
/**
* A {@link ColumnAbstract column} within a
@@ -81,7 +82,7 @@ public final class ObjectAdapterPropertyColumn extends ColumnAbstract<ObjectAdap
public String getCssClass() {
final String cssClass = super.getCssClass();
return (!Strings.isNullOrEmpty(cssClass) ? (cssClass + " ") : "") +
- parentTypeName + "-" + propertyExpression;
+ CssClassAppender.asCssStyle("isis-" + parentTypeName.replace(".","-") + "-" + propertyExpression);
}
@Override
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 01bf879..d71b76b 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
@@ -168,7 +168,8 @@ public class EntityPage extends PageAbstract {
}
WebMarkupContainer entityPageContainer = new WebMarkupContainer("entityPageContainer");
- CssClassAppender.appendCssClassTo(entityPageContainer, objectSpec.getSpecId().asString());
+ CssClassAppender.appendCssClassTo(entityPageContainer,
+ CssClassAppender.asCssStyle("isis-" + objectSpec.getSpecId().asString().replace(".","-")));
CssClassFacet cssClassFacet = objectSpec.getFacet(CssClassFacet.class);
if(cssClassFacet != null) {
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.