diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-06-20 21:10:22 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-06-20 21:10:22 -0700 |
| commit | d82863421df3e7c8d500ab32c11c556a50691dbd (patch) | |
| tree | d5357caedb9c0ad64db53398e8d1fb0adbe579aa /modules | |
| parent | e648ba58b387e2b167cda2b3c3272c833addd52d (diff) | |
Rename "simple_uploader" to "flash_uploader" to make room for an HTML
uploader.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gallery/controllers/flash_uploader.php (renamed from modules/gallery/controllers/simple_uploader.php) | 4 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery_event.php | 4 | ||||
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/gallery/controllers/simple_uploader.php b/modules/gallery/controllers/flash_uploader.php index c7e5031b..f7da5124 100644 --- a/modules/gallery/controllers/simple_uploader.php +++ b/modules/gallery/controllers/flash_uploader.php @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class Simple_Uploader_Controller extends Controller { +class Flash_Uploader_Controller extends Controller { public function app($id) { $item = ORM::factory("item", $id); access::required("view", $item); @@ -109,7 +109,7 @@ class Simple_Uploader_Controller extends Controller { } private function _get_add_form($album) { - $form = new Forge("simple_uploader/finish", "", "post", array("id" => "g-add-photos-form")); + $form = new Forge("flash_uploader/finish", "", "post", array("id" => "g-add-photos-form")); $group = $form->group("add_photos") ->label(t("Add photos to %album_title", array("album_title" => html::purify($album->title)))); $group->uploadify("uploadify")->album($album); diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php index 55db47ce..82f42d98 100644 --- a/modules/gallery/helpers/gallery_event.php +++ b/modules/gallery/helpers/gallery_event.php @@ -202,7 +202,7 @@ class gallery_event_Core { $add_menu->append(Menu::factory("dialog") ->id("add_photos_item") ->label(t("Add photos")) - ->url(url::site("simple_uploader/app/$item->id"))); + ->url(url::site("flash_uploader/app/$item->id"))); if ($item->is_album()) { $add_menu->append(Menu::factory("dialog") ->id("add_album_item") @@ -471,7 +471,7 @@ class gallery_event_Core { ->id("add_item") ->label(t("Add a photo")) ->css_class("ui-icon-plus") - ->url(url::site("simple_uploader/app/$item->id"))) + ->url(url::site("flash_uploader/app/$item->id"))) ->append(Menu::factory("dialog") ->id("add_album") ->label(t("Add an album")) diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index d811f913..588fa16d 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -7,7 +7,7 @@ width: 150, height: 33, uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>", - script: "<?= url::site("simple_uploader/add_photo/{$album->id}") ?>", + script: "<?= url::site("flash_uploader/add_photo/{$album->id}") ?>", scriptData: <?= json_encode($script_data) ?>, fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4", fileDesc: <?= t("Photos and movies")->for_js() ?>, |