diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-12-08 19:02:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-08 19:02:30 +0100 |
commit | 2c1eed8051160499d40ed033c83dd003c81b371e (patch) | |
tree | 1fa4ab64c083a028be92d4ea97e45ef4f06192ec /src | |
parent | edb9feb472e6bfe3678a944360eaecb7e6c9e567 (diff) | |
parent | be2c55de4cbc504677f7e4bbdd1d055697358957 (diff) | |
download | wallabag-2c1eed8051160499d40ed033c83dd003c81b371e.tar.gz wallabag-2c1eed8051160499d40ed033c83dd003c81b371e.tar.zst wallabag-2c1eed8051160499d40ed033c83dd003c81b371e.zip |
Merge pull request #2691 from wallabag/moved-total-import-notif
Moved total messages from import
Diffstat (limited to 'src')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | 2 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig | 6 |
2 files changed, 6 insertions, 2 deletions
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 @@ | |||
19 | Materialize.toast('{{ flashMessage|trans }}', 4000); | 19 | Materialize.toast('{{ flashMessage|trans }}', 4000); |
20 | </script> | 20 | </script> |
21 | {% endfor %} | 21 | {% endfor %} |
22 | |||
23 | {{ render(controller("WallabagImportBundle:Import:checkQueue")) }} | ||
24 | {% endblock %} | 22 | {% endblock %} |
25 | 23 | ||
26 | {% block menu %} | 24 | {% 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 @@ | |||
2 | 2 | ||
3 | {% block title %}{{ 'import.page_title'|trans }}{% endblock %} | 3 | {% block title %}{{ 'import.page_title'|trans }}{% endblock %} |
4 | 4 | ||
5 | {% block messages %} | ||
6 | {{ render(controller("WallabagImportBundle:Import:checkQueue")) }} | ||
7 | |||
8 | {{ parent() }} | ||
9 | {% endblock %} | ||
10 | |||
5 | {% block content %} | 11 | {% block content %} |
6 | <div class="row"> | 12 | <div class="row"> |
7 | <div class="col s12"> | 13 | <div class="col s12"> |