diff --git a/src/js/main.js b/src/js/main.js index 37b600e43..14345aa7f 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -141,7 +141,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route', if (!status.activated) { console.log('Not activated yet, redirecting', status); - if (status.restore.active || status.restore.errorMessage) { + if (status.restore.active || status.restore.errorMessage) { // show the error message in restore page window.location.href = '/restore.html'; } else { window.location.href = status.adminFqdn ? '/setup.html' : '/setupdns.html'; diff --git a/src/js/restore.js b/src/js/restore.js index 696621e88..ed7afe667 100644 --- a/src/js/restore.js +++ b/src/js/restore.js @@ -16,6 +16,7 @@ app.controller('RestoreController', ['$scope', '$http', 'Client', function ($sco $scope.busy = false; $scope.error = {}; + $scope.message = ''; // progress $scope.provider = ''; $scope.bucket = ''; $scope.prefix = ''; @@ -205,6 +206,8 @@ app.controller('RestoreController', ['$scope', '$http', 'Client', function ($sco return; } + $scope.message = status.restore.message; + setTimeout(waitForRestore, 5000); }); } diff --git a/src/js/setupdns.js b/src/js/setupdns.js index 0952dc0b8..2bf6176d6 100644 --- a/src/js/setupdns.js +++ b/src/js/setupdns.js @@ -202,6 +202,8 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f return; } + $scope.message = status.setup.message; + setTimeout(waitForDnsSetup, 5000); }); } diff --git a/src/restore.html b/src/restore.html index 396e93c84..d1e111989 100644 --- a/src/restore.html +++ b/src/restore.html @@ -41,7 +41,7 @@

-

Downloading backup

+

{{ message }} ...

diff --git a/src/setupdns.html b/src/setupdns.html index dda2a1cbe..555664c1e 100644 --- a/src/setupdns.html +++ b/src/setupdns.html @@ -44,7 +44,7 @@

-

Waiting for domain and certificate setup

+

{{ message }} ...