From 7d8d535cb37ea016044195a64bb191efe20bb0f0 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 5 Jul 2017 11:32:57 +0200 Subject: [PATCH] New: Hide the progress bar and the logs if the import has not started yet --- assets/js/src/mp2migrator.js | 2 ++ views/mp2migration.html | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/assets/js/src/mp2migrator.js b/assets/js/src/mp2migrator.js index ad2cc65d80..52a51a522a 100644 --- a/assets/js/src/mp2migrator.js +++ b/assets/js/src/mp2migrator.js @@ -63,6 +63,8 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(MailPoet, jQuery) { jQuery('#progresslabel').html(progress + '%'); if(Number(result.current) !== 0) { jQuery('#skip-import').hide(); + jQuery('#progressbar').show(); + jQuery('#logger-container').show(); } if(MailPoet.MP2Migrator.is_logging) { MailPoet.MP2Migrator.updateProgressbar_timeout = setTimeout(MailPoet.MP2Migrator.updateProgressbar, 1000); diff --git a/views/mp2migration.html b/views/mp2migration.html index 82c92e7a11..8bc1dc7016 100644 --- a/views/mp2migration.html +++ b/views/mp2migration.html @@ -28,7 +28,7 @@
-
+ @@ -38,8 +38,10 @@

- <%= __('Log...') %> -
+