From fa1fe47b6a0a377929a70748406eae589ecf2a00 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Sep 2010 22:13:41 -0700
Subject: Use the absolute site url when logging out of the admin site else we
 wind up with weird url doubling effects.  Fixes ticket #1342.

---
 modules/gallery/helpers/gallery_event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index ec7d1882..0ba98025 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -210,7 +210,7 @@ class gallery_event_Core {
                       ->label($user->display_name()));
 
         if (Router::$controller == "admin") {
-          $continue_url = url::site("");
+          $continue_url = url::abs_site("");
         } else if (isset($theme->item)) {
           if (access::user_can(identity::guest(), "view", $theme->item)) {
             $continue_url = $theme->item->abs_url();
-- 
cgit v1.2.3


From d398651c080c18e4f1bf623548091465dac1d528 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 7 Sep 2010 00:34:41 -0700
Subject: Disable selectFirst in the autocomplete box, which makes it a little
 harder to select pre-existing tags, but avoids the problem where we force the
 user to pick from existing tags.  Fixes ticket #1339

---
 modules/tag/views/tag_block.html.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php
index 8b887282..cc204c72 100644
--- a/modules/tag/views/tag_block.html.php
+++ b/modules/tag/views/tag_block.html.php
@@ -7,7 +7,8 @@
         max: 30,
         multiple: true,
         multipleSeparator: ',',
-        cacheLength: 1
+        cacheLength: 1,
+        selectFirst: false,
       }
     );
     $("#g-add-tag-form").ajaxForm({
@@ -24,4 +25,4 @@
 <div id="g-tag-cloud" ref="<?= url::site("tags") ?>">
   <?= $cloud ?>
 </div>
-<?= $form ?>
\ No newline at end of file
+<?= $form ?>
-- 
cgit v1.2.3


From b6fa33faf789749f4de3f4eadf8832748372c980 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 7 Sep 2010 18:53:17 -0700
Subject: Create a setLocation javascript callback which is called everytime
 with the full url of the current album(non-REST). When the dialog is closed
 the window location is set to this value and the page gets loaded
 appropriately.

---
 modules/organize/lib/Gallery3WebClient.swf      | Bin 148799 -> 148920 bytes
 modules/organize/views/organize_dialog.html.php |   6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index b82c8a42..71daa2f9 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index b76813ad..769d6e9a 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -19,13 +19,17 @@
 <script type="text/javascript">
   $("#g-dialog").bind("dialogclose", function(event, ui) {
     // @todo do a call to organize/closing to end the batch
-    window.location.reload();
+    window.location = $(this).data("reload.location");
   });
 
   function closeOrganizeDialog() {
     $("#g-dialog").dialog("close");
   }
 
+  function setLocation(url) {
+    $("#g-dialog").data("reload.location", url);
+  }
+
   function setTitle(title) {
     $("#ui-dialog-title-g-dialog").text(<?= t("Organize :: ")->for_js() ?> + title);
   }
-- 
cgit v1.2.3