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/04 10:22:40 UTC
[isis] branch master updated: ISIS-2877: html template fixes
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 93b72d0 ISIS-2877: html template fixes
93b72d0 is described below
commit 93b72d0ad27a16b3ecda5ed6d83341c90ea0054d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 4 11:22:07 2022 +0100
ISIS-2877: html template fixes
---
.../ui/components/scalars/ScalarPanelTextFieldAbstract.html | 8 +++++---
.../scalars/blobclob/IsisBlobOrClobPanelAbstract.java | 12 ++++--------
.../wicket/ui/components/scalars/primitive/BooleanPanel.html | 8 +++++---
.../ui/components/scalars/reference/ReferencePanel.html | 8 +++++---
.../scalars/valuechoices/ValueChoicesSelect2Panel.html | 9 ++++++---
5 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
index 61c1be4..f5d172f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
@@ -48,10 +48,12 @@
</a>
<wicket:container wicket:id="scalarValueContainer"/>
-
+
<a href="##"
- class="edit fa fa-edit"
- wicket:id="editProperty"></a>
+ class="edit btn btn-sm btn-link"
+ wicket:id="editProperty">
+ <span class="editIcon fa fa-edit"></span>
+ </a>
</span>
</span>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
index 743bc1d..495e833 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
@@ -153,16 +153,12 @@ extends ScalarPanelWithFormFieldAbstract<T> {
@Override
protected void onNotEditable(final String disableReason, final Optional<AjaxRequestTarget> target) {
- updateRegularFormComponents(
- ScalarRenderMode.VIEWING,
- disableReason, target);
+ updateRegularFormComponents(ScalarRenderMode.VIEWING, disableReason, target);
}
@Override
protected void onEditable(final Optional<AjaxRequestTarget> target) {
- updateRegularFormComponents(
- ScalarRenderMode.VIEWING,
- null, target);
+ updateRegularFormComponents(ScalarRenderMode.VIEWING, null, target);
}
@SuppressWarnings("unchecked")
@@ -194,7 +190,7 @@ extends ScalarPanelWithFormFieldAbstract<T> {
addAcceptFilterTo(scalarValueComponent);
fileNameLabel = createFileNameLabel(ID_FILE_NAME, formComponent);
- updateClearLink(editingWidgetVisibility, target);
+ createClearLink(editingWidgetVisibility, target);
// the visibility of download link is intentionally 'backwards';
// if in edit mode then do NOT show
@@ -250,7 +246,7 @@ extends ScalarPanelWithFormFieldAbstract<T> {
return fileNameLabel;
}
- private void updateClearLink(
+ private void createClearLink(
final ScalarRenderMode renderMode,
final Optional<AjaxRequestTarget> target) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
index bf4a6ac..35de2fa 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
@@ -46,9 +46,11 @@
class="scalarValue"
wicket:id="scalarValue" />
- <a href="#"
- class="edit fa fa-edit"
- wicket:id="editProperty" ></a>
+ <a href="##"
+ class="edit btn btn-sm btn-link"
+ wicket:id="editProperty">
+ <span class="editIcon fa fa-edit"></span>
+ </a>
<a href="#"
name="scalarValueInlinePromptLink"
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
index e3485c0..5a31810 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
@@ -50,9 +50,11 @@
</span>
<span wicket:id="entityTitleIfNull">(none)</span>
- <a href="#"
- class="edit fa fa-edit"
- wicket:id="editProperty"></a>
+ <a href="##"
+ class="edit btn btn-sm btn-link"
+ wicket:id="editProperty">
+ <span class="editIcon fa fa-edit"></span>
+ </a>
<a href="#"
name="scalarValueInlinePromptLink"
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
index ea51122..fc6165c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
@@ -48,9 +48,12 @@
</a>
<select class="choices form-control-sm select2-remote" wicket:id="scalarValue"></select>
- <a href="#"
- class="edit fa fa-edit"
- wicket:id="editProperty"></a>
+
+ <a href="##"
+ class="edit btn btn-sm btn-link"
+ wicket:id="editProperty">
+ <span class="editIcon fa fa-edit"></span>
+ </a>
</span>
</span>
<span class="associatedActionLinksRight"