summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-07-09 06:08:20 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-07-09 11:09:35 -0700
commit591c5a11a396c6611a1e40f3c10253c5cfd78434 (patch)
tree13c03a13fef0531a665f065524397feaba4a7500
parent72f801df7d507599e201a6cb47d4a0304e00f5de (diff)
Reset the postion option to center when the form data is reloaded, to force the dialog to recenter in case the contents have changed.
-rw-r--r--lib/gallery.dialog.js1
-rw-r--r--modules/gallery/views/form_uploadify.html.php2
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index e6bd7392..289345bc 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -119,6 +119,7 @@
if (data.form) {
var formData = unescape(data.form);
$("#g-dialog form").replaceWith(formData);
+ $("#g-dialog").dialog("option", "position", "center");
$("#g-dialog form :submit").removeClass("ui-state-disabled")
.attr("disabled", null);
self._ajaxify_dialog();
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 588fa16d..4676fcef 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -88,6 +88,7 @@
</ul>
<? endif ?>
+<? if (!empty($album)): ?>
<div>
<p>
<?= t("Photos will be uploaded to album: ") ?>
@@ -99,6 +100,7 @@
<li class="g-active"> <?= html::purify($album->title) ?> </li>
</ul>
</div>
+<? endif ?>
<div id="g-add-photos-canvas">
<button id="g-add-photos-button" class="g-button ui-state-default ui-corner-all" href="#"><?= t("Select photos...") ?></button>