some form template improvments

Author: Leny BERNARD

Entity/WidgetButton.php

@@ -3,6 +3,7 @@
 namespace Victoire\Widget\ButtonBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
 use Victoire\Bundle\WidgetBundle\Entity\Widget;
 
 /**
@@ -17,6 +18,7 @@ class WidgetButton extends Widget
 
     /**
      * @var string
+     * @Assert\NotBlank()
      *
      * @ORM\Column(name="title", type="string", length=255)
      */

Form/WidgetButtonType.php

@@ -64,7 +64,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('tooltipable', null, [
                 'label'   => 'widget.button.form.label.tooltipable',
             ])
-            ->add('icon', FontAwesomePickerType::class);
+            ->add('icon', FontAwesomePickerType::class, [
+                'label'   => 'widget.button.form.label.icon',
+                'required' => false,
+            ]);
 
         parent::buildForm($builder, $options);
     }

Resources/config/services.yml

@@ -1,6 +1,5 @@
 services:
     victoire_core.widget_button_content_resolver:
-        parent: victoire_widget.base_widget_content_resolver
         class: Victoire\Widget\ButtonBundle\Resolver\WidgetButtonContentResolver
         tags:
             - { name: victoire_widget.widget_content_resolver, alias: Button }

Resources/translations/victoire.en.xliff

@@ -86,6 +86,10 @@
         <source>widget.button.form.label.tooltipable</source>
         <target>Active title as a tooltip ?</target>
       </trans-unit>
+      <trans-unit resname="widget.button.form.label.icon">
+        <source>widget.button.form.label.icon</source>
+        <target>Icon</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

Resources/translations/victoire.es.xliff

@@ -86,6 +86,10 @@
         <source>widget.button.form.label.tooltipable</source>
         <target>¿ Título activo como una tooltip ?</target>
       </trans-unit>
+      <trans-unit resname="widget.button.form.label.icon">
+        <source>widget.button.form.label.icon</source>
+        <target>Icon</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

Resources/translations/victoire.fr.xliff

@@ -82,6 +82,10 @@
         <source>widget.button.form.label.tooltipable</source>
         <target>Activer le titre en tooltip ?</target>
       </trans-unit>
+      <trans-unit resname="widget.button.form.label.icon">
+        <source>widget.button.form.label.icon</source>
+        <target>Icône</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

Resources/views/new.html.twig

@@ -18,15 +18,15 @@
             {{ form_row(form.style) }}
 
             <div class="vic-clearfix">
-                {{ form_row(form.isBlock) }}
+                {{ form_widget(form.isBlock) }}
             </div>
 
             <div class="vic-clearfix">
-                {{ form_row(form.isCallToAction) }}
+                {{ form_widget(form.isCallToAction) }}
             </div>
 
             <div class="vic-clearfix">
-                {{ form_row(form.tooltipable) }}
+                {{ form_widget(form.tooltipable) }}
             </div>
         </div>