Bugfix/i18n

Bundle/BlogBundle/Controller/ArticleController.php

@@ -77,14 +77,14 @@ public function newBlogArticleAction(Blog $blog)
      * @param Request $request
      * @param Page    $article
      *
-     * @Route("/{id}/{newTranslation}/settings", name="victoire_blog_article_settings", defaults={"newTranslation"=false})
+     * @Route("/{id}/settings", name="victoire_blog_article_settings")
      *
      * @ParamConverter("article", class="VictoireBlogBundle:Article")
      * @return template
      */
-    public function settingsAction(Request $request, BasePage $article, $newTranslation=false)
+    public function settingsAction(Request $request, BasePage $article)
     {
-        $response = parent::settingsAction($request, $article, $newTranslation);
+        $response = parent::settingsAction($request, $article);
 
         $pattern = $article->getTemplate();
 
@@ -98,6 +98,33 @@ public function settingsAction(Request $request, BasePage $article, $newTranslat
         return new JsonResponse($response);
     }
 
+    /**
+     * Article translation
+     *
+     * @param Request $request
+     * @param Page    $article
+     *
+     * @Route("/{id}/translate", name="victoire_blog_article_translate")
+     *
+     * @ParamConverter("article", class="VictoireBlogBundle:Article")
+     * @return template
+     */
+    public function translateAction(Request $request, BasePage $article)
+    {
+        $response = parent::translateAction($request, $article);
+
+        $pattern = $article->getTemplate();
+
+        $page = $this->container->get('victoire_page.page_helper')->findPageByParameters(array(
+            'viewId' => $pattern->getId(),
+            'locale' => $request->getLocale(),
+            'entityId' => $article->getId()
+        ));
+        $response['url'] = $this->generateUrl('victoire_core_page_show', array('url' => $page->getUrl()));
+
+        return new JsonResponse($response);
+    }
+
     /**
      * Page delete
      *
@@ -126,6 +153,15 @@ protected function getPageSettingsType()
         return 'victoire_article_settings_type';
     }
 
+    /**
+     *
+     * @return string
+     */
+    protected function getPageTranslateType()
+    {
+        return 'victoire_view_translate_type';
+    }
+
     /**
      *
      * @return string

Bundle/BlogBundle/Controller/BlogController.php

@@ -27,10 +27,11 @@ class BlogController extends BasePageController
     public function __construct()
     {
         $this->routes = array(
-            'new'      => 'victoire_blog_index',
-            'show'     => 'victoire_core_page_show',
-            'settings' => 'victoire_blog_settings',
-            'delete'   => 'victoire_blog_delete',
+            'new'       => 'victoire_blog_index',
+            'show'      => 'victoire_core_page_show',
+            'settings'  => 'victoire_blog_settings',
+            'translate' => 'victoire_blog_translate',
+            'delete'    => 'victoire_blog_delete',
         );
     }
 
@@ -79,13 +80,29 @@ public function newAction($isHomepage = false)
      * @param Page    $blog
      *
      * @return template
-     * @Route("/{id}/{newTranslation}/settings", name="victoire_blog_settings", defaults={"newTranslation"=false})
+     * @Route("/{id}/settings", name="victoire_blog_settings")
      * @Template()
      * @ParamConverter("blog", class="VictoirePageBundle:BasePage")
      */
-    public function settingsAction(Request $request, BasePage $blog, $newTranslation = false)
+    public function settingsAction(Request $request, BasePage $blog)
     {
-        return new JsonResponse(parent::settingsAction($request, $blog, $newTranslation));
+        return new JsonResponse(parent::settingsAction($request, $blog));
+    }
+
+    /**
+     * Blog translation
+     *
+     * @param Request $request
+     * @param Page    $blog
+     *
+     * @return template
+     * @Route("/{id}/translate", name="victoire_blog_translate")
+     * @Template()
+     * @ParamConverter("blog", class="VictoirePageBundle:BasePage")
+     */
+    public function translateAction(Request $request, BasePage $blog)
+    {
+        return new JsonResponse(parent::translateAction($request, $blog));
     }
 
     /**
@@ -116,6 +133,15 @@ protected function getPageSettingsType()
         return 'victoire_blog_settings_type';
     }
 
+    /**
+     *
+     * @return string
+     */
+    protected function getPageTranslateType()
+    {
+        return 'victoire_view_translate_type';
+    }
+
     /**
      *
      * @return string

Bundle/BlogBundle/Form/BlogSettingsType.php

@@ -3,19 +3,25 @@
 
 use Symfony\Component\Form\FormBuilderInterface;
 use Victoire\Bundle\PageBundle\Entity\PageStatus;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Edit Blog Type
  */
 class BlogSettingsType extends BlogType
 {
 
+    public function __construct($available_locales, RequestStack $requestStack)
+    {
+        parent::__construct($available_locales, $requestStack);
+    }
+
     /**
      * define form fields
      * @param FormBuilderInterface $builder
      * @param array                $options
      */
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm( FormBuilderInterface $builder, array $options)
     {
         parent::buildForm($builder, $options);
         $builder

Bundle/BlogBundle/Listener/BlogMenuListener.php

@@ -41,6 +41,20 @@ public function addContextual($event)
                 )
         )->setLinkAttribute('data-toggle', 'vic-modal');
 
+        $mainItem->addChild('menu.blog.article.settings',
+            array(
+                'route' => 'victoire_blog_article_settings',
+                'routeParameters' => array('id' => $event->getPage()->getId())
+                )
+        )->setLinkAttribute('data-toggle', 'vic-modal');
+
+        $mainItem->addChild('menu.blog.article.translate',
+            array(
+                'route'           => 'victoire_blog_article_translate',
+                'routeParameters' => array('id' => $event->getPage()->getId())
+                )
+        )->setLinkAttribute('data-toggle', 'vic-modal');
+
         return $mainItem;
     }
 
@@ -62,6 +76,13 @@ public function addBlogContextual($event)
                 )
         )->setLinkAttribute('data-toggle', 'vic-modal');
 
+        $mainItem->addChild('menu.blog.translate',
+            array(
+                'route'           => 'victoire_blog_translate',
+                'routeParameters' => array('id' => $event->getPage()->getId())
+                )
+        )->setLinkAttribute('data-toggle', 'vic-modal');
+
         $mainItem->addChild('menu.blog.article.new',
             array(
                 'route'           => 'victoire_blog_article_new',

Bundle/BlogBundle/Resources/config/services.yml

@@ -51,6 +51,9 @@ services:
 
     victoire_blog.blog_settings.form.type:
         class: Victoire\Bundle\BlogBundle\Form\BlogSettingsType
+        arguments:
+            - "%victoire_i18n.available_locales%"
+            - "@request_stack"
         tags:
             - { name: form.type, alias: victoire_blog_settings_type }
 

Bundle/BlogBundle/Resources/views/Article/translate.html.twig

@@ -0,0 +1,31 @@
+{% extends 'VictoirePageBundle:Page:settings.html.twig' %}
+
+{% trans_default_domain "victoire" %}
+
+{% block modal_body_content %}
+
+<div class="vic-tab-content vic-modal-tab-content">
+    {# Only display this business entity property list when related to a business entity #}
+    {% if page.businessEntity is defined %}
+        {% include 'VictoireBusinessEntityBundle:BusinessProperty:list.html.twig' with { 'businessProperties': businessProperties } %}
+    {% endif %}
+
+    <div class="vic-tab-pane vic-active" id="basics">
+        <form method="POST" action="{{path('victoire_blog_article_translate', {'id':page.id} )}}">
+            <div class="vic-form-group">
+                <div class="vic-col-lg-8">
+                    {{ form_row(form.name) }}
+                    {{ form_row(form.locale) }}
+                </div>
+            </div>
+            {{ form_rest(form) }}
+        </form>
+    </div>
+</div>
+
+
+{% endblock modal_body_content %}
+
+{% block modal_header_title %}
+    {{ 'modal.form.article.translate.title'|trans({'%articleName%' : page.name}, 'victoire')|raw }}
+{% endblock modal_header_title %}

Bundle/BlogBundle/Resources/views/Blog/translate.html.twig

@@ -0,0 +1,31 @@
+{% extends 'VictoirePageBundle:Page:settings.html.twig' %}
+
+{% trans_default_domain "victoire" %}
+
+{% block modal_body_content %}
+
+<div class="vic-tab-content vic-modal-tab-content">
+    {# Only display this business entity property list when related to a business entity #}
+    {% if page.businessEntity is defined %}
+        {% include 'VictoireBusinessEntityBundle:BusinessProperty:list.html.twig' with { 'businessProperties': businessProperties } %}
+    {% endif %}
+
+    <div class="vic-tab-pane vic-active" id="basics">
+        <form method="POST" action="{{path('victoire_blog_translate', {'id':page.id} )}}">
+            <div class="vic-form-group">
+                <div class="vic-col-lg-8">
+                    {{ form_row(form.name) }}
+                    {{ form_row(form.locale)}}
+                </div>
+            </div>
+            {{ form_rest(form) }}
+        </form>
+    </div>
+</div>
+
+
+{% endblock modal_body_content %}
+
+{% block modal_header_title %}
+    {{ 'modal.form.blog.translate.title'|trans({'%blogName%' : page.name}, 'victoire')|raw }}
+{% endblock modal_header_title %}

Bundle/BusinessEntityBundle/Helper/BusinessEntityHelper.php

@@ -14,9 +14,9 @@
  */
 class BusinessEntityHelper
 {
-    protected $annotationReader = null;
-    protected $em = null;
-    protected $businessEntities = null;
+    protected $annotationReader;
+    protected $em;
+    protected $businessEntities;
 
     /**
      * Constructor
@@ -29,6 +29,7 @@ public function __construct(AnnotationReader $annotationReader, EntityManager $e
     {
         $this->annotationReader = $annotationReader;
         $this->em = $entityManager;
+        $this->businessEntities = null;
     }
 
     /**

Bundle/BusinessEntityPageBundle/Controller/BusinessEntityPagePatternController.php

@@ -315,9 +315,9 @@ private function createDeleteForm($id)
     public function listEntitiesAction(BusinessEntityPagePattern $entity)
     {
         //services
-        $businessEntityPagePatternHelper = $this->get('victoire_business_entity_page.business_entity_page_helper');
+        $bepHelper = $this->get('victoire_business_entity_page.business_entity_page_helper');
 
-        $entities = $businessEntityPagePatternHelper->getEntitiesAllowed($entity);
+        $entities = $bepHelper->getEntitiesAllowed($entity);
 
         //parameters for the view
         $parameters = array(

Bundle/BusinessEntityPageBundle/Entity/BusinessEntityPagePattern.php

@@ -23,9 +23,9 @@ class BusinessEntityPagePattern extends Template implements WebViewInterface
     /**
      * @var Collection
      *
-     * @ORM\OneToMany(targetEntity="\Victoire\Bundle\BusinessEntityPageBundle\Entity\BusinessEntityPage", mappedBy="pattern")
+     * @ORM\OneToMany(targetEntity="\Victoire\Bundle\BusinessEntityPageBundle\Entity\BusinessEntityPage", mappedBy="template")
      */
-    protected $instances;
+    protected $inheritors;
 
     /**
      * contruct
@@ -37,8 +37,8 @@ public function __construct()
         $this->status = PageStatus::PUBLISHED;
     }
 
-    public function getInstances() { return $this->instances; }
-    public function setInstances($instances) { $this->instances = $instances; return $this; }
+    public function getInstances() { return $this->inheritors; }
+    public function setInstances($inheritors) { $this->inheritors = $inheritors; return $this; }
     public function getLayout() { return $this->getTemplate()->getLayout(); }
 
 }

Bundle/BusinessEntityPageBundle/Helper/BusinessEntityPageHelper.php

@@ -118,7 +118,7 @@ public function generateEntityPageFromPattern(BusinessEntityPagePattern $bepPatt
         $accessor = PropertyAccess::createPropertyAccessor();
 
         foreach ($patternProperties as $property) {
-            if (!in_array($property->getName(), array('id', 'slug', 'widgetMap', 'slots')) && !$property->isStatic()) {
+            if (!in_array($property->getName(), array('id', 'slug', 'widgetMap', 'slots', 'seo')) && !$property->isStatic()) {
                 $value = $accessor->getValue($bepPattern, $property->getName());
                 $setMethod = 'set'.ucfirst($property->getName());
                 if (method_exists($page, $setMethod)) {

Bundle/BusinessEntityPageBundle/Resources/config/services.yml

@@ -3,6 +3,7 @@ services:
         class: Victoire\Bundle\BusinessEntityPageBundle\Form\BusinessEntityPagePatternType
         arguments:
             - "%victoire_i18n.available_locales%"
+            - "@request_stack"
         tags:
             - { name: form.type, alias: victoire_business_entity_page_type }