Browse files

Rename "simple_uploader" to "flash_uploader" to make room for an HTML

uploader.
  • Loading branch information...
1 parent e648ba5 commit d82863421df3e7c8d500ab32c11c556a50691dbd @bharat bharat committed Jun 20, 2010
View
4 ...s/gallery/controllers/simple_uploader.php → ...es/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 @@ public function finish() {
}
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);
View
4 modules/gallery/helpers/gallery_event.php
@@ -202,7 +202,7 @@ static function site_menu($menu, $theme, $item_css_selector) {
$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 @@ static function context_menu($menu, $theme, $item, $thumb_css_selector) {
->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"))
View
2 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() ?>,
View
2 themes/wind/views/album.html.php
@@ -29,7 +29,7 @@
<? endforeach ?>
<? else: ?>
<? if ($user->admin || access::can("add", $item)): ?>
- <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
+ <? $addurl = url::site("flash_uploader/app/$item->id") ?>
<li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?></li>
<? else: ?>

0 comments on commit d828634

Please sign in to comment.