checkpoint the new organize module. At this point rearrange and move work. Rearrange is moving items within the same album, move is moving to a different album.

6 files changed, 5 insertions, 5 deletions

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index bfd4992d..e713fdd9 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -42,7 +42,7 @@ class Organize_Controller extends Controller {
     $v->sort_fields = json_encode($sort_fields);
 
     $user = identity::active_user();
-    $v->api_key = rest::get_access_token($user->id)->access_key;
+    $v->api_key = rest::get_access_key($user->id)->access_key;
     print $v;
   }
 
diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
new file mode 100644
index 00000000..a9e4c66b
--- /dev/null
+++ b/modules/organize/lib/Gallery3WebClient.swf
diff --git a/modules/organize/lib/organize.swf b/modules/organize/lib/organize.swf
deleted file mode 100644
index 62e733ea..00000000
--- a/modules/organize/lib/organize.swf
+++ /dev/null
diff --git a/modules/organize/source/Gallery3Organize_source.zip b/modules/organize/source/Gallery3Organize_source.zip
new file mode 100644
index 00000000..c6f7eebe
--- /dev/null
+++ b/modules/organize/source/Gallery3Organize_source.zip
diff --git a/modules/organize/source/flex_organize_source.7z b/modules/organize/source/flex_organize_source.7z
deleted file mode 100644
index ea5951b9..00000000
--- a/modules/organize/source/flex_organize_source.7z
+++ /dev/null
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 8163c595..5da4aca4 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -22,10 +22,12 @@
 
 <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();
       });
 
   function closeOrganizeDialog() {
+    console.log("closeOrganizeDialog");
     $("#g-dialog").dialog("close");
   }
 
@@ -37,12 +39,10 @@
       "rollOverColor": colorToHex($("#g-organize-hover").css("backgroundColor")),
       "selectionColor": colorToHex($("#g-organize-active").css("backgroundColor"))
     };
-    console.dir(styles);
     return styles;
   }
 
   function colorToHex(color) {
-    console.log("color: " + color);
     var digits = /(.*?)rgb\((\d+), (\d+), (\d+)\)/.exec(color);
 
     var red = parseInt(digits[2]);
@@ -81,13 +81,13 @@
   /* To use express install, set to playerProductInstall.swf, otherwise the empty string.*/
   var xiSwfUrlStr = "";
   var flashvars = {
-    selectedAlbum: "<?= $album->id?>",
     fileFilter: '<?= $file_filter ?>',
     domains: '["<?= $domain ?>"]',
     sortOrder: '<?= $sort_order ?>',
     sortFields: '<?= $sort_fields ?>',
     baseUrl: '<?= $base_url ?>',
     apiKey: '<?= $api_key ?>',
+    albumId: "<?= $album->id ?>",
     controller: '<?= url::abs_site("organize") ?>/'
   };
 
@@ -103,7 +103,7 @@
   attributes.id = "g-organize-object";
   attributes.name = "organize";
   attributes.align = "middle";
-  swfobject.embedSWF("<?= url::file("modules/organize/lib/organize.swf") ?>",
+  swfobject.embedSWF("<?= url::file("modules/organize/lib/Gallery3WebClient.swf") ?>",
                      "flashContent", size.width() - 100,  size.height() - 135,
                      swfVersionStr, xiSwfUrlStr, flashvars, params, attributes);
 </script>