diff options
| author | Sem <sembrestels@riseup.net> | 2012-08-02 21:44:44 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-08-02 21:44:44 +0200 |
| commit | dad0209bbd7994b623bc0126e3e37b1f521d2977 (patch) | |
| tree | 1e954b32439cbfc2acbbd63ed62dc372a260f37e /pages | |
| parent | fa81c487488064f684649272a6579079d3a88e2c (diff) | |
| parent | 28b1669c4b1afaed7429da2cc9580340dcb13b6e (diff) | |
| download | elgg-dad0209bbd7994b623bc0126e3e37b1f521d2977.tar.gz elgg-dad0209bbd7994b623bc0126e3e37b1f521d2977.tar.bz2 | |
Merge branch 'jquery-uploader' of git://github.com/sembrestels/Tidypics
Conflicts:
start.php
views/default/photos/css.php
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/photos/image/upload.php | 16 |
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, |