Merge remote-tracking branch 'origin/master'

Resources/config/routing.yml

@@ -1,6 +1,6 @@
 chill_event_event:
     resource: "@ChillEventBundle/Resources/config/routing/event.yml"
-    prefix:   /event
+    prefix:    /{_locale}/event/event
 
 chill_event_fr_admin_event_status:
     resource: "@ChillEventBundle/Resources/config/routing/status.yml"
@@ -13,4 +13,3 @@ chill_event_admin_role:
 chill_event_admin_event_type:
     resource: "@ChillEventBundle/Resources/config/routing/eventtype.yml"
     prefix:   /{_locale}/admin/event/event_type
-

Resources/config/services/forms.yml

@@ -0,0 +1,7 @@
+services:
+    chill_event.form.event_type_type:
+        class: Chill\EventBundle\Form\Type\TranslatableEventType
+        arguments:
+            - "@chill.main.helper.translatable_string"
+        tags:
+            - { name: form.type }

Resources/views/Event/new.html.twig

@@ -1,6 +1,6 @@
-{% extends '::base.html.twig' %}
+{% extends 'ChillEventBundle::layout.html.twig' %}
 
-{% block body -%}
+{% block event_content -%}
     <h1>Event creation</h1>
 
     {{ form(form) }}