Transformed the macro() of the Flash messages into a regular include(…

…) template
symfony · Aug 31, 2015 · d01311b · d01311b
1 parent f481eef
commit d01311b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 39 deletions.
diff --git a/app/Resources/views/admin/blog/edit.html.twig b/app/Resources/views/admin/blog/edit.html.twig
@@ -1,17 +1,11 @@
 {% extends 'admin/layout.html.twig' %}
 
-{#
-    Import macros used for displaying flash messages.
-    See http://twig.sensiolabs.org/doc/tags/import.html
-#}
-{% import 'helper/messages.html.twig' as helper %}
-
 {% block body_id 'admin_post_edit' %}
 
 {% block main %}
     <h1>{{ 'title.edit_post'|trans({'%id%': post.id}) }}</h1>
 
-    {{ helper.render_flash_messages() }}
+    {{ include('default/_flash_messages.html.twig') }}
 
     {{ include('admin/blog/_form.html.twig', {
         form: edit_form,

diff --git a/app/Resources/views/admin/blog/index.html.twig b/app/Resources/views/admin/blog/index.html.twig
@@ -1,17 +1,11 @@
 {% extends 'admin/layout.html.twig' %}
 
-{#
-    Import macros used for displaying flash messages.
-    See http://twig.sensiolabs.org/doc/tags/import.html
-#}
-{% import 'helper/messages.html.twig' as helper %}
-
 {% block body_id 'admin_post_index' %}
 
 {% block main %}
     <h1>{{ 'title.post_list'|trans }}</h1>
 
-    {{ helper.render_flash_messages() }}
+    {{ include('default/_flash_messages.html.twig') }}
 
     <table class="table table-striped">
         <thead>

diff --git a/app/Resources/views/default/_flash_messages.html.twig b/app/Resources/views/default/_flash_messages.html.twig
@@ -0,0 +1,12 @@
+<div class="messages">
+    {% for message in app.session.flashBag.get('success') %}
+        {# Bootstrap alert, see http://getbootstrap.com/components/#alerts #}
+        <div class="alert alert-dismissible alert-success" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+            </button>
+
+            {{ message|trans }}
+        </div>
+    {% endfor %}
+</div>
diff --git a/app/Resources/views/helper/messages.html.twig b/app/Resources/views/helper/messages.html.twig