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 2021/10/29 06:37:59 UTC
[isis] branch master updated: ISIS-2879: make textarea(s),
that on click trigger a scalar-prompt, readonly
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 9deeb50 ISIS-2879: make textarea(s), that on click trigger a scalar-prompt, readonly
9deeb50 is described below
commit 9deeb508c692180bdc3722453ada05c4894f3ed1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 29 08:37:49 2021 +0200
ISIS-2879: make textarea(s), that on click trigger a scalar-prompt,
readonly
---
.../scalars/ScalarPanelTextFieldAbstract.html | 19 +++++++++++--------
.../scalars/string/MultiLineStringPanel.java | 3 ++-
.../wicket/ui/pages/bootstrap-overrides-all-v2.css | 8 +++++++-
3 files changed, 20 insertions(+), 10 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 71600b1..61c1be4 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
@@ -86,17 +86,20 @@
</wicket:fragment>
<wicket:fragment wicket:id="textareaInlinePrompt">
- <textarea class="form-control form-control-sm" wicket:id="scalarValue"></textarea>
+ <textarea
+ wicket:id="scalarValue"
+ class="form-control form-control-sm scalarPrompt"
+ readonly="true">
+ </textarea>
</wicket:fragment>
-
<wicket:fragment wicket:id="textarea">
- <textarea
- data-isis-focus="true"
- name="scalarValue"
- class="form-control form-control-sm scalarValue"
- wicket:id="scalarValue">
- </textarea>
+ <textarea
+ wicket:id="scalarValue"
+ name="scalarValue"
+ class="form-control form-control-sm scalarValue"
+ data-isis-focus="true">
+ </textarea>
</wicket:fragment>
<wicket:fragment wicket:id="date">
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
index 1ae0bf0..b42df91 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
@@ -38,7 +38,8 @@ import lombok.val;
/**
* Panel for rendering MultiLine scalars of type String
*/
-public class MultiLineStringPanel extends ScalarPanelTextFieldParseableAbstract {
+public class MultiLineStringPanel
+extends ScalarPanelTextFieldParseableAbstract {
private static final long serialVersionUID = 1L;
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 07af137..bb8a5ba 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
@@ -632,8 +632,14 @@ th > a > div > strong {
float: left;
}
+/* makes readonly textareas that act as scalar-prompt appear like normal */
+textarea.scalarPrompt[readonly] {
+ background-color: initial;
+ opacity: 1;
+}
+
/* makes disabled fields darker */
-.form-control:disabled, .form-control[readonly] {
+.form-control:disabled .form-control[readonly] {
background-color: #e6e6e6;
opacity: 1;
}