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 2016/01/25 16:08:10 UTC
[49/50] [abbrv] isis git commit: ISIS-993: just starting on
refactoring out EntityCollection (cf PropertyGroup) from EntityCollections
(WIP).
ISIS-993: just starting on refactoring out EntityCollection (cf PropertyGroup) from EntityCollections (WIP).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f33e0e24
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f33e0e24
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f33e0e24
Branch: refs/heads/ISIS-993
Commit: f33e0e243d3f6aff68698487cc9a84e89c2a4096
Parents: 2da7073
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jan 15 09:30:44 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jan 25 15:06:07 2016 +0000
----------------------------------------------------------------------
.../collections/EntityCollectionsPanel.html | 27 ++++++++++----------
.../collections/EntityCollectionsPanel.java | 2 ++
.../dom/simple/SimpleObject.layout.xml | 3 +--
3 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f33e0e24/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
index bf65009..3a6c116 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
@@ -22,24 +22,25 @@
<wicket:panel>
<div class="entityCollectionsPanel entityCollectionsComponentType">
<div wicket:id="collections">
- <div wicket:id="collectionGroup" class="panel panel-default">
+ <div wicket:id="collectionGroup">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <span wicket:id="collectionName" class="panel-title">[collection name]</span>
+ <div class="additionalLinksAndSelectorDropDown pull-right">
- <div class="panel-heading">
- <span wicket:id="collectionName" class="panel-title">[collection name]</span>
- <div class="additionalLinksAndSelectorDropDown pull-right">
+ <div class="btn-group">
+ <div wicket:id="additionalLinks"></div>
+ </div>
+ <div class="btn-group">
+ <span wicket:id="selectorDropdown"/>
+ </div>
- <div class="btn-group">
- <div wicket:id="additionalLinks"></div>
</div>
- <div class="btn-group">
- <span wicket:id="selectorDropdown"/>
- </div>
-
</div>
- </div>
- <div wicket:id="collection" class="collection panel-body">
- [collection]
+ <div wicket:id="collection" class="collection panel-body">
+ [collection]
+ </div>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/f33e0e24/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
index 01e5133..e2936af 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
@@ -159,7 +159,9 @@ public class EntityCollectionsPanel extends PanelAbstract<EntityModel> {
final String cssClass = facet.cssClass(objectAdapter);
CssClassAppender.appendCssClassTo(collectionRvContainer, cssClass);
}
+
final WebMarkupContainer fieldset = new WebMarkupContainer(ID_COLLECTION_GROUP);
+
collectionRvContainer.add(fieldset);
final OneToManyAssociation otma = (OneToManyAssociation) association;
http://git-wip-us.apache.org/repos/asf/isis/blob/f33e0e24/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
index 94d66b7..2792165 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
@@ -22,8 +22,7 @@
</actions>
<property id="name" labelPosition="TOP">
<actions>
- <action id="updateName" cssClassFa="fa-download">
- <named>xxx</named>
+ <action id="updateName">
<describedAs>This allows the name to be updated</describedAs>
</action>
</actions>