diff --git a/Controller/EventTypeController.php b/Controller/EventTypeController.php
index d1f98f45a..e151f04cb 100644
--- a/Controller/EventTypeController.php
+++ b/Controller/EventTypeController.php
@@ -46,7 +46,7 @@ class EventTypeController extends AbstractController
$em->persist($entity);
$em->flush();
- return $this->redirect($this->generateUrl('chill_eventtype_admin_show',
+ return $this->redirect($this->generateUrl('chill_eventtype_admin',
array('id' => $entity->getId())));
}
@@ -176,7 +176,7 @@ class EventTypeController extends AbstractController
if ($editForm->isValid()) {
$em->flush();
- return $this->redirect($this->generateUrl('chill_eventtype_admin_edit',
+ return $this->redirect($this->generateUrl('chill_eventtype_admin',
array('id' => $id)));
}
diff --git a/Controller/RoleController.php b/Controller/RoleController.php
index 468df32f2..103729934 100644
--- a/Controller/RoleController.php
+++ b/Controller/RoleController.php
@@ -45,7 +45,7 @@ class RoleController extends AbstractController
$em->persist($entity);
$em->flush();
- return $this->redirect($this->generateUrl('chill_event_admin_role_show',
+ return $this->redirect($this->generateUrl('chill_event_admin_role',
array('id' => $entity->getId())));
}
@@ -175,7 +175,7 @@ class RoleController extends AbstractController
if ($editForm->isValid()) {
$em->flush();
- return $this->redirect($this->generateUrl('chill_event_admin_role_edit',
+ return $this->redirect($this->generateUrl('chill_event_admin_role',
array('id' => $id)));
}
diff --git a/Controller/StatusController.php b/Controller/StatusController.php
index be20fbf49..e5861aa80 100644
--- a/Controller/StatusController.php
+++ b/Controller/StatusController.php
@@ -46,7 +46,7 @@ class StatusController extends AbstractController
$em->persist($entity);
$em->flush();
- return $this->redirect($this->generateUrl('chill_event_admin_status_show', array('id' => $entity->getId())));
+ return $this->redirect($this->generateUrl('chill_event_admin_status', array('id' => $entity->getId())));
}
return $this->render('ChillEventBundle:Status:new.html.twig', array(
@@ -174,7 +174,7 @@ class StatusController extends AbstractController
if ($editForm->isValid()) {
$em->flush();
- return $this->redirect($this->generateUrl('chill_event_admin_status_edit', array('id' => $id)));
+ return $this->redirect($this->generateUrl('chill_event_admin_status', array('id' => $id)));
}
return $this->render('ChillEventBundle:Status:edit.html.twig', array(
diff --git a/Resources/views/Admin/menu.html.twig b/Resources/views/Admin/menu.html.twig
index ca54bbc02..2e804277d 100644
--- a/Resources/views/Admin/menu.html.twig
+++ b/Resources/views/Admin/menu.html.twig
@@ -17,7 +17,5 @@
#}
{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}
- {{ 'Events configuration menu'|trans }}
-{% endblock %}
+{% block v_menu_title %}{{ 'Events configuration menu'|trans }}{% endblock %}
diff --git a/Resources/views/EventType/edit.html.twig b/Resources/views/EventType/edit.html.twig
index c6c24b052..2142998f5 100644
--- a/Resources/views/EventType/edit.html.twig
+++ b/Resources/views/EventType/edit.html.twig
@@ -4,14 +4,18 @@
{{ 'EventType edit'|trans }}
- {{ form(edit_form) }}
+ {{ form_start(edit_form) }}
+ {{ form_row(edit_form.name) }}
+ {{ form_row(edit_form.active) }}
-
+
+
+ {{ form_end(edit_form) }}
{% endblock %}
diff --git a/Resources/views/EventType/index.html.twig b/Resources/views/EventType/index.html.twig
index 959355878..40fed7220 100644
--- a/Resources/views/EventType/index.html.twig
+++ b/Resources/views/EventType/index.html.twig
@@ -7,10 +7,10 @@
- Id |
- Label |
- Active |
- Actions |
+ {{ 'Id'|trans }} |
+ {{ 'Label'|trans }} |
+ {{ 'Active'|trans }} |
+ {{ 'Actions'|trans }} |
@@ -20,12 +20,12 @@
{{ entity.name|localize_translatable_string }} |
{{ entity.active }} |
- |
@@ -34,11 +34,9 @@
-
+
{% endblock %}
diff --git a/Resources/views/EventType/new.html.twig b/Resources/views/EventType/new.html.twig
index 7bf1e07a5..b4aa07626 100644
--- a/Resources/views/EventType/new.html.twig
+++ b/Resources/views/EventType/new.html.twig
@@ -4,13 +4,18 @@
{{ 'EventType creation'|trans }}
- {{ form(form) }}
+ {{ form_start(form) }}
+ {{ form_row(form.name) }}
+ {{ form_row(form.active) }}
-
+
+
+ {{ form_end(form) }}
{% endblock %}
diff --git a/Resources/views/EventType/show.html.twig b/Resources/views/EventType/show.html.twig
index cd73d4833..56edf0a19 100644
--- a/Resources/views/EventType/show.html.twig
+++ b/Resources/views/EventType/show.html.twig
@@ -7,31 +7,31 @@
- Id |
+ {{ 'Id'|trans }} |
{{ entity.id }} |
- Name |
+ {{ 'Name'|trans }} |
{{ entity.name|localize_translatable_string }} |
- Active |
+ {{ 'Active'|trans }} |
{{ entity.active }} |
-
+
{% endblock %}
diff --git a/Resources/views/Role/edit.html.twig b/Resources/views/Role/edit.html.twig
index d34538c89..0df6e12de 100644
--- a/Resources/views/Role/edit.html.twig
+++ b/Resources/views/Role/edit.html.twig
@@ -1,17 +1,21 @@
{% extends "ChillEventBundle:Admin:layout.html.twig" %}
{% block admin_content -%}
-
{{ 'Role edit'|trans }}
- {{ form(edit_form) }}
+ {{ form_start(edit_form) }}
+ {{ form_row(edit_form.name) }}
+ {{ form_row(edit_form.type) }}
+ {{ form_row(edit_form.active) }}
-
+
+
+ {{ form_end(edit_form) }}
{% endblock %}
diff --git a/Resources/views/Role/index.html.twig b/Resources/views/Role/index.html.twig
index 3cc10167b..f6b071924 100644
--- a/Resources/views/Role/index.html.twig
+++ b/Resources/views/Role/index.html.twig
@@ -7,11 +7,11 @@
- Id |
- Name |
- Type |
- Active |
- Actions |
+ {{ 'Id'|trans }} |
+ {{ 'Role'|trans }} |
+ {{ 'Type'|trans }} |
+ {{ 'Active'|trans }} |
+ {{ 'Actions'|trans }} |
@@ -22,25 +22,23 @@
{{ entity.type.name|localize_translatable_string }} |
{{ entity.active }} |
-
+
|
{% endfor %}
-
+
{% endblock %}
diff --git a/Resources/views/Role/new.html.twig b/Resources/views/Role/new.html.twig
index 7b58f7c85..1bc923f09 100644
--- a/Resources/views/Role/new.html.twig
+++ b/Resources/views/Role/new.html.twig
@@ -4,13 +4,19 @@
{{ 'Role creation'|trans }}
- {{ form(form) }}
+ {{ form_start(form) }}
+ {{ form_row(form.name) }}
+ {{ form_row(form.type) }}
+ {{ form_row(form.active) }}
-
+
+
+ {{ form_end(form) }}
{% endblock %}
diff --git a/Resources/views/Role/show.html.twig b/Resources/views/Role/show.html.twig
index bb149bc29..5d24ef14f 100644
--- a/Resources/views/Role/show.html.twig
+++ b/Resources/views/Role/show.html.twig
@@ -7,31 +7,35 @@
- Id |
+ {{ 'Id'|trans }} |
{{ entity.id }} |
- Name |
+ {{ 'Name'|trans }} |
{{ entity.name|localize_translatable_string }} |
- Active |
+ {{ 'Type'|trans }} |
+ {{ entity.type.name|localize_translatable_string }} |
+
+
+ {{ 'Active'|trans }} |
{{ entity.active }} |
-
+
{% endblock %}
diff --git a/Resources/views/Status/edit.html.twig b/Resources/views/Status/edit.html.twig
index 1e80e1115..449ddcb1f 100644
--- a/Resources/views/Status/edit.html.twig
+++ b/Resources/views/Status/edit.html.twig
@@ -4,14 +4,19 @@
{{ 'Status edit'|trans }}
- {{ form(edit_form) }}
+ {{ form_start(edit_form) }}
+ {{ form_row(edit_form.name) }}
+ {{ form_row(edit_form.type) }}
+ {{ form_row(edit_form.active) }}
-
+
+
+ {{ form_end(edit_form) }}
{% endblock %}
diff --git a/Resources/views/Status/index.html.twig b/Resources/views/Status/index.html.twig
index e506a7dd2..8dec02493 100644
--- a/Resources/views/Status/index.html.twig
+++ b/Resources/views/Status/index.html.twig
@@ -7,11 +7,11 @@
- Id |
- Name |
- Type |
- Active |
- Actions |
+ {{ 'Id'|trans }} |
+ {{ 'Statut'|trans }} |
+ {{ 'Type'|trans }} |
+ {{ 'Active'|trans }} |
+ {{ 'Actions'|trans }} |
@@ -22,12 +22,12 @@
{{ entity.type.name|localize_translatable_string }} |
{{ entity.active }} |
- |
@@ -36,11 +36,9 @@
-
+
{% endblock %}
diff --git a/Resources/views/Status/new.html.twig b/Resources/views/Status/new.html.twig
index 307963b9e..f88738d23 100644
--- a/Resources/views/Status/new.html.twig
+++ b/Resources/views/Status/new.html.twig
@@ -4,13 +4,19 @@
{{ 'Status creation'|trans }}
- {{ form(form) }}
+ {{ form_start(form) }}
+ {{ form_row(form.name) }}
+ {{ form_row(form.type) }}
+ {{ form_row(form.active) }}
-
+
+
+ {{ form_end(form) }}
{% endblock %}
diff --git a/Resources/views/Status/show.html.twig b/Resources/views/Status/show.html.twig
index 52931bdd8..e79de3b1c 100644
--- a/Resources/views/Status/show.html.twig
+++ b/Resources/views/Status/show.html.twig
@@ -7,31 +7,35 @@
- Id |
+ {{ 'Id'|trans }} |
{{ entity.id }} |
- Name |
+ {{ 'Status'|trans }} |
{{ entity.name|localize_translatable_string }} |
- Active |
+ {{ 'Type'|trans }} |
+ {{ entity.type.name|localize_translatable_string }} |
+
+
+ {{ 'Active'|trans }} |
{{ entity.active }} |
-
+
{% endblock %}
diff --git a/translations/messages.fr.yml b/translations/messages.fr.yml
index cd37f0163..45248c4df 100644
--- a/translations/messages.fr.yml
+++ b/translations/messages.fr.yml
@@ -104,4 +104,8 @@ Role edit: Modifier un rôle
'': ''
xlsx: xlsx
ods: ods
-csv: csv
\ No newline at end of file
+csv: csv
+
+Create a new role: Créer un nouveau rôle
+Create a new type: Créer un nouveau type
+Create a new status: Créer un nouveau statut
\ No newline at end of file