From 6611f8e0f20567ec655465260c10df4f07364cc3 Mon Sep 17 00:00:00 2001
From: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Mon, 11 Nov 2024 23:32:50 +0100
Subject: [PATCH 1/6] Improved required question star contrast.
---
NEMO/static/nemo.css | 5 +++++
NEMO/widgets/dynamic_form.py | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/NEMO/static/nemo.css b/NEMO/static/nemo.css
index 1667c6096..45391b3f1 100644
--- a/NEMO/static/nemo.css
+++ b/NEMO/static/nemo.css
@@ -1049,6 +1049,11 @@ li.area-tree-node a, li.area-tree-node a:hover, li.area-tree-node a:focus
#additional_event_parameters input:invalid, #additional_event_parameters select:invalid, #additional_event_parameters textarea:invalid
{
border-color: #dc3545!important;
+.required-question-star
+{
+ color:red;
+ font-size: 20px;
+ font-weight: bold;
}
/* Make form-control look like plain text */
diff --git a/NEMO/widgets/dynamic_form.py b/NEMO/widgets/dynamic_form.py
index 41206a4de..d684ad999 100644
--- a/NEMO/widgets/dynamic_form.py
+++ b/NEMO/widgets/dynamic_form.py
@@ -31,7 +31,7 @@
class PostUsageQuestion:
question_type = "Question"
- required_span = '*'
+ required_span = '*'
def __init__(self, properties: Dict, index: int = None, initial_data=None):
self.properties = properties
From c9c1452796f60fda2081e8953f84e758499b36cc Mon Sep 17 00:00:00 2001
From: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Mon, 11 Nov 2024 23:34:53 +0100
Subject: [PATCH 2/6] Improved required question highlighting.
Fixes #256
---
NEMO/static/nemo.css | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/NEMO/static/nemo.css b/NEMO/static/nemo.css
index 45391b3f1..eb310e496 100644
--- a/NEMO/static/nemo.css
+++ b/NEMO/static/nemo.css
@@ -1049,6 +1049,15 @@ li.area-tree-node a, li.area-tree-node a:hover, li.area-tree-node a:focus
#additional_event_parameters input:invalid, #additional_event_parameters select:invalid, #additional_event_parameters textarea:invalid
{
border-color: #dc3545!important;
+ border-width: 2px;
+ background: #ffebeb;
+}
+#tool_control input:invalid::placeholder, #tool_control select:invalid::placeholder, #tool_control textarea:invalid::placeholder,
+#additional_event_parameters input:invalid::placeholder, #additional_event_parameters select:invalid::placeholder, #additional_event_parameters textarea:invalid::placeholder
+{
+ color: #505050 ;
+}
+
.required-question-star
{
color:red;
From b95e7093123bc2fbdb5bb41dd69dee5cc5c9d07f Mon Sep 17 00:00:00 2001
From: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed, 20 Nov 2024 02:34:27 +0100
Subject: [PATCH 3/6] Moving invalid form input style to new `dynamic_form`
class.
---
NEMO/static/nemo.css | 7 +++----
NEMO/widgets/dynamic_form.py | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/NEMO/static/nemo.css b/NEMO/static/nemo.css
index eb310e496..d1c545ec8 100644
--- a/NEMO/static/nemo.css
+++ b/NEMO/static/nemo.css
@@ -1045,15 +1045,14 @@ li.area-tree-node a, li.area-tree-node a:hover, li.area-tree-node a:focus
}
/* Invalid input for post usage/reservation questions and additional event parameters */
-#tool_control input:invalid, #tool_control select:invalid, #tool_control textarea:invalid,
-#additional_event_parameters input:invalid, #additional_event_parameters select:invalid, #additional_event_parameters textarea:invalid
+.dynamic_form input:invalid
{
border-color: #dc3545!important;
border-width: 2px;
background: #ffebeb;
}
-#tool_control input:invalid::placeholder, #tool_control select:invalid::placeholder, #tool_control textarea:invalid::placeholder,
-#additional_event_parameters input:invalid::placeholder, #additional_event_parameters select:invalid::placeholder, #additional_event_parameters textarea:invalid::placeholder
+
+.dynamic_form input:invalid::placeholder
{
color: #505050 ;
}
diff --git a/NEMO/widgets/dynamic_form.py b/NEMO/widgets/dynamic_form.py
index d684ad999..42f98f00b 100644
--- a/NEMO/widgets/dynamic_form.py
+++ b/NEMO/widgets/dynamic_form.py
@@ -613,7 +613,7 @@ def render(self, group_question_url: str, group_item_id: int, virtual_inputs: bo
result = ""
if self.questions:
result += ""
- result += render_grid_questions(self.questions, group_question_url, group_item_id, virtual_inputs)
+ result += f'{render_grid_questions(self.questions, group_question_url, group_item_id, virtual_inputs)}
'
return mark_safe(result)
def validate(self, group_question_url: str, group_item_id: int):
From 2155329d15e962a028faf8dd3d84b34d5573ba3e Mon Sep 17 00:00:00 2001
From: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed, 20 Nov 2024 02:35:14 +0100
Subject: [PATCH 4/6] Fixing required question line height.
---
NEMO/static/nemo.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/NEMO/static/nemo.css b/NEMO/static/nemo.css
index d1c545ec8..0b67dd79d 100644
--- a/NEMO/static/nemo.css
+++ b/NEMO/static/nemo.css
@@ -1062,6 +1062,7 @@ li.area-tree-node a, li.area-tree-node a:hover, li.area-tree-node a:focus
color:red;
font-size: 20px;
font-weight: bold;
+ line-height: .75;
}
/* Make form-control look like plain text */
From 7f94202db9e5ebb6fc092af1e240a99748a15c74 Mon Sep 17 00:00:00 2001
From: r-xyz <100710244+r-xyz@users.noreply.github.com>
Date: Wed, 20 Nov 2024 02:35:54 +0100
Subject: [PATCH 5/6] Port required form improvements to admin preview.
---
.../dynamic_form_preview.css | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/NEMO/static/admin/dynamic_form_preview/dynamic_form_preview.css b/NEMO/static/admin/dynamic_form_preview/dynamic_form_preview.css
index 00cf2738d..d91268c60 100644
--- a/NEMO/static/admin/dynamic_form_preview/dynamic_form_preview.css
+++ b/NEMO/static/admin/dynamic_form_preview/dynamic_form_preview.css
@@ -184,6 +184,27 @@ div.dynamic_form_preview:empty
.dynamic_form_preview input:invalid, .dynamic_form_preview select:invalid, .dynamic_form_preview textarea:invalid
{
border-color: #dc3545!important;
+ border-width: 2px!important;
+ background: #ffebeb!important;
+}
+
+.dynamic_form_preview input:invalid::placeholder
+{
+ color: #505050!important;
+}
+
+.dynamic_form_preview button
+{
+ border-image-width: 1;
+ border-width: 1px;
+}
+
+.required-question-star
+{
+ color:red;
+ font-size: 20px;
+ font-weight: bold;
+ line-height: .75;
}
.col-lg-1, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-md-1, .col-md-10, .col-md-11, .col-md-12, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-sm-1, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-xs-1, .col-xs-10, .col-xs-11, .col-xs-12, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9
From 8129f6672b2cfad640ac63c5270bedf28eab6cdf Mon Sep 17 00:00:00 2001
From: Mathieu Rampant
Date: Wed, 20 Nov 2024 15:51:13 -0500
Subject: [PATCH 6/6] Update
NEMO/static/admin/dynamic_form_preview/dynamic_form_preview.css
---
NEMO/static/admin/dynamic_form_preview/dynamic_form_preview.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NEMO/static/admin/dynamic_form_preview/dynamic_form_preview.css b/NEMO/static/admin/dynamic_form_preview/dynamic_form_preview.css
index d91268c60..63e4d3f61 100644
--- a/NEMO/static/admin/dynamic_form_preview/dynamic_form_preview.css
+++ b/NEMO/static/admin/dynamic_form_preview/dynamic_form_preview.css
@@ -185,7 +185,7 @@ div.dynamic_form_preview:empty
{
border-color: #dc3545!important;
border-width: 2px!important;
- background: #ffebeb!important;
+ background: #ffebeb!important;
}
.dynamic_form_preview input:invalid::placeholder