Added required and error class for time, password, checkedinput

Pylons · Nov 22, 2023 · 1530110 · 1530110
1 parent 1a5d917
commit 1530110
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/deform/templates/checked_input.pt b/deform/templates/checked_input.pt
@@ -1,26 +1,29 @@
 <div tal:define="oid oid|field.oid;
                  name name|field.name;
                  css_class css_class|field.widget.css_class;
+                 error_class error_class|field.widget.error_class;
                  style style|field.widget.style;
                  mask mask|field.widget.mask;
                  mask_placeholder mask_placeholder|field.widget.mask_placeholder;
                  autofocus autofocus|field.autofocus"
      i18n:domain="deform"
      tal:omit-tag="">
   ${field.start_mapping()}
-  <div>
+  <div class="mb-3 ${field.error and 'is-invalid' or None}">
     <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};
                            placeholder subject;
                            autofocus autofocus;
+                           required field.required and 'required' or None;
                            attributes|field.widget.attributes|{};"
            id="${oid}"/>
   </div>
-  <div>
+  <div class="mb-3 ${field.error and 'is-invalid' or None}">
     <input type="text" name="${name}-confirm" value="${confirm}"
-           tal:attributes="class string: form-control ${css_class or ''};
-                           style style;
+           tal:attributes="style style;
+                           class string:form-control ${field.error and error_class or css_class};
+                           required field.required and 'required' or None;
                            placeholder confirm_subject;
                            confirm_attributes|field.widget.confirm_attributes|{};"
            id="${oid}-confirm"/>

diff --git a/deform/templates/dateparts.pt b/deform/templates/dateparts.pt
@@ -11,7 +11,7 @@
     <div class="col-md-4"><div class="input-group">
       <span class="input-group-text" i18n:translate="">Year</span>
       <input type="number" name="year" value="${year}"
-             class="span2 form-control ${field.error and error_class or css_class or ''}"
+             class="span2 form-control ${field.error and error_class or css_class}"
              tal:attributes="style style;
                              autofocus autofocus;
                              required field.required and 'required' or None;
@@ -22,7 +22,7 @@
     <div class="col-md-4"><div class="input-group">
       <span class="input-group-text" i18n:translate="">Month</span>
       <input type="number" name="month" value="${month}"
-             class="span2 form-control ${field.error and error_class or css_class or ''}"
+             class="span2 form-control ${field.error and error_class or css_class}"
              tal:attributes="style style;
                              required field.required and 'required' or None;
                              month_attributes|field.widget.month_attributes|{};"
@@ -32,7 +32,7 @@
     <div class="col-md-4"><div class="input-group">
       <span class="input-group-text" i18n:translate="">Day</span>
       <input type="number" name="day" value="${day}"
-             class="span2 form-control ${field.error and error_class or css_class or ''}"
+             class="span2 form-control ${field.error and error_class or css_class}"
              tal:attributes="style style;
                              required field.required and 'required' or None;
                              day_attributes|field.widget.day_attributes|{};"

diff --git a/deform/templates/password.pt b/deform/templates/password.pt
@@ -4,8 +4,8 @@
     name="${name|field.name}"
     value="${field.widget.redisplay and cstruct or ''}"
     tal:attributes="style style|field.widget.style;
-                    class string: form-control ${css_class|field.widget.css_class or ''};
+                    class string:form-control ${css_class|field.widget.css_class or ''};
                     autofocus autofocus;
+                    required field.required and 'required' or None;
                     attributes|field.widget.attributes|{};"
     id="${oid|field.oid}"/>
-
diff --git a/deform/templates/textinput.pt b/deform/templates/textinput.pt
@@ -8,7 +8,7 @@
                   autofocus autofocus|field.autofocus"
       tal:omit-tag="">
     <input type="text" name="${name}" value="${cstruct}"
-           tal:attributes="class string: form-control ${field.error and error_class or css_class or ''};
+           tal:attributes="class string:form-control ${field.error and error_class or css_class or ''};
                            required field.required and 'required' or None;
                            style style;
                            autofocus autofocus;

diff --git a/deform/templates/timeinput.pt b/deform/templates/timeinput.pt
@@ -13,6 +13,7 @@
                          class string: ${css_class or ''} form-control hasDatepicker;
                          style style;
                          autofocus autofocus;
+                         required field.required and 'required' or None;
                          attributes|field.widget.attributes|{};"
          id="${oid}"/>
   ${field.end_mapping()}