From dbf3199e46d8a9c0ae37108f6afda35232ef4cdd Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 6 Jul 2010 14:12:00 -0700
Subject: Fix for ticket #1181. Use $.getJSON to retrieve the json contents of
 the dialog. Convert all the controllers that create the data to go into a
 dialog to return the html as part of a json object.

---
 modules/gallery/views/move_browse.html.php          | 13 ++++++++-----
 modules/gallery/views/quick_delete_confirm.html.php | 12 ++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 modules/gallery/views/quick_delete_confirm.html.php

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/move_browse.html.php b/modules/gallery/views/move_browse.html.php
index ce3fc2fd..f77c724c 100644
--- a/modules/gallery/views/move_browse.html.php
+++ b/modules/gallery/views/move_browse.html.php
@@ -1,4 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<div>
 <script type="text/javascript">
  var load_tree = function(target_id, locked) {
    var load_url = "<?= url::site("move/show_sub_tree/{$source->id}/__TARGETID__") ?>";
@@ -24,13 +25,13 @@
    }
  }
 </script>
-<h1 style="display: none">
+<h1 style="display:none" >
   <? if ($source->type == "photo"): ?>
-  <? t("Move this photo to a new album") ?>
+  <?= t("Move this photo to a new album") ?>
   <? elseif ($source->type == "movie"): ?>
-  <? t("Move this movie to a new album") ?>
+  <?= t("Move this movie to a new album") ?>
   <? elseif ($source->type == "album"): ?>
-  <? t("Move this album to a new album") ?>
+  <?= t("Move this album to a new album") ?>
   <? endif ?>
 </h1>
 <div id="g-move">
@@ -42,6 +43,8 @@
   <form method="post" action="<?= url::site("move/save/$source->id") ?>">
     <?= access::csrf_form_field() ?>
     <input type="hidden" name="target_id" value="" />
-    <input type="submit" id="g-move-button" value="<?= t("Move")->for_html_attr() ?>" disabled="disabled"/>
+    <input type="submit" id="g-move-button" value="<?= t("Move")->for_html_attr() ?>"
+       disabled="disabled" class="submit" />
   </form>
 </div>
+</div>
diff --git a/modules/gallery/views/quick_delete_confirm.html.php b/modules/gallery/views/quick_delete_confirm.html.php
new file mode 100644
index 00000000..176ffb96
--- /dev/null
+++ b/modules/gallery/views/quick_delete_confirm.html.php
@@ -0,0 +1,12 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div class="ui-helper-clearfix">
+  <p>
+  <? if ($item->is_album()): ?>
+    <?= t("Delete the album <b>%title</b>? All photos and movies in the album will also be deleted.",
+          array("title" => html::purify($item->title))) ?>
+  <? else: ?>
+    <?= t("Are you sure you want to delete <b>%title</b>?", array("title" => html::purify($item->title))) ?>
+  <? endif ?>
+  </p>
+  <?= $form ?>
+</div>
-- 
cgit v1.2.3


From 591c5a11a396c6611a1e40f3c10253c5cfd78434 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 9 Jul 2010 06:08:20 -0700
Subject: Reset the postion option to center when the form data is reloaded, to
 force the dialog to recenter in case the contents have changed.

---
 lib/gallery.dialog.js                         | 1 +
 modules/gallery/views/form_uploadify.html.php | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'modules/gallery/views')

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>
-- 
cgit v1.2.3