Merge pull request #2531 from psyray/enhance-content-bundle

[ContentBundle] Add publish feature and fix some links
Sylius · Mar 3, 2015 · 893d625 · 893d625
2 parents 05449b3 + 2e8fb5c
commit 893d625
Show file tree

Hide file tree

Showing 51 changed files with 504 additions and 98 deletions.
diff --git a/src/Sylius/Bundle/ContentBundle/Form/Type/ActionBlockType.php b/src/Sylius/Bundle/ContentBundle/Form/Type/ActionBlockType.php
@@ -33,6 +33,19 @@ public function buildForm(FormBuilderInterface $builder, array $options = array(
             ->add('actionName', 'text', array(
                 'label' => 'sylius.form.action_block.action_name',
             ))
+            ->add('publishable', null, array(
+                'label' => 'sylius.form.action_block.publishable'
+                ))
+            ->add('publishStartDate', 'datetime', array(
+                'label' => 'sylius.form.action_block.publish_start_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
+            ->add('publishEndDate', 'datetime', array(
+                'label' => 'sylius.form.action_block.publish_end_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
         ;
     }
 

diff --git a/src/Sylius/Bundle/ContentBundle/Form/Type/ImagineBlockType.php b/src/Sylius/Bundle/ContentBundle/Form/Type/ImagineBlockType.php
@@ -27,16 +27,31 @@ class ImagineBlockType extends AbstractResourceType
     public function buildForm(FormBuilderInterface $builder, array $options = array())
     {
         $builder
+            ->add('publishable', null, array(
+                'label' => 'sylius.form.imagine_block.publishable'
+                ))
+            ->add('publishStartDate', 'datetime', array(
+                'label' => 'sylius.form.imagine_block.publish_start_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
+            ->add('publishEndDate', 'datetime', array(
+                'label' => 'sylius.form.imagine_block.publish_end_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
             ->add('parentDocument', null, array(
                 'label' => 'sylius.form.imagine_block.parent'
             ))
             ->add('name', 'text', array(
                 'label' => 'sylius.form.imagine_block.internal_name'
             ))
             ->add('label', 'text', array(
+                'label' => 'sylius.form.imagine_block.label',
                 'required' => false
             ))
             ->add('linkUrl', 'text', array(
+                'label' => 'sylius.form.imagine_block.link_url',
                 'required' => false
             ))
             ->add('filter', 'choice', array(
@@ -45,9 +60,12 @@ public function buildForm(FormBuilderInterface $builder, array $options = array(
                         'slideshow_medium' => 'sylius.form.imagine_block.slideshow_medium',
                         'slideshow_large'  => 'sylius.form.imagine_block.slideshow_large',
                 ),
-                'required' => false
+                'label' => 'sylius.form.imagine_block.filter',
+                'required' => false,
             ))
             ->add('image', 'cmf_media_image', array(
+                'label' => 'sylius.form.imagine_block.image',
+                'attr' => array('class' => 'imagine-thumbnail'),
                 'required' => false
             ))
         ;

diff --git a/src/Sylius/Bundle/ContentBundle/Form/Type/MenuBlockType.php b/src/Sylius/Bundle/ContentBundle/Form/Type/MenuBlockType.php
@@ -37,6 +37,19 @@ public function buildForm(FormBuilderInterface $builder, array $options = array(
                 'required' => false,
                 'label'    => 'sylius.form.menu_block.body',
             ))
+            ->add('publishable', null, array(
+                'label' => 'sylius.form.menu_block.publishable'
+                ))
+            ->add('publishStartDate', 'datetime', array(
+                'label' => 'sylius.form.menu_block.publish_start_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
+            ->add('publishEndDate', 'datetime', array(
+                'label' => 'sylius.form.menu_block.publish_end_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
         ;
 
     }

diff --git a/src/Sylius/Bundle/ContentBundle/Form/Type/MenuNodeType.php b/src/Sylius/Bundle/ContentBundle/Form/Type/MenuNodeType.php
@@ -52,17 +52,17 @@ public function buildForm(FormBuilderInterface $builder, array $options = array(
                 'label'    => 'sylius.form.menu_node_block.link_type',
             ))
             ->add('publishable', null, array(
-                'required' => false,
-                'label'    => 'sylius.form.menu_node_block.publishable',
-            ))
-            ->add('publishStartDate', 'text', array(
-                'attr'      => array('class'=> 'datepicker'),
-                'required'  => false,
-                'label'     => 'sylius.form.menu_node_block.publish_start_date',
+                'label' => 'sylius.form.menu_node_block.publishable'
+                ))
+            ->add('publishStartDate', 'datetime', array(
+                'label' => 'sylius.form.menu_node_block.publish_start_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
             ))
-            ->add('publishEndDate', 'text', array(
-                'required' => false,
-                'label'    => 'sylius.form.menu_node_block.publish_end_date',
+            ->add('publishEndDate', 'datetime', array(
+                'label' => 'sylius.form.menu_node_block.publish_end_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
             ))
             ->add('route', null, array(
                 'label' => 'sylius.form.menu_node_block.route'

diff --git a/src/Sylius/Bundle/ContentBundle/Form/Type/MenuType.php b/src/Sylius/Bundle/ContentBundle/Form/Type/MenuType.php
@@ -64,6 +64,19 @@ public function buildForm(FormBuilderInterface $builder, array $options = array(
                 'required' => false,
                 'label' => 'sylius.form.menu.display_children'
             ))
+            ->add('publishable', null, array(
+                'label' => 'sylius.form.menu.publishable'
+                ))
+            ->add('publishStartDate', 'datetime', array(
+                'label' => 'sylius.form.menu.publish_start_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
+            ->add('publishEndDate', 'datetime', array(
+                'label' => 'sylius.form.menu.publish_end_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
         ;
 
     }

diff --git a/src/Sylius/Bundle/ContentBundle/Form/Type/ReferenceBlockType.php b/src/Sylius/Bundle/ContentBundle/Form/Type/ReferenceBlockType.php
@@ -37,6 +37,19 @@ public function buildForm(FormBuilderInterface $builder, array $options = array(
                 'required' => false,
                 'label'    => 'sylius.form.reference_block.body',
             ))
+            ->add('publishable', null, array(
+                'label' => 'sylius.form.reference_block.publishable'
+                ))
+            ->add('publishStartDate', 'datetime', array(
+                'label' => 'sylius.form.reference_block.publish_start_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
+            ->add('publishEndDate', 'datetime', array(
+                'label' => 'sylius.form.reference_block.publish_end_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
         ;
 
     }

diff --git a/src/Sylius/Bundle/ContentBundle/Form/Type/SimpleBlockType.php b/src/Sylius/Bundle/ContentBundle/Form/Type/SimpleBlockType.php
@@ -40,6 +40,19 @@ public function buildForm(FormBuilderInterface $builder, array $options = array(
                 'required' => false,
                 'label'    => 'sylius.form.simple_block.body',
             ))
+            ->add('publishable', null, array(
+                'label' => 'sylius.form.simple_block.publishable'
+                ))
+            ->add('publishStartDate', 'datetime', array(
+                'label' => 'sylius.form.simple_block.publish_start_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
+            ->add('publishEndDate', 'datetime', array(
+                'label' => 'sylius.form.simple_block.publish_end_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
         ;
 
     }

diff --git a/src/Sylius/Bundle/ContentBundle/Form/Type/SlideshowBlockType.php b/src/Sylius/Bundle/ContentBundle/Form/Type/SlideshowBlockType.php
@@ -42,7 +42,20 @@ public function buildForm(FormBuilderInterface $builder, array $options = array(
                 'allow_delete' => true,
                 'by_reference' => false,
                 'label' => false,
-                'button_add_label' => 'sylius.form.slideshow.add_slide',
+                'button_add_label' => 'sylius.form.slideshow_block.add_slide',
+            ))
+            ->add('publishable', null, array(
+                'label' => 'sylius.form.slideshow_block.publishable'
+                ))
+            ->add('publishStartDate', 'datetime', array(
+                'label' => 'sylius.form.slideshow_block.publish_start_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
+            ->add('publishEndDate', 'datetime', array(
+                'label' => 'sylius.form.slideshow_block.publish_end_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
             ))
         ;
     }

diff --git a/src/Sylius/Bundle/ContentBundle/Form/Type/StaticContentType.php b/src/Sylius/Bundle/ContentBundle/Form/Type/StaticContentType.php
@@ -28,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options = array(
     {
         $builder
             ->add('publishable', null, array(
-                    'label' => 'sylius.form.static_content.publishable'
+                'label' => 'sylius.form.static_content.publishable'
                 ))
             ->add('id', 'text', array(
                 'label' => 'sylius.form.static_content.id'
@@ -63,15 +63,17 @@ public function buildForm(FormBuilderInterface $builder, array $options = array(
                 'required' => false,
                 'label'    => 'sylius.form.static_content.body',
             ))
-            ->add('publishStartDate', null, array(
-                'required' => false,
-                'label'    => 'sylius.form.static_content.publish_start_date',
+            ->add('publishStartDate', 'datetime', array(
+                'label' => 'sylius.form.static_content.publish_start_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
             ))
-            ->add('publishEndDate', null, array(
-                'required' => false,
-                'label'    => 'sylius.form.static_content.publish_end_date',
+            ->add('publishEndDate', 'datetime', array(
+                'label' => 'sylius.form.static_content.publish_end_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
             ))
-            ;
+        ;
 
     }
 

diff --git a/src/Sylius/Bundle/ContentBundle/Form/Type/StringBlockType.php b/src/Sylius/Bundle/ContentBundle/Form/Type/StringBlockType.php
@@ -40,6 +40,19 @@ public function buildForm(FormBuilderInterface $builder, array $options = array(
                 'required' => false,
                 'label'    => 'sylius.form.string_block.body',
             ))
+            ->add('publishable', null, array(
+                'label' => 'sylius.form.string_block.publishable'
+                ))
+            ->add('publishStartDate', 'datetime', array(
+                'label' => 'sylius.form.string_block.publish_start_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
+            ->add('publishEndDate', 'datetime', array(
+                'label' => 'sylius.form.string_block.publish_end_date',
+                'empty_value' =>/** @Ignore */ array('year' => '-', 'month' => '-', 'day' => '-'),
+                'time_widget' => 'text',
+            ))
         ;
 
     }

diff --git a/src/Sylius/Bundle/ContentBundle/Resources/config/validation.xml b/src/Sylius/Bundle/ContentBundle/Resources/config/validation.xml
@@ -28,6 +28,18 @@
                 <option name="groups">sylius</option>
             </constraint>
         </property>
+        <property name="publishStartDate">
+            <constraint name="DateTime">
+                <option name="message">sylius.menu.start_date.invalid_date</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+        <property name="publishEndDate">
+            <constraint name="DateTime">
+                <option name="message">sylius.menu.end_date.invalid_date</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
     </class>
 
     <class name="Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode">
@@ -43,6 +55,18 @@
                 <option name="groups">sylius</option>
             </constraint>
         </property>
+        <property name="publishStartDate">
+            <constraint name="DateTime">
+                <option name="message">sylius.menu_node.start_date.invalid_date</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+        <property name="publishEndDate">
+            <constraint name="DateTime">
+                <option name="message">sylius.menu_node.end_date.invalid_date</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
     </class>
 
     <class name="Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route">
@@ -73,6 +97,18 @@
                 <option name="groups">sylius</option>
             </constraint>
         </property>
+        <property name="publishStartDate">
+            <constraint name="DateTime">
+                <option name="message">sylius.slideshow_block.start_date.invalid_date</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+        <property name="publishEndDate">
+            <constraint name="DateTime">
+                <option name="message">sylius.slideshow_block.end_date.invalid_date</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
     </class>
 
     <class name="Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock">
@@ -94,6 +130,18 @@
                 <option name="groups">sylius</option>
             </constraint>
         </property>
+        <property name="publishStartDate">
+            <constraint name="DateTime">
+                <option name="message">sylius.simple_block.start_date.invalid_date</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+        <property name="publishEndDate">
+            <constraint name="DateTime">
+                <option name="message">sylius.simple_block.end_date.invalid_date</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
     </class>
 
     <class name="Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent">
@@ -115,5 +163,17 @@
                 <option name="groups">sylius</option>
             </constraint>
         </property>
+        <property name="publishStartDate">
+            <constraint name="DateTime">
+                <option name="message">sylius.static_content.start_date.invalid_date</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+        <property name="publishEndDate">
+            <constraint name="DateTime">
+                <option name="message">sylius.static_content.end_date.invalid_date</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
     </class>
 </constraint-mapping>