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 @@ - - - - + + + + @@ -20,12 +20,12 @@ @@ -34,11 +34,9 @@
IdLabelActiveActions{{ 'Id'|trans }}{{ 'Label'|trans }}{{ 'Active'|trans }}{{ 'Actions'|trans }}
{{ entity.name|localize_translatable_string }} {{ entity.active }} -
-