summaryrefslogtreecommitdiff
path: root/modules/server_add
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-08-17 14:16:11 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-08-17 14:16:11 -0700
commit8156eb9651dd1f0eeb9c83366f929e85b14fe99f (patch)
treeb673a98cffeb0193229b76b2b6b511ffeb027c54 /modules/server_add
parent6f6d5b306b3ad673eedc08116a651c53e27fcd1f (diff)
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.
Diffstat (limited to 'modules/server_add')
-rw-r--r--modules/server_add/js/server_add.js2
-rw-r--r--modules/server_add/views/server_add_tree_dialog.html.php4
2 files changed, 3 insertions, 3 deletions
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");