summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/organize/controllers/organize.php6
-rw-r--r--modules/organize/lib/Gallery3WebClient.swfbin139321 -> 136657 bytes
-rw-r--r--modules/organize/source/Gallery3Organize_source.zipbin924325 -> 937810 bytes
3 files changed, 4 insertions, 2 deletions
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
--- a/modules/organize/lib/Gallery3WebClient.swf
+++ b/modules/organize/lib/Gallery3WebClient.swf
Binary files differ
diff --git a/modules/organize/source/Gallery3Organize_source.zip b/modules/organize/source/Gallery3Organize_source.zip
index c6f7eebe..133a7fcf 100644
--- a/modules/organize/source/Gallery3Organize_source.zip
+++ b/modules/organize/source/Gallery3Organize_source.zip
Binary files differ