Skip to content

Commit

Permalink
feature #430 Added support for flash messages (gabiudrescu, javieregu…
Browse files Browse the repository at this point in the history
…iluz)

This PR was merged into the master branch.

Discussion
----------

Added support for flash messages

This finishes #409.

Although EasyAdmin won't display flash messages, it now supports this feature to simplify the work of the developers who use these messages.

This adds a new template called `flash_messages` which can be overridden following the usual mechanism available for the other templates. The HTML markup of the default template is enough to display the messages correctly, being one or several:

![one-flash-message](https://cloud.githubusercontent.com/assets/73419/9643111/36d2f1ca-51c0-11e5-8208-38b141291237.png)

![several-flash-messages](https://cloud.githubusercontent.com/assets/73419/9643112/379a69ee-51c0-11e5-8560-d5bf9431d534.png)

Commits
-------

8b8186e Deduplicate code
9fb4c04 Define the flash_messages block in the containing templates
a92239a Added support for Flash Messages
24d7db2 adding flash notification support
  • Loading branch information
javiereguiluz committed Sep 3, 2015
2 parents 9d6be7e + 8b8186e commit ef5514e
Show file tree
Hide file tree
Showing 120 changed files with 150 additions and 0 deletions.
1 change: 1 addition & 0 deletions DependencyInjection/Configuration.php
Expand Up @@ -277,6 +277,7 @@ private function addDesignSection(ArrayNodeDefinition $rootNode)
->scalarNode('new')->info('Used to render the page where new entities are created')->end()
->scalarNode('show')->info('Used to render the contents stored by a given entity')->end()
->scalarNode('form')->info('Used to render the form displayed in the new and edit pages')->end()
->scalarNode('flash_messages')->info('Used to render the notification area were flash messages are displayed')->end()
->scalarNode('paginator')->info('Used to render the paginator in the list page')->end()
->scalarNode('field_array')->info('Used to render array field types')->end()
->scalarNode('field_association')->info('Used to render fields that store Doctrine associations')->end()
Expand Down
1 change: 1 addition & 0 deletions DependencyInjection/EasyAdminExtension.php
Expand Up @@ -35,6 +35,7 @@ class EasyAdminExtension extends Extension
'new' => '@EasyAdmin/default/new.html.twig',
'show' => '@EasyAdmin/default/show.html.twig',
'form' => '@EasyAdmin/default/form.html.twig',
'flash_messages' => '@EasyAdmin/default/flash_messages.html.twig',
'paginator' => '@EasyAdmin/default/paginator.html.twig',
'field_array' => '@EasyAdmin/default/field_array.html.twig',
'field_association' => '@EasyAdmin/default/field_association.html.twig',
Expand Down
11 changes: 11 additions & 0 deletions Resources/views/default/flash_messages.html.twig
@@ -0,0 +1,11 @@
{% if app.session.started %}
<div id="flash-messages">
{% for label, messages in app.session.flashbag.all %}
{% for message in messages %}
<div class="alert alert-{{ label }}">
{{ message }}
</div>
{% endfor %}
{% endfor %}
</div>
{% endif %}
4 changes: 4 additions & 0 deletions Resources/views/default/layout.html.twig
Expand Up @@ -83,6 +83,10 @@

<div id="content" class="col-lg-10 col-lg-offset-2">
{% block content %}
{% block flash_messages %}
{{ include(_entity_config.templates.flash_messages) }}
{% endblock flash_messages %}

<div class="row">
<div id="content-header" class="col-sm-12">
{% block content_header %}
Expand Down
2 changes: 2 additions & 0 deletions Resources/views/default/list.html.twig
Expand Up @@ -36,6 +36,8 @@

{% set _request_parameters = _request_parameters|merge({ referer: path('admin', _request_parameters)|url_encode }) %}

{% block flash_messages %}{{ parent() }}{% endblock flash_messages %}

<div class="row">
<div id="content-header" class="col-sm-12">
{% block content_header %}
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down Expand Up @@ -207,6 +208,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down Expand Up @@ -207,6 +208,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down Expand Up @@ -322,6 +324,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down Expand Up @@ -207,6 +208,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down Expand Up @@ -207,6 +208,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down Expand Up @@ -207,6 +208,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down Expand Up @@ -207,6 +208,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down Expand Up @@ -207,6 +208,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down Expand Up @@ -207,6 +208,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down
Expand Up @@ -92,6 +92,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down Expand Up @@ -207,6 +208,7 @@ easy_admin:
new: '@EasyAdmin/default/new.html.twig'
show: '@EasyAdmin/default/show.html.twig'
form: '@EasyAdmin/default/form.html.twig'
flash_messages: '@EasyAdmin/default/flash_messages.html.twig'
paginator: '@EasyAdmin/default/paginator.html.twig'
field_array: '@EasyAdmin/default/field_array.html.twig'
field_association: '@EasyAdmin/default/field_association.html.twig'
Expand Down

0 comments on commit ef5514e

Please sign in to comment.