From e4ff302e3b1d64de2864e7fcd64f26e6d012089b Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 20 May 2010 09:05:50 -0700 Subject: Add items and add albums are now working. What still needs to be done is add a progress bar for longer running tasks --- modules/organize/controllers/organize.php | 6 ++++-- modules/organize/lib/Gallery3WebClient.swf | Bin 139321 -> 136657 bytes .../organize/source/Gallery3Organize_source.zip | Bin 924325 -> 937810 bytes 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index e713fdd9..d2c273b6 100644 --- a/modules/organize/controllers/organize.php +++ b/modules/organize/controllers/organize.php @@ -28,8 +28,10 @@ class Organize_Controller extends Controller { $v = new View("organize_dialog.html"); $v->album = $album; // @todo turn this into an api call. - $v->file_filter = json_encode(array("Images" => "*.jpg; *.jpeg; *.gif; *.png", - "Movies" => "*.flv; *.mp4")); + $v->file_filter = json_encode( + array("photo" => array("label" => "Images", + "types" => array("*.jpg", "*.jpeg", "*.png", "*.gif")), + "movie" => array("label" => "Movies", "types" => array("*.flv", "*.mp4")))); $v->domain = $input->server("SERVER_NAME"); // @todo figure out how to connect this w/o a dependency $v->base_url = url::abs_site("rest") . "/"; diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf index a9e4c66b..1069eae0 100644 Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ diff --git a/modules/organize/source/Gallery3Organize_source.zip b/modules/organize/source/Gallery3Organize_source.zip index c6f7eebe..133a7fcf 100644 Binary files a/modules/organize/source/Gallery3Organize_source.zip and b/modules/organize/source/Gallery3Organize_source.zip differ -- cgit v1.2.3