Added form_help on horizontal design and removed special variable

Author: Nyholm

Resources/views/Form/bootstrap_3_horizontal_layout.html.twig

@@ -23,10 +23,15 @@ col-sm-2
 {# Rows #}
 
 {% block form_row -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
     <div class="form-group{% if (not compound or force_error|default(false)) and not valid %} has-error{% endif %}">
         {{- form_label(form) -}}
         <div class="{{ block('form_group_class') }}">
-            {{- form_widget(form) -}}
+            {{- form_widget(form, widget_attr) -}}
+            {{- form_help(form) -}}
             {{- form_errors(form) -}}
         </div>
 {##}</div>

Resources/views/Form/bootstrap_3_layout.html.twig

@@ -89,9 +89,13 @@
 {# Rows #}
 
 {% block form_row -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
     <div class="form-group{% if (not compound or force_error|default(false)) and not valid %} has-error{% endif %}">
         {{- form_label(form) -}}
-        {{- form_widget(form, { 'helpBlockDisplayed': true }) -}}
+        {{- form_widget(form, widget_attr) -}}
         {{- form_help(form) -}}
         {{- form_errors(form) -}}
     </div>

Resources/views/Form/bootstrap_4_horizontal_layout.html.twig

@@ -24,21 +24,31 @@ col-sm-2
     {%- if expanded is defined and expanded -%}
         {{ block('fieldset_form_row') }}
     {%- else -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
         <div class="form-group row{% if (not compound or force_error|default(false)) and not valid %} is-invalid{% endif %}">
             {{- form_label(form) -}}
             <div class="{{ block('form_group_class') }}">
-                {{- form_widget(form) -}}
+                {{- form_widget(form, widget_attr) -}}
+                {{- form_help(form) -}}
             </div>
     {##}</div>
     {%- endif -%}
 {%- endblock form_row %}
 
 {% block fieldset_form_row -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
     <fieldset class="form-group">
         <div class="row{% if (not compound or force_error|default(false)) and not valid %} is-invalid{% endif %}">
             {{- form_label(form) -}}
             <div class="{{ block('form_group_class') }}">
-                {{- form_widget(form) -}}
+                {{- form_widget(form, widget_attr) -}}
+                {{- form_help(form) -}}
             </div>
         </div>
 {##}</fieldset>

Resources/views/Form/bootstrap_4_layout.html.twig

@@ -257,9 +257,13 @@
     {%- if compound is defined and compound -%}
         {%- set element = 'fieldset' -%}
     {%- endif -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
     <{{ element|default('div') }} class="form-group">
         {{- form_label(form) -}}
-        {{- form_widget(form, { 'helpBlockDisplayed': true }) -}}
+        {{- form_widget(form, widget_attr) -}}
         {{- form_help(form) -}}
     </{{ element|default('div') }}>
 {%- endblock form_row %}

Resources/views/Form/form_div_layout.html.twig

@@ -306,10 +306,14 @@
 {%- endblock repeated_row -%}
 
 {%- block form_row -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
     <div>
         {{- form_label(form) -}}
         {{- form_errors(form) -}}
-        {{- form_widget(form, { 'helpBlockDisplayed': true }) -}}
+        {{- form_widget(form, widget_attr) -}}
         {{- form_help(form) -}}
     </div>
 {%- endblock form_row -%}
@@ -397,7 +401,6 @@
     id="{{ id }}" name="{{ full_name }}"
     {%- if disabled %} disabled="disabled"{% endif -%}
     {%- if required %} required="required"{% endif -%}
-    {%- if helpBlockDisplayed is defined and helpBlockDisplayed is same as(true) and help is not empty %} aria-describedby="{{ id }}_help"{% endif -%}
     {{ block('attributes') }}
 {%- endblock widget_attributes -%}
 

Resources/views/Form/form_table_layout.html.twig

@@ -1,13 +1,17 @@
 {% use "form_div_layout.html.twig" %}
 
 {%- block form_row -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
     <tr>
         <td>
             {{- form_label(form) -}}
         </td>
         <td>
             {{- form_errors(form) -}}
-            {{- form_widget(form, { 'helpBlockDisplayed': true }) -}}
+            {{- form_widget(form, widget_attr) -}}
             {{- form_help(form) -}}
         </td>
     </tr>

Resources/views/Form/foundation_5_layout.html.twig

@@ -267,10 +267,14 @@
 {# Rows #}
 
 {% block form_row -%}
+    {%- set widget_attr = {} -%}
+    {%- if help is not empty -%}
+        {%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
+    {%- endif -%}
     <div class="row">
         <div class="large-12 columns{% if (not compound or force_error|default(false)) and not valid %} error{% endif %}">
             {{ form_label(form) }}
-            {{- form_widget(form, { 'helpBlockDisplayed': true }) -}}
+            {{- form_widget(form, widget_attr) -}}
             {{ form_help(form) }}
             {{ form_errors(form) }}
         </div>