3 files changed, 55 insertions, 6 deletions
diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php
index f866e432d..48ed40876 100644
--- a/views/default/object/image/full.php
+++ b/views/default/object/image/full.php
@@ -46,6 +46,13 @@ $summary = elgg_view_image_block($owner_icon, $list_body, $params);
 
 echo $summary;
 
+echo '<div class="tidypics-wrapper-photo">';
+echo elgg_view('object/image/navigation', $vars);
+//echo elgg_view('tidypics/tagging/help');
+//echo elgg_view('tidypics/tagging/select', array('photo' => $photo));
+echo $img;
+echo '</div>';
+
 if ($photo->description) {
 	echo elgg_view('output/longtext', array(
 		'value' => $photo->description,
@@ -53,10 +60,4 @@ if ($photo->description) {
 	));
 }
 
-echo '<div class="tidypics-wrapper-photo">';
-echo elgg_view('tidypics/tagging/help');
-echo elgg_view('tidypics/tagging/select', array('photo' => $photo));
-echo $img;
-echo '</div>';
-
 echo elgg_view_comments($photo);
diff --git a/views/default/object/image/navigation.php b/views/default/object/image/navigation.php
new file mode 100644
index 000000000..155b76364
--- /dev/null
+++ b/views/default/object/image/navigation.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Photo navigation
+ *
+ * @uses $vars['entity']
+ */
+
+$photo = $vars['entity'];
+
+$album = $photo->getContainerEntity();
+$previous_photo = $album->getPreviousImage($photo->getGUID());
+$next_photo = $album->getNextImage($photo->getGUID());
+$size = $album->getSize();
+$index = $album->getIndex($photo->getGUID());
+
+echo '<ul class="elgg-menu elgg-menu-hz tidypics-album-nav">';
+echo '<li>';
+echo elgg_view('output/url', array(
+	'text' => elgg_view_icon('arrow-left'),
+	'href' => $previous_photo->getURL(),
+));
+echo '</li>';
+
+echo '<li>';
+echo '<span>' . elgg_echo('image:index', array($index, $size)) . '</span>';
+echo '</li>';
+
+echo '<li>';
+echo elgg_view('output/url', array(
+	'text' => elgg_view_icon('arrow-right'),
+	'href' => $next_photo->getURL(),
+));
+echo '</li>';
+echo '</ul>';
diff --git a/views/default/photos/css.php b/views/default/photos/css.php
index 119d98c09..18f225131 100644
--- a/views/default/photos/css.php
+++ b/views/default/photos/css.php
@@ -52,6 +52,20 @@
 	padding: 0 10px;
 }
 
+.tidypics-album-nav {
+	margin: 3px 0;
+	text-align: center;
+	color: #aaa;
+}
+
+.tidypics-album-nav > li {
+	padding: 0 3px;
+}
+
+.tidypics-album-nav > li {
+	vertical-align: top;
+}
+
 <?php
 return true;
 ?>