diff options
Diffstat (limited to 'pages/photos')
| -rw-r--r-- | pages/photos/album/view.php | 11 | ||||
| -rw-r--r-- | pages/photos/image/upload.php | 24 | ||||
| -rw-r--r-- | pages/photos/image/view.php | 5 |
3 files changed, 26 insertions, 14 deletions
diff --git a/pages/photos/album/view.php b/pages/photos/album/view.php index 100cc44c6..6e111ab98 100644 --- a/pages/photos/album/view.php +++ b/pages/photos/album/view.php @@ -42,6 +42,17 @@ if ($album->getContainerEntity()->canWriteToContainer()) { )); } +// only show sort button if there are images +if ($album->canEdit() && $album->getSize() > 0) { + elgg_register_menu_item('title', array( + 'name' => 'sort', + 'href' => "photos/sort/" . $album->getGUID(), + 'text' => elgg_echo('album:sort'), + 'link_class' => 'elgg-button elgg-button-action', + 'priority' => 200, + )); +} + $body = elgg_view_layout('content', array( 'filter' => false, 'content' => $content, diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php index 425d5689a..c8e57038c 100644 --- a/pages/photos/image/upload.php +++ b/pages/photos/image/upload.php @@ -38,15 +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')); -$uploader = get_input('uploader'); -if ($uploader == 'basic') { - $content = elgg_view('forms/photos/basic_upload', array('entity' => $album)); -} else { - elgg_load_js('swfobject'); - elgg_load_js('jquery.uploadify-tp'); - elgg_load_js('tidypics:uploading'); - $content = elgg_view('forms/photos/ajax_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, diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php index fc4a01320..e30bed70a 100644 --- a/pages/photos/image/view.php +++ b/pages/photos/image/view.php @@ -19,11 +19,6 @@ if (!$photo) { $photo->addView(); -if (elgg_get_plugin_setting('tagging', 'tidypics')) { - elgg_load_js('tidypics:tagging'); - elgg_load_js('jquery.imgareaselect'); -} - // set page owner based on owner of photo album $album = $photo->getContainerEntity(); if ($album) { |