From: Nicolas LÅ“uillet Date: Thu, 8 Dec 2016 15:42:48 +0000 (+0100) Subject: Moved total messages from import X-Git-Tag: 2.2.0~3^2~28^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=be2c55de4cbc504677f7e4bbdd1d055697358957;p=github%2Fwallabag%2Fwallabag.git Moved total messages from import --- diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index e5bfc62c..131fbf26 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -19,8 +19,6 @@ Materialize.toast('{{ flashMessage|trans }}', 4000); {% endfor %} - - {{ render(controller("WallabagImportBundle:Import:checkQueue")) }} {% endblock %} {% block menu %} diff --git a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig index b1ec40a6..b79a1470 100644 --- a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig +++ b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig @@ -2,6 +2,12 @@ {% block title %}{{ 'import.page_title'|trans }}{% endblock %} +{% block messages %} + {{ render(controller("WallabagImportBundle:Import:checkQueue")) }} + + {{ parent() }} +{% endblock %} + {% block content %}