added a friendly message when updating

diff --git a/static/css/ui.css b/static/css/ui.css
index 0f665c43e49c5d193165af708f299a50afb3c3ea..b0b555f5a6f8bcfe89278fbd04e275c993bb8cdc 100644 (file)
--- a/static/css/ui.css
+++ b/static/css/ui.css
@@ -359,6 +359,7 @@ div.modal-progress {
     background-image: url(../img/modal-progress.gif);
     width: 64px;
     height: 64px;
+    margin: auto;
 }
 
 td.dialog-item-label {

diff --git a/static/js/main.js b/static/js/main.js
index bae940c27b1f2e6ed97107b4628f0670161e713a..1f0b87b697f3f5741626aa34d2273391902f6827 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -991,7 +991,7 @@ function doApply() {
         
         if (data.reboot) {
             var count = 0;
-            function checkServer() {
+            function checkServerReboot() {
                 $.ajax({
                     type: 'GET',
                     url: '/config/0/get/',
@@ -1001,7 +1001,7 @@ function doApply() {
                     error: function () {
                         if (count < 25) {
                             count += 1;
-                            setTimeout(checkServer, 2000);
+                            setTimeout(checkServerReboot, 2000);
                         }
                         else {
                             window.location.reload(true);
@@ -1010,7 +1010,7 @@ function doApply() {
                 });
             }
             
-            setTimeout(checkServer, 15000);
+            setTimeout(checkServerReboot, 15000);
             
             return;
         }
@@ -1082,11 +1082,11 @@ function doUpdate() {
         }
         else {
             runConfirmDialog('New version available: ' + data.update_version + '. Update?', function () {
-                showModalDialog('<div class="modal-progress"></div>');
+                showModalDialog('<div style="text-align: center;"><span>This may take a few minutes.</span><div class="modal-progress"></div></div>');
                 ajax('POST', '/update/?version=' + data.update_version, null, function (result) {
                     if (result) {
                         var count = 0;
-                        function checkServer() {
+                        function checkServerUpdate() {
                             $.ajax({
                                 type: 'GET',
                                 url: '/config/0/get/',
@@ -1098,7 +1098,7 @@ function doUpdate() {
                                 error: function () {
                                     if (count < 25) {
                                         count += 1;
-                                        setTimeout(checkServer, 2000);
+                                        setTimeout(checkServerUpdate, 2000);
                                     }
                                     else {
                                         window.location.reload(true);
@@ -1107,7 +1107,7 @@ function doUpdate() {
                             });
                         }
                         
-                        setTimeout(checkServer, 15000);
+                        setTimeout(checkServerUpdate, 10000);
                     }
                     else {
                         runAlertDialog('Update failed!', function () {