Merge branch '26-display-bugs-with-legend' into 'master'

issue26 Bug graphique: page modifiation fiche personne

Closes #26

See merge request Chill-Projet/chill-bundles!502

src/Bundle/ChillMainBundle/Form/Type/CommentType.php

@@ -56,12 +56,7 @@ class CommentType extends AbstractType
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars = array_replace(
+        $view->vars['fullWidth'] = true;
-            $view->vars,
-            [
-                'fullWidth' => true,
-            ]
-        );
     }
 
     public function configureOptions(OptionsResolver $resolver)

src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php

@@ -39,7 +39,7 @@ class PrivateCommentType extends AbstractType
         $builder
             ->add('comments', ChillTextareaType::class, [
                 'disable_editor' => $options['disable_editor'],
-                'label' => false,
+                'label' => $options['label'],
             ])
             ->setDataMapper($this->dataMapper);
     }

src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php

@@ -95,12 +95,7 @@ class ScopePickerType extends AbstractType
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars = array_replace(
+        $view->vars['fullWidth'] = true;
-            $view->vars,
-            [
-                'fullWidth' => true,
-            ]
-        );
     }
 
     public function configureOptions(OptionsResolver $resolver)

src/Bundle/ChillMainBundle/Resources/views/Form/bootstrap5/bootstrap_5_horizontal_layout.html.twig

@@ -68,7 +68,8 @@
                         {{- form_errors(form) -}}
                     </div>
                 {% else %}
-                    <div class="col-sm">
+                    <div class="col-12 clear">{{- form_label(form) -}}</div>
+                    <div class="col-sm-12">
                         {{- form_widget(form, widget_attr) -}}
                         {{- form_help(form) -}}
                         {{- form_errors(form) -}}

src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig

@@ -18,9 +18,9 @@
 
 {% block form_row %}
 {% apply spaceless %}
-    {% if form.vars.fullWidth is not defined or form.vars.fullWidth == false %}
     <div class="mb-2">
         <div class="row">
+            {% if form.vars.fullWidth is not defined or form.vars.fullWidth == false %}
                 <div class="{% apply spaceless %}
                     {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %}
                         col-sm-12
@@ -48,13 +48,18 @@
                     {{ form_widget(form) }}
                     {{ form_errors(form) }}
                 </div>
-        </div>
-    </div>
             {% else %}
-        {{ form_widget(form)  }}
+                <div class="col-12 clear">{{ form_label(form) }}</div>
+                <div class="col-12">{{ form_widget(form) }}</div>
             {% endif %}
+        </div>
+    </div>
 {% endapply %}
 {% endblock form_row %}
+{#
+    The block 'form_row' above may be removed !
+    Read this note: https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/502#note_1311993084
+#}
 
 {% block choice_widget_expanded %}
 {% apply spaceless %}
@@ -200,7 +205,6 @@
 
 
 {% block private_comment_row %}
-    {{ form_label(form) }}
     {{ form_row(form) }}
 {% endblock %}
 
@@ -211,7 +215,6 @@
 {% endblock %}
 
 {% block comment_row %}
-    {{ form_label(form) }}
     {{ form_row(form) }}
 {% endblock %}