4 files changed, 12 insertions, 62 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..61be8523b 100644
--- a/pages/photos/image/upload.php
+++ b/pages/photos/image/upload.php
@@ -38,15 +38,7 @@ 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));
-}
+$content = elgg_view('forms/photos/basic_upload', 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) {
diff --git a/pages/tagged.php b/pages/tagged.php
deleted file mode 100644
index 34ea8a709..000000000
--- a/pages/tagged.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Tidypics Tagged Listing
- *
- * List all photos tagged with a user
- */
-
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
-
-
-// Get user guid
-$guid = get_input('guid');
-
-$user = get_entity($guid);
-
-if ($user) {
-	$title = sprintf(elgg_echo('tidypics:usertag'), $user->name);
-} else {
-	$title = "User does not exist";
-}
-
-
-// create main column
-$body = elgg_view_title($title);
-
-set_context('search');
-set_input('search_viewtype', 'gallery'); // need to force gallery view
-$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image', 0, 10, false); 
-
-// Set up submenus
-if (isloggedin()) {
-	add_submenu_item(	elgg_echo("album:yours"),
-			$CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username,
-			'tidypics-b' );
-}
-add_submenu_item(	elgg_echo('album:all'), 
-		$CONFIG->wwwroot . "pg/photos/world/",
-		'tidypics-z');
-add_submenu_item(	elgg_echo('tidypics:mostrecent'),
-		$CONFIG->wwwroot . 'pg/photos/mostrecent',
-		'tidypics-z');
-
-
-
-$body = elgg_view_layout('two_column_left_sidebar', '', $body);
-
-
-page_draw($title, $body);