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 2017/12/29 17:41:33 UTC
[isis] 02/02: ISIS-1787: removes the cssPrefix property,
instead a simpler design of just using the parent type's short name
as the prefix.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8aef1ab53ad02ea81a9338a4f053b31d57015af1
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 29 17:41:19 2017 +0000
ISIS-1787: removes the cssPrefix property, instead a simpler design of just using the parent type's short name as the prefix.
For example, rather than "name", will render "SmpleObject-name"
This is more consistent with how this is done elswhere.
---
.../asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc | 9 ---------
.../wicket/viewer/settings/WicketViewerSettingsDefault.java | 5 -----
.../isis/viewer/wicket/model/isis/WicketViewerSettings.java | 6 ------
.../ajaxtable/CollectionContentsAsAjaxTablePanel.java | 3 ++-
.../ajaxtable/columns/ObjectAdapterPropertyColumn.java | 10 ++++------
.../domainapp/application/manifest/viewer_wicket.properties | 10 ----------
6 files changed, 6 insertions(+), 37 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
index aa4075d..c410a80 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
@@ -57,15 +57,6 @@ If you prefer you can place all configuration properties into `WEB-INF/isis.prop
| Whether to show chooser for Breadcrumbs (bottom-left in the Wicket viewer)
|`isis.viewer.wicket.` +
-`cssPrefix`
-| string +
-(`isis`)
-| (`1.16.0-SNAPSHOT`) Table columns have CSS classes identifying the property; this allows individual table columns to targeted and styled.
-This property defines a prefix to avoid clashes between property names and bootstrap# CSS classes.
-
-For example, if set to "isis" then the CSS class added for an "active" property will be "isis-active" (otherwise,it would be simply have been "active").
-
-|`isis.viewer.wicket.` +
`datePattern`
| date format +
(`dd-MM-yyyy`)
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
index c96e428..6782fd9 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
@@ -51,11 +51,6 @@ public class WicketViewerSettingsDefault implements WicketViewerSettings {
return getConfiguration().getInteger("isis.viewer.wicket.maxTitleLengthInParentedTables", getMaxTitleLengthInTables());
}
- @Override
- public String getCssPrefix() {
- return getConfiguration().getString("isis.viewer.wicket.cssPrefix", "isis");
- }
-
/**
* Fallback for either {@link #getMaxTitleLengthInParentedTables()} and {@link #getMaxTitleLengthInParentedTables()}
*/
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
index af478cc..cd9b5ad 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/WicketViewerSettings.java
@@ -38,12 +38,6 @@ public interface WicketViewerSettings extends Serializable {
int getMaxTitleLengthInParentedTables();
/**
- * The prefix, if any, of any CSS class name that identifies property columns within tables.
- * @return
- */
- String getCssPrefix();
-
- /**
* The pattern used for rendering and parsing dates.
*
* <p>
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 5e0a908..700998f 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,8 @@ public class CollectionContentsAsAjaxTablePanel
final NamedFacet facet = property.getFacet(NamedFacet.class);
final boolean escaped = facet == null || facet.escaped();
- return new ObjectAdapterPropertyColumn(Model.of(property.getName()), property.getId(), property.getId(), escaped, getSettings());
+ final String parentTypeName = property.getOnType().getShortIdentifier();
+ return new ObjectAdapterPropertyColumn(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 cab48a4..87f120c 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
@@ -29,7 +29,6 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel.RenderingHint;
@@ -54,18 +53,18 @@ public final class ObjectAdapterPropertyColumn extends ColumnAbstract<ObjectAdap
private final String propertyExpression;
private final boolean escaped;
- private final String cssPrefix;
+ private final String parentTypeName;
public ObjectAdapterPropertyColumn(
final IModel<String> columnNameModel,
final String sortProperty,
final String propertyName,
final boolean escaped,
- final WicketViewerSettings settings) {
+ final String parentTypeName) {
super(columnNameModel, sortProperty);
this.propertyExpression = propertyName;
this.escaped = escaped;
- this.cssPrefix = settings.getCssPrefix();
+ this.parentTypeName = parentTypeName;
}
public Component getHeader(final String componentId)
@@ -79,8 +78,7 @@ public final class ObjectAdapterPropertyColumn extends ColumnAbstract<ObjectAdap
public String getCssClass() {
final String cssClass = super.getCssClass();
return (!Strings.isNullOrEmpty(cssClass) ? (cssClass + " ") : "") +
- (!Strings.isNullOrEmpty(cssPrefix) ? cssPrefix + "-" : "") +
- propertyExpression;
+ parentTypeName + "-" + propertyExpression;
}
@Override
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_wicket.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_wicket.properties
index 2f7325e..96fa2ac 100644
--- a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_wicket.properties
+++ b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_wicket.properties
@@ -33,16 +33,6 @@ isis.viewer.wicket.maxTitleLengthInParentedTables=0
#
-# Table columns have CSS classes identifying the property; this allows individual table columns to targeted and styled.
-# This property defines a prefix to avoid clashes between property names and bootstrap# CSS classes.
-# For example, if set to "isis" then the CSS class added for an "active" property will be "isis-active" (otherwise,
-# it would be simply have been "active").
-# The default value if not specified is simply "isis".
-#
-#isis.viewer.wicket.cssPrefix=isis
-
-
-#
# in Firefox and more recent versions of Chrome 54+, cannot copy out of disabled fields; instead we use the
# readonly attribute (https://www.w3.org/TR/2014/REC-html5-20141028/forms.html#the-readonly-attribute)
# This behaviour is enabled by default but can be disabled using this flag
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.