diff --git a/assets/controllers/materialize/toast_controller.js b/assets/controllers/materialize/toast_controller.js new file mode 100644 index 000000000..ba9165473 --- /dev/null +++ b/assets/controllers/materialize/toast_controller.js @@ -0,0 +1,12 @@ +import { Controller } from '@hotwired/stimulus'; +import M from '@materializecss/materialize'; + +export default class extends Controller { + connect() { + this.instance = M.toast({ text: this.element.innerText }); + } + + disconnect() { + this.instance.dismissAll(); + } +} diff --git a/assets/index.js b/assets/index.js index 253fad183..210a6c716 100755 --- a/assets/index.js +++ b/assets/index.js @@ -4,7 +4,7 @@ import $ from 'jquery'; /* Materialize imports */ import '@materializecss/materialize/dist/css/materialize.css'; -import M from '@materializecss/materialize/dist/js/materialize'; +import '@materializecss/materialize/dist/js/materialize'; /* Annotations */ import annotator from 'annotator'; @@ -348,10 +348,4 @@ $(document).ready(() => { qrcode.setAttribute('src', src); }); - - document.querySelectorAll('.material-toast').forEach((toast) => { - M.toast({ - text: toast.innerText, - }); - }); }); diff --git a/templates/Import/check_queue.html.twig b/templates/Import/check_queue.html.twig index 34ab57a16..4d8e924ad 100644 --- a/templates/Import/check_queue.html.twig +++ b/templates/Import/check_queue.html.twig @@ -1,9 +1,9 @@ {% if nbRedisMessages is defined and nbRedisMessages > 0 %} -
+Messages in queue: {{ nbRedisMessages }}
{% endif %} {% if nbRabbitMessages is defined and nbRabbitMessages > 0 %} - +Messages in queue: {{ nbRabbitMessages }}
{% endif %} {% if redisNotInstalled is defined and redisNotInstalled %} diff --git a/templates/bundles/FOSUserBundle/Security/login.html.twig b/templates/bundles/FOSUserBundle/Security/login.html.twig index 2466a0752..c25b106ff 100644 --- a/templates/bundles/FOSUserBundle/Security/login.html.twig +++ b/templates/bundles/FOSUserBundle/Security/login.html.twig @@ -5,11 +5,11 @@{{ error.messageKey|trans(error.messageData, 'security') }}
{% endif %} {% for flash_message in app.session.flashbag.get('notice') %} - +{{ flash_message }}
{% endfor %}{{ flash_message|trans }}
{% endfor %} {% endblock %}