From 9f8baa8e4052713aae26350399a689cb7a0bcef3 Mon Sep 17 00:00:00 2001
From: Baptiste <baptiste@troopers.email>
Date: Tue, 21 Feb 2017 14:21:15 +0100
Subject: [PATCH 1/2] choice for submit button color

---
 Entity/WidgetForm.php                    | 25 +++++++++++++++++++++
 Form/WidgetFormType.php                  | 12 ++++++++++
 Resources/translations/victoire.en.xliff | 28 ++++++++++++++++++++++++
 Resources/translations/victoire.es.xliff | 28 ++++++++++++++++++++++++
 Resources/translations/victoire.fr.xliff | 28 ++++++++++++++++++++++++
 Resources/views/new.html.twig            |  1 +
 Resources/views/show.html.twig           |  2 +-
 7 files changed, 123 insertions(+), 1 deletion(-)

diff --git a/Entity/WidgetForm.php b/Entity/WidgetForm.php
index 04ecc9c..4e609c7 100644
--- a/Entity/WidgetForm.php
+++ b/Entity/WidgetForm.php
@@ -131,6 +131,14 @@ class WidgetForm extends Widget
      */
     protected $submitLabel;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="submit_class", type="string", length=255, nullable=true)
+     * @Assert\NotBlank()
+     */
+    protected $submitClass;
+
     /**
      * @ORM\OneToMany(targetEntity="Victoire\Widget\FormBundle\Entity\WidgetFormQuestion", mappedBy="form", cascade={"persist", "remove"}, orphanRemoval=true)
      * @ORM\OrderBy({"position" = "ASC"})
@@ -183,6 +191,7 @@ public function __construct()
         parent::__construct();
         $this->questions = new ArrayCollection();
         $this->submitIcon = 'fa-location-arrow';
+        $this->submitClass = 'primary';
     }
 
     /**
@@ -738,4 +747,20 @@ public function setAdminSubject($adminSubject)
     {
         $this->adminSubject = $adminSubject;
     }
+
+    /**
+     * @return mixed
+     */
+    public function getSubmitClass()
+    {
+        return $this->submitClass;
+    }
+
+    /**
+     * @param mixed $submitClass
+     */
+    public function setSubmitClass($submitClass)
+    {
+        $this->submitClass = $submitClass;
+    }
 }
diff --git a/Form/WidgetFormType.php b/Form/WidgetFormType.php
index 61b3bd6..2c7a373 100644
--- a/Form/WidgetFormType.php
+++ b/Form/WidgetFormType.php
@@ -133,6 +133,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'label'    => 'widget_form.form.submitIcon.label',
             'required' => false,
         ])
+        ->add('submitClass', ChoiceType::class, [
+            'label'    => 'widget_form.form.submitClass.label',
+            'choices'   => [
+                'widget_form.form.choice.style.label.default' => 'default',
+                'widget_form.form.choice.style.label.primary' => 'primary',
+                'widget_form.form.choice.style.label.success' => 'success',
+                'widget_form.form.choice.style.label.info'    => 'info',
+                'widget_form.form.choice.style.label.warning' => 'warning',
+                'widget_form.form.choice.style.label.danger'  => 'danger',
+                ],
+            'choices_as_values' => true,
+        ])
         ->add('successCallback', ChoiceType::class, [
                 'label'    => 'widget_form.form.successCallback.label',
                 'required' => true,
diff --git a/Resources/translations/victoire.en.xliff b/Resources/translations/victoire.en.xliff
index b1cff92..28e77b2 100644
--- a/Resources/translations/victoire.en.xliff
+++ b/Resources/translations/victoire.en.xliff
@@ -233,6 +233,34 @@
         <source>victoire.widget-form.successCallback.assert.badChoice</source>
         <target>Please specify an action from the dropdown menu.</target>
       </trans-unit>
+      <trans-unit id="submitClassLabel" resname="widget_form.form.submitClass.label">
+        <source>widget_form.form.submitClass.label</source>
+        <target>Submission button Style:</target>
+      </trans-unit>
+      <trans-unit id="submitClassDefaultLabel" resname="widget_form.form.choice.style.label.default">
+        <source>widget_form.form.choice.style.label.default</source>
+        <target>Default</target>
+      </trans-unit>
+      <trans-unit id="submitClassPrimaryLabel" resname="widget_form.form.choice.style.label.primary">
+        <source>widget_form.form.choice.style.label.primary</source>
+        <target>Principal</target>
+      </trans-unit>
+      <trans-unit id="submitClassSuccessLabel" resname="widget_form.form.choice.style.label.success">
+        <source>widget_form.form.choice.style.label.success</source>
+        <target>Succès</target>
+      </trans-unit>
+      <trans-unit id="submitClassInfoLabel" resname="widget_form.form.choice.style.label.info">
+        <source>widget_form.form.choice.style.label.info</source>
+        <target>Informatif</target>
+      </trans-unit>
+      <trans-unit id="submitClassWarningLabel" resname="widget_form.form.choice.style.label.warning">
+        <source>widget_form.form.choice.style.label.warning</source>
+        <target>Avertissement</target>
+      </trans-unit>
+      <trans-unit id="submitClassDangerLabel" resname="widget_form.form.choice.style.label.danger">
+        <source>widget_form.form.choice.style.label.danger</source>
+        <target>Danger</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/Resources/translations/victoire.es.xliff b/Resources/translations/victoire.es.xliff
index c969350..8bd59f4 100644
--- a/Resources/translations/victoire.es.xliff
+++ b/Resources/translations/victoire.es.xliff
@@ -233,6 +233,34 @@
         <source>victoire.widget-form.successCallback.assert.badChoice</source>
         <target>Por favor especificar una acción en el menú desplegable.</target>
       </trans-unit>
+      <trans-unit id="submitClassLabel" resname="widget_form.form.submitClass.label">
+        <source>widget_form.form.submitClass.label</source>
+        <target>Botón estilo :</target>
+      </trans-unit>
+      <trans-unit id="submitClassDefaultLabel" resname="widget_form.form.choice.style.label.default">
+        <source>widget_form.form.choice.style.label.default</source>
+        <target>Defecto</target>
+      </trans-unit>
+      <trans-unit id="submitClassPrimaryLabel" resname="widget_form.form.choice.style.label.primary">
+        <source>widget_form.form.choice.style.label.primary</source>
+        <target>Primario</target>
+      </trans-unit>
+      <trans-unit id="submitClassSuccessLabel" resname="widget_form.form.choice.style.label.success">
+        <source>widget_form.form.choice.style.label.success</source>
+        <target>éxito</target>
+      </trans-unit>
+      <trans-unit id="submitClassInfoLabel" resname="widget_form.form.choice.style.label.info">
+        <source>widget_form.form.choice.style.label.info</source>
+        <target>Informativo</target>
+      </trans-unit>
+      <trans-unit id="submitClassWarningLabel" resname="widget_form.form.choice.style.label.warning">
+        <source>widget_form.form.choice.style.label.warning</source>
+        <target>Advertencia</target>
+      </trans-unit>
+      <trans-unit id="submitClassDangerLabel" resname="widget_form.form.choice.style.label.danger">
+        <source>widget_form.form.choice.style.label.danger</source>
+        <target>Peligro</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/Resources/translations/victoire.fr.xliff b/Resources/translations/victoire.fr.xliff
index b98b3ce..556d2e0 100644
--- a/Resources/translations/victoire.fr.xliff
+++ b/Resources/translations/victoire.fr.xliff
@@ -261,6 +261,34 @@
         <source>widget_form.form.adminSubject.help_block</source>
         <target>Indiquez le sujet du message que le destinataire verra.</target>
       </trans-unit>
+      <trans-unit id="submitClassLabel" resname="widget_form.form.submitClass.label">
+        <source>widget_form.form.submitClass.label</source>
+        <target>Style du bouton de soumission:</target>
+      </trans-unit>
+      <trans-unit id="submitClassDefaultLabel" resname="widget_form.form.choice.style.label.default">
+        <source>widget_form.form.choice.style.label.default</source>
+        <target>Par défaut</target>
+      </trans-unit>
+      <trans-unit id="submitClassPrimaryLabel" resname="widget_form.form.choice.style.label.primary">
+        <source>widget_form.form.choice.style.label.primary</source>
+        <target>Primary</target>
+      </trans-unit>
+      <trans-unit id="submitClassSuccessLabel" resname="widget_form.form.choice.style.label.success">
+        <source>widget_form.form.choice.style.label.success</source>
+        <target>Succes</target>
+      </trans-unit>
+      <trans-unit id="submitClassInfoLabel" resname="widget_form.form.choice.style.label.info">
+        <source>widget_form.form.choice.style.label.info</source>
+        <target>Informative</target>
+      </trans-unit>
+      <trans-unit id="submitClassWarningLabel" resname="widget_form.form.choice.style.label.warning">
+        <source>widget_form.form.choice.style.label.warning</source>
+        <target>Warning</target>
+      </trans-unit>
+      <trans-unit id="submitClassDangerLabel" resname="widget_form.form.choice.style.label.danger">
+        <source>widget_form.form.choice.style.label.danger</source>
+        <target>Danger</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/Resources/views/new.html.twig b/Resources/views/new.html.twig
index 55a2e0d..a751a46 100644
--- a/Resources/views/new.html.twig
+++ b/Resources/views/new.html.twig
@@ -15,6 +15,7 @@
             </div>
             <div class="vic-col-md-6">
                 {{ form_row(form.submitIcon) }}
+                {{ form_row(form.submitClass) }}
             </div>
         </div>
         <div class="vic-form-group vic-well">
diff --git a/Resources/views/show.html.twig b/Resources/views/show.html.twig
index 12189ec..038f540 100644
--- a/Resources/views/show.html.twig
+++ b/Resources/views/show.html.twig
@@ -131,7 +131,7 @@
             {% endfor %}
         </div>
 
-        <button type="submit" class="btn btn-primary pull-right">
+        <button type="submit" class="btn btn-{{ submitClass }} pull-right">
             {% if submitIcon %}
                 <span class="fa {{ submitIcon }}"></span>&nbsp;
             {% endif %}

From d1acc6a63c004ff62170c20e5469d9dbba95c915 Mon Sep 17 00:00:00 2001
From: baptiste <baptiste@troopers.email>
Date: Wed, 22 Feb 2017 14:24:55 +0100
Subject: [PATCH 2/2] add default value in template

add comment to explain nullable
---
 Entity/WidgetForm.php          | 1 +
 Resources/views/show.html.twig | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Entity/WidgetForm.php b/Entity/WidgetForm.php
index 4e609c7..554ecd3 100644
--- a/Entity/WidgetForm.php
+++ b/Entity/WidgetForm.php
@@ -134,6 +134,7 @@ class WidgetForm extends Widget
     /**
      * @var string
      *
+     * Nullable for not break with old install but it's required in form and default value is set in template
      * @ORM\Column(name="submit_class", type="string", length=255, nullable=true)
      * @Assert\NotBlank()
      */
diff --git a/Resources/views/show.html.twig b/Resources/views/show.html.twig
index 038f540..ff054ca 100644
--- a/Resources/views/show.html.twig
+++ b/Resources/views/show.html.twig
@@ -131,7 +131,7 @@
             {% endfor %}
         </div>
 
-        <button type="submit" class="btn btn-{{ submitClass }} pull-right">
+        <button type="submit" class="btn btn-{{ submitClass|default('primary') }} pull-right">
             {% if submitIcon %}
                 <span class="fa {{ submitIcon }}"></span>&nbsp;
             {% endif %}