devol
/
wallabag
mirror of https://github.com/wallabag/wallabag.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2691 from wallabag/moved-total-import-notif 

Moved total messages from import
This commit is contained in:
Nicolas Lœuillet 2016-12-08 19:02:30 +01:00 committed by GitHub
parent edb9feb472 be2c55de4c
commit 2c1eed8051
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
View File

@ -19,8 +19,6 @@
Materialize.toast('{{ flashMessage|trans }}', 4000); Materialize.toast('{{ flashMessage|trans }}', 4000);
</script> </script>
{% endfor %} {% endfor %}
{{ render(controller("WallabagImportBundle:Import:checkQueue")) }}
{% endblock %} {% endblock %}
{% block menu %} {% block menu %}

6
src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
View File

@ -2,6 +2,12 @@
{% block title %}{{ 'import.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.page_title'|trans }}{% endblock %}
{% block messages %}
{{ render(controller("WallabagImportBundle:Import:checkQueue")) }}
{{ parent() }}
{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">