From afa8cade7fc948b064636d4e9ecfb03e4c2c67d7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 18 Aug 2009 05:16:11 +0800
Subject: Fix for ticket #590. The gallery.dialog.js looks for an element
 "#dialog #gProgress" and if it finds it assumes that it is a progress dialog
 and removes the title.  This pathc changes the name of the div containing the
 progress bar to gServerAddProgress and avoids the issue.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/server_add/js/server_add.js                      | 2 +-
 modules/server_add/views/server_add_tree_dialog.html.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/server_add')

diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index 3348de4b..fbd61dcc 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -52,7 +52,7 @@ function run_add(url) {
       $("#gStatus").html(data.status);
       $("#gServerAdd .gProgressBar").progressbar("value", data.percent_complete);
       if (data.done) {
-	$("#gProgress").slideUp();
+	$("#gServerAddProgress").slideUp();
       } else {
 	setTimeout(function() { run_add(url); }, 0);
       }
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 5c5dfd0f..431635f8 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -23,7 +23,7 @@
     <?= $tree ?>
   </ul>
 
-  <div id="gProgress" style="display: none">
+  <div id="gServerAddProgress" style="display: none">
     <div class="gProgressBar"></div>
     <div id="gStatus"></div>
   </div>
@@ -46,7 +46,7 @@
          $("#gServerAdd .gProgressBar").
            progressbar().
            progressbar("value", 0);
-         $("#gProgress").slideDown("fast", function() { start_add() });
+         $("#gServerAddProgress").slideDown("fast", function() { start_add() });
       });
       $("#gServerCloseButton").click(function(event) {
         $("#gDialog").dialog("close");
-- 
cgit v1.2.3