From 5bd7781a37e3532e19c07f8365c4187d11ed5df2 Mon Sep 17 00:00:00 2001
From: Souheil CHELFOUH <trollfot@gmail.com>
Date: Wed, 22 Nov 2023 17:43:00 +0100
Subject: [PATCH] Work on autocomplete, checked_input, checked_password and
 money_input, regarding errors and required

---
 deform/templates/autocomplete_input.pt |  4 +-
 deform/templates/checked_input.pt      |  2 +
 deform/templates/checked_password.pt   | 53 ++++++++++++++------------
 deform/templates/moneyinput.pt         |  4 +-
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/deform/templates/autocomplete_input.pt b/deform/templates/autocomplete_input.pt
index fd2cbc8d..e0719783 100644
--- a/deform/templates/autocomplete_input.pt
+++ b/deform/templates/autocomplete_input.pt
@@ -1,5 +1,6 @@
 <span tal:define="name name|field.name;
                   css_class css_class|field.widget.css_class;
+                  error_class error_class|field.widget.error_class;
                   oid oid|field.oid;
                   style style|field.widget.style;
                   autofocus autofocus|field.autofocus"
@@ -8,9 +9,10 @@
            name="${name}"
            value="${cstruct}"
            data-provide="typeahead"
-           tal:attributes="class string: form-control ${css_class or ''};
+           tal:attributes="class string:form-control ${field.error and error_class or css_class};
                            style style;
                            autofocus autofocus;
+                           required field.required and 'required' or None;
                            attributes|field.widget.attributes|{};"
            id="${oid}"/>
     <script tal:condition="field.widget.values" type="text/javascript">
diff --git a/deform/templates/checked_input.pt b/deform/templates/checked_input.pt
index e8468f71..a0f0d097 100644
--- a/deform/templates/checked_input.pt
+++ b/deform/templates/checked_input.pt
@@ -11,6 +11,7 @@
   ${field.start_mapping()}
   <div class="mb-3 ${field.error and 'is-invalid' or None}">
     <input type="text" name="${name}" value="${cstruct}"
+           i18n:attributes="placeholder"
            tal:attributes="style style;
                            class string:form-control ${field.error and error_class or css_class};
                            placeholder subject;
@@ -21,6 +22,7 @@
   </div>
   <div class="mb-3 ${field.error and 'is-invalid' or None}">
     <input type="text" name="${name}-confirm" value="${confirm}"
+           i18n:attributes="placeholder"
            tal:attributes="style style;
                            class string:form-control ${field.error and error_class or css_class};
                            required field.required and 'required' or None;
diff --git a/deform/templates/checked_password.pt b/deform/templates/checked_password.pt
index eeaded65..d2f2720c 100644
--- a/deform/templates/checked_password.pt
+++ b/deform/templates/checked_password.pt
@@ -1,32 +1,35 @@
 <div i18n:domain="deform" tal:omit-tag=""
       tal:define="oid oid|field.oid;
                   name name|field.name;
+                  error_class error_class|field.widget.error_class;
                   css_class css_class|field.widget.css_class;
                   style style|field.widget.style;
                   autofocus autofocus|field.autofocus">
-${field.start_mapping()}
-<div>
-  <input type="password"
-         name="${name}"
-         value="${field.widget.redisplay and cstruct or ''}"
-         tal:attributes="class string: form-control ${css_class or ''};
-                         style style;
-                         autofocus autofocus;
-                         attributes|field.widget.attributes|{};"
-         id="${oid}"
-         i18n:attributes="placeholder"
-         placeholder="Password"/>
-</div>
-<div>
-  <input type="password"
-         name="${name}-confirm"
-         value="${field.widget.redisplay and confirm or ''}"
-         tal:attributes="class string: form-control ${css_class or ''};
-                         style style;
-                         confirm_attributes|field.widget.confirm_attributes|{};"
-         id="${oid}-confirm"
-         i18n:attributes="placeholder"
-         placeholder="Confirm Password"/>
-</div>
-${field.end_mapping()}
+  ${field.start_mapping()}
+  <div class="mb-3 ${field.error and 'is-invalid' or None}">
+    <input type="password"
+           name="${name}"
+           value="${field.widget.redisplay and cstruct or ''}"
+           tal:attributes="class string: form-control ${css_class or ''};
+                           style style;
+                           autofocus autofocus;
+                           required field.required and 'required' or None;
+                           attributes|field.widget.attributes|{};"
+           id="${oid}"
+           i18n:attributes="placeholder"
+           placeholder="Password"/>
+  </div>
+  <div class="mb-3 ${field.error and 'is-invalid' or None}">
+    <input type="password"
+           name="${name}-confirm"
+           value="${field.widget.redisplay and confirm or ''}"
+           tal:attributes="class string: form-control ${css_class or ''};
+                           style style;
+                           required field.required and 'required' or None;
+                           confirm_attributes|field.widget.confirm_attributes|{};"
+           id="${oid}-confirm"
+           i18n:attributes="placeholder"
+           placeholder="Confirm Password"/>
+  </div>
+  ${field.end_mapping()}
 </div>
diff --git a/deform/templates/moneyinput.pt b/deform/templates/moneyinput.pt
index f6c2f752..dc9ea9a6 100644
--- a/deform/templates/moneyinput.pt
+++ b/deform/templates/moneyinput.pt
@@ -2,14 +2,16 @@
                   name name|field.name;
                   mask_options mask_options|'{}';
                   style style|field.widget.style;
+                  error_class error_class|field.widget.error_class;
                   css_class css_class|field.widget.css_class;
                   style style|field.widget.style|False;
                   autofocus autofocus|field.autofocus"
       tal:omit-tag="">
     <input type="text" name="${name}" value="${cstruct}"
            tal:attributes="style style;
-                           class string: form-control ${css_class or ''};
+                           class string:form-control ${field.error and error_class or css_class};
                            autofocus autofocus;
+                           required field.required and 'required' or None;
                            attributes|field.widget.attributes|{};"
            id="${oid}"/>
     <script type="text/javascript">