* Changed the close functionality so the page is reloaded when the dialog is closed.

* Renamed the ServerAddCloseButton.
* Added Pause and Continue buttons. Now when add is clicked, A Pause button is shown,
  once the adding is complete, the add button is reshown andpause button is hidden.
  Clicking the pause button will hide it and show a continue button.

2 files changed, 41 insertions, 7 deletions

diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index 7daa0adc..50a8c36b 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -9,7 +9,18 @@
            progressbar("value", 0);
          $("#gServerAddProgress", this.element).slideDown("fast", function() { self.start_add(); });
        });
-       $("#gServerCloseButton", this.element).click(function(event) {
+       $("#gServerAddPauseButton", this.element).click(function(event) {
+         self.pause = true;
+         $("#gServerAddPauseButton", this.element).hide();
+         $("#gServerAddContinueButton", this.element).show();
+       });
+       $("#gServerAddContinueButton", this.element).click(function(event) {
+         self.pause = false;
+         $("#gServerAddPauseButton", this.element).show();
+         $("#gServerAddContinueButton", this.element).hide();
+         self.run_add();
+       });
+       $("#gServerAddCloseButton", this.element).click(function(event) {
          $("#gDialog").dialog("close");
          window.location.reload();
        });
@@ -19,8 +30,17 @@
        $("#gServerAddTree span.gFile, #gServerAddTree span.gDirectory", this.element).click(function(event) {
          self.select_file(event);
        });
+       $("#gServerAddTree span.gDirectory", this.element).dblclick(function(event) {
+         self.open_dir(event);
+       });
+       $("#gDialog").bind("dialogclose", function(event, ui) {
+         window.location.reload();
+       });
      },
 
+     taskURL: null,
+     pause: false,
+
      start_add: function() {
        var self = this;
        var paths = [];
@@ -28,6 +48,9 @@
 	 paths.push($(this).attr("ref"));
        });
 
+       $("#gServerAddAddButton", this.element).hide();
+       $("#gServerAddPauseButton", this.element).show();
+
        $.ajax({
          url: START_URL,
          type: "POST",
@@ -37,16 +60,17 @@
          success: function(data, textStatus) {
            $("#gStatus").html(data.status);
            $(".gProgressBar", self.element).progressbar("value", data.percent_complete);
-           setTimeout(function() { self.run_add(data.url); }, 25);
+           self.taskURL = data.url;
+           setTimeout(function() { self.run_add(); }, 25);
          }
        });
        return false;
      },
 
-     run_add: function (url) {
+     run_add: function () {
        var self = this;
        $.ajax({
-         url: url,
+         url: self.taskURL,
          async: false,
          dataType: "json",
          success: function(data, textStatus) {
@@ -54,10 +78,14 @@
            $(".gProgressBar", self.element).progressbar("value", data.percent_complete);
            if (data.done) {
 	     $("#gServerAddProgress", this.element).slideUp();
+             $("#gServerAddAddButton", this.element).show();
+             $("#gServerAddPauseButton", this.element).hide();
+             $("#gServerAddContinueButton", this.element).hide();
            } else {
-	     setTimeout(function() { self.run_add(url); }, 25);
+             if (!self.pause) {
+               setTimeout(function() { self.run_add(); }, 25);
+             }
            }
-
          }
        });
      },
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 354659bc..fdb66d1c 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -33,8 +33,14 @@
             disabled="disabled">
       <?= t("Add") ?>
     </button>
+    <button id="gServerAddPauseButton" class="ui-state-default ui-corner-all" style="display:none">
+      <?= t("Pause") ?>
+    </button>
+    <button id="gServerAddContinueButton" class="ui-state-default ui-corner-all" style="display:none">
+      <?= t("Continue") ?>
+    </button>
 
-    <button id="gServerCloseButton" class="ui-state-default ui-corner-all">
+    <button id="gServerAddCloseButton" class="ui-state-default ui-corner-all">
       <?= t("Close") ?>
     </button>
   </span>