You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/03/06 15:47:02 UTC
[isis] branch master updated: ISIS-2877: just comments
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new dfb7cfa ISIS-2877: just comments
dfb7cfa is described below
commit dfb7cfa7c726d3b34a9cd335d995bbf3df8c12a9
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Mar 6 16:46:50 2022 +0100
ISIS-2877: just comments
---
.../scalars/ScalarPanelWithFormFieldAbstract.html | 25 +++++++++++++++-------
.../ui/components/scalars/_FragmentFactory.java | 2 +-
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelWithFormFieldAbstract.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelWithFormFieldAbstract.html
index ceca4e7..448d2ce 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelWithFormFieldAbstract.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelWithFormFieldAbstract.html
@@ -35,17 +35,23 @@
<a href="##" name="scalarValueInlinePromptLink"
class="scalarValueInlinePromptLink"
- wicket:id="scalarValueInlinePromptLink">
- <wicket:container
- wicket:id="scalarValueInlinePromptLabel" />
+ wicket:id="scalarValueInlinePromptLink">
+
+ <!-- populated from fragments -->
+ <wicket:container
+ wicket:id="scalarValueInlinePromptLabel"/>
+
</a>
- <wicket:container wicket:id="scalarValueContainer" />
- <a
- href="##" class="edit btn btn-sm btn-link"
+ <!-- populated from fragments -->
+ <wicket:container
+ wicket:id="scalarValueContainer" />
+
+ <a href="##" class="edit btn btn-sm btn-link"
wicket:id="editProperty">
<span class="editIcon fa fa-edit"/>
</a>
+
</span>
</span>
<span class="associatedActionLinksRight"
@@ -64,7 +70,10 @@
</div>
</div>
- <wicket:container wicket:id="scalarIfCompact"></wicket:container>
+ <!-- populated from fragments -->
+ <wicket:container
+ wicket:id="scalarIfCompact"/>
+
</div>
<wicket:fragment wicket:id="fragmentValueAsTextInput">
@@ -79,7 +88,7 @@
data-isis-focus="true" />
</wicket:fragment>
- <wicket:fragment wicket:id="fragmentValueAsEditIconAsInlinePrompt">
+ <wicket:fragment wicket:id="fragmentValueAsEditIconInlinePrompt">
<button class="edit btn btn-sm btn-link" wicket:id="scalarValue">
<span class="editIcon fa fa-edit"/>
</button>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/_FragmentFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/_FragmentFactory.java
index 99238eb..ec2fca5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/_FragmentFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/_FragmentFactory.java
@@ -45,7 +45,7 @@ public class _FragmentFactory {
DATE_INPUT("fragmentValueAsDateInput"),
TEXT_PROMPT("fragmentValueAsTextInlinePrompt"),
TEXTAREA_PROMPT("fragmentValueAsTextareaInlinePrompt"),
- EDIT_ICON_PROMPT("fragmentValueAsEditIconAsInlinePrompt"),
+ EDIT_ICON_PROMPT("fragmentValueAsEditIconInlinePrompt"),
;
private final String fragmentId;
public Fragment createFragment(final String id, final MarkupContainer container) {