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 2014/11/07 04:51:01 UTC
[15/18] isis git commit: ISIS-537 Add an 'edit' icon for
EntityPropertiesPanel
ISIS-537 Add an 'edit' icon for EntityPropertiesPanel
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/21d008a8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/21d008a8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/21d008a8
Branch: refs/heads/master
Commit: 21d008a89061d892fb427d668b64fbfbe3e90b07
Parents: e59364a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Nov 6 11:42:04 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Nov 6 11:42:04 2014 +0200
----------------------------------------------------------------------
.../ui/components/entity/properties/EntityPropertiesForm.java | 1 +
.../ui/components/entity/properties/EntityPropertiesPanel.html | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/21d008a8/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
index 6c8d1b4..cbfe092 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
@@ -447,6 +447,7 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> {
});
}
};
+ editButton.add(new Label("editLabel", editButton.getModel()));
markupContainer.add(editButton);
http://git-wip-us.apache.org/repos/asf/isis/blob/21d008a8/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
index f9e8d40..18dfd1d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
@@ -40,7 +40,7 @@
<span wicket:id="feedback"></span>
</div>
<div class="buttons">
- <input type="submit" class="edit btn btn-primary btn-md" wicket:id="edit"/>
+ <button type="submit" class="edit btn btn-primary btn-md" wicket:id="edit"><span class="fa fa-edit"></span> <wicket:container wicket:id="editLabel"></wicket:container></button>
<input type="submit" class="ok btn btn-primary btn-md" wicket:id="ok"/>
<input type="submit" class="cancel btn btn-default btn-md" wicket:id="cancel"/>
</div>