Merge branch 'sort-as-title-button' of git://github.com/sembrestels/Tidypics

3 files changed, 13 insertions, 11 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/start.php b/start.php
index b365a65a7..07100fb8a 100644
--- a/start.php
+++ b/start.php
@@ -308,7 +308,7 @@ function tidypics_entity_menu_setup($hook, $type, $return, $params) {
 		}
 	}
 
-	// only show these options if there are images
+	// only show slideshow link if there are images
 	if (elgg_instanceof($entity, 'object', 'album') && $entity->getSize() > 0) {
 		$url = $entity->getURL() . '?limit=50&view=rss';
 		$url = elgg_format_url($url);
@@ -320,16 +320,6 @@ function tidypics_entity_menu_setup($hook, $type, $return, $params) {
 			'priority' => 80,
 		);
 		$return[] = ElggMenuItem::factory($options);
-
-		if ($entity->canEdit()) {
-			$options = array(
-				'name' => 'sort',
-				'text' => elgg_echo('album:sort'),
-				'href' => "photos/sort/" . $entity->getGUID(),
-				'priority' => 90,
-			);
-			$return[] = ElggMenuItem::factory($options);
-		}
 	}
 
 	return $return;
diff --git a/views/default/photos/css.php b/views/default/photos/css.php
index a92c35b3e..0e0bbf5b4 100644
--- a/views/default/photos/css.php
+++ b/views/default/photos/css.php
@@ -42,6 +42,7 @@
 #tidypics-sort li {
 	width:153px;
 	height:153px;
+	cursor: move;
 }
 
 .tidypics-river-list > li {