diff --git a/Site5/Pages/v5/Init/Default.aspx b/Site5/Pages/v5/Init/Default.aspx index c19c9d41..d6d83c40 100644 --- a/Site5/Pages/v5/Init/Default.aspx +++ b/Site5/Pages/v5/Init/Default.aspx @@ -128,6 +128,7 @@ $('#DivProgressDatabase').progressbar({ value: 0, max: 100 }); setTimeout('updateInitProgressBar();', 1000); + setTimeout('updateInitProgressMessage();', 1500); $('#<%=this.ButtonInitDatabase.ClientID %>').click(); beginInitDatabase(); } @@ -181,13 +182,37 @@ // We're not done yet. Keep the progress bar on-screen and keep re-checking. $('#DivProgressDatabase').progressbar("value", msg.d); - setTimeout('updateInitProgressBar();', 0); + setTimeout('updateInitProgressBar();', 1500); } } }); } - function beginInitDatabase() { + function updateInitProgressMessage() { + + $.ajax({ + type: "POST", + url: "Default.aspx/GetInitProgressMessage", + data: "{}", + contentType: "application/json; charset=utf-8", + dataType: "json", + success: function (msg) { + if (msg.d == 'Complete.') { + + // We're done. Do nothing, the progress bar updater will do this step. + + } else { + // We're not done yet. Keep the progress bar on-screen and keep re-checking. + + $('#SpanInitProgressMessage').text(msg.d); + setTimeout('updateInitProgressMessage();', 2000); + } + } + }); + } + + + function beginInitDatabase() { $.ajax({ type: "POST", url: "Default.aspx/InitDatabase", @@ -443,6 +468,7 @@

Initializing database

Please wait while the database is being initialized with schemas and geographic data from the Activizr servers. This is going to take a significant amount of time; we're loading tons of geodata onto your new server.

+

Initializing...