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/04/17 08:21:36 UTC
[isis] branch master updated: ISIS-3006: css fix: scalarValueInlinePromptLink full width always
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 95ecacd4a4 ISIS-3006: css fix: scalarValueInlinePromptLink full width always
95ecacd4a4 is described below
commit 95ecacd4a468f2511ecb07cd168d99b196285232
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Apr 17 10:21:29 2022 +0200
ISIS-3006: css fix: scalarValueInlinePromptLink full width always
- consistent UI
---
.../ui/components/scalars/ScalarPanelAbstract2.java | 4 +---
.../scalars/ScalarPanelFormFieldAbstract.html | 2 +-
.../wicket/ui/pages/bootstrap-overrides-all-v2.css | 7 ++-----
.../org/apache/isis/viewer/wicket/ui/util/Wkt.java | 18 +++++++++---------
4 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index 735a0b1e77..9863713af7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -127,9 +127,7 @@ extends ScalarPanelAbstract {
&& !getRenderScenario().isCompact()) {
return PromptFragment.TEXTAREA
.createFragment(id, this, scalarValueId->{
- //XXX tab or no-tab?
- //XXX always full width
- val textArea = Wkt.textArea(scalarValueId, this::obtainOutputFormat);
+ val textArea = Wkt.textAreaNoTab(scalarValueId, this::obtainOutputFormat);
val scalarModel = scalarModel();
Wkt.setFormComponentAttributes(textArea,
scalarModel::multilineNumberOfLines,
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
index 8b3b85804e..734b5b4038 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
@@ -71,7 +71,7 @@
class="no-event-prop" />
<span class="position-absolute top-0 end-0">
- <div class="btn-group btn-group-sm shadow" role="group">
+ <div class="btn-group btn-group-sm shadow-sm" role="group">
<button type="button" class="btn btn-primary">
<i class="fa-solid fa-edit"></i></button>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
index 3d90697838..b83ef601f5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
@@ -1040,12 +1040,9 @@ li.select2-results__option {
padding-right: 15px;
}
-.booleanPanel .form-control.scalarValueInlinePromptLink,
-.referencePanel .form-control.scalarValueInlinePromptLink {
- display: inline-flex;
- width: 85%;
+div.scalarValueInlinePromptLink {
+ width: 100%;
}
-
.scalarValueInlinePromptLink.form-control {
text-decoration: none;
overflow: hidden;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
index 1c8d8433df..6d201169c8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
@@ -709,15 +709,15 @@ public class Wkt {
return new TextArea<String>(id, textModel);
}
-// public TextArea<String> textAreaNoTab(final String id, final IModel<String> textModel) {
-// return new TextArea<String>(id, textModel) {
-// private static final long serialVersionUID = 1L;
-// @Override protected void onComponentTag(final ComponentTag tag) {
-// super.onComponentTag(tag);
-// tag.put("tabindex", "-1");
-// }
-// };
-// }
+ public TextArea<String> textAreaNoTab(final String id, final IModel<String> textModel) {
+ return new TextArea<String>(id, textModel) {
+ private static final long serialVersionUID = 1L;
+ @Override protected void onComponentTag(final ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.put("tabindex", "-1");
+ }
+ };
+ }
// public TextArea<String> textAreaAddNoTab(
// final MarkupContainer container, final String id, final IModel<String> textModel) {