]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Moved total messages from import 2691/head
authorNicolas Lœuillet <nicolas@loeuillet.org>
Thu, 8 Dec 2016 15:42:48 +0000 (16:42 +0100)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Thu, 8 Dec 2016 15:46:17 +0000 (16:46 +0100)
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig

index e5bfc62c734b336ceefb1c0e743b5409eb29cbf9..131fbf265ffb32965b775b3ff65f9482603a3711 100644 (file)
@@ -19,8 +19,6 @@
             Materialize.toast('{{ flashMessage|trans }}', 4000);
         </script>
     {% endfor %}
-
-    {{ render(controller("WallabagImportBundle:Import:checkQueue")) }}
 {% endblock %}
 
 {% block menu %}
index b1ec40a6b91376cbd17b706b02dbb6c38f28c1e7..b79a1470b33fb758c5d2c0087c922d84229f75ba 100644 (file)
@@ -2,6 +2,12 @@
 
 {% block title %}{{ 'import.page_title'|trans }}{% endblock %}
 
+{% block messages %}
+    {{ render(controller("WallabagImportBundle:Import:checkQueue")) }}
+
+    {{ parent() }}
+{% endblock %}
+
 {% block content %}
 <div class="row">
     <div class="col s12">