aboutsummaryrefslogtreecommitdiff
path: root/pages/photos
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-07-31 10:09:51 +0200
committerSem <sembrestels@riseup.net>2012-07-31 10:09:51 +0200
commit28b1669c4b1afaed7429da2cc9580340dcb13b6e (patch)
tree041440d7e32d2bde64101e7ab8a99dbe9d2ed8e8 /pages/photos
parente0879bc60015ab6be470b6828da0e50a7399bb9b (diff)
downloadelgg-28b1669c4b1afaed7429da2cc9580340dcb13b6e.tar.gz
elgg-28b1669c4b1afaed7429da2cc9580340dcb13b6e.tar.bz2
New uploader based on javascript for Tidypics
Diffstat (limited to 'pages/photos')
-rw-r--r--pages/photos/image/upload.php16
1 files changed, 15 insertions, 1 deletions
diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php
index 61be8523b..c8e57038c 100644
--- a/pages/photos/image/upload.php
+++ b/pages/photos/image/upload.php
@@ -38,7 +38,21 @@ elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
elgg_push_breadcrumb($album->getTitle(), $album->getURL());
elgg_push_breadcrumb(elgg_echo('album:addpix'));
-$content = elgg_view('forms/photos/basic_upload', array('entity' => $album));
+// load javascript dependences
+elgg_load_js('jquery-tmpl');
+elgg_load_js('jquery-load-image');
+elgg_load_js('jquery-canvas-to-blob');
+elgg_load_js('jquery-fileupload');
+elgg_load_js('jquery-fileupload-ui');
+elgg_load_js('tidypics:upload');
+
+$form_vars = array(
+ 'id' => 'fileupload',
+ 'action' => 'action/photos/image/upload',
+ 'enctype' => 'multipart/form-data',
+);
+
+$content = elgg_view_form('photos/basic_upload', $form_vars, array('entity' => $album));
$body = elgg_view_layout('content', array(
'content' => $content,