5 files changed, 50 insertions, 14 deletions
diff --git a/views/default/js/photos/tagging.php b/views/default/js/photos/tagging.php
index b00200e74..47bab9de5 100644
--- a/views/default/js/photos/tagging.php
+++ b/views/default/js/photos/tagging.php
@@ -102,9 +102,14 @@ elgg.tidypics.tagging.position = function() {
 	tag_left += image_pos.left;
 	tag_top += image_pos.top;
 
-	$(this).css({
+	$(this).parent().css({
 		left: tag_left + 'px',
-		top: tag_top + 'px',
+		top: tag_top + 'px' /*
+		width: tag_width + 'px',
+		height: tag_height + 'px' */
+	});
+
+	$(this).css({
 		width: tag_width + 'px',
 		height: tag_height + 'px'
 	});
@@ -117,19 +122,19 @@ elgg.tidypics.tagging.toggleTagHover = function() {
 	if (elgg.tidypics.tagging.tag_hover == false) {
 		$('.tidypics-photo').hover(
 			function() {
-				$('.tidypics-tag').show();
+				$('.tidypics-tag-wrapper').show();
 			},
 			function() {
-				$('.tidypics-tag').hide();
+				$('.tidypics-tag-wrapper').hide();
 			}
 		);
 	} else {
 		$('.tidypics-photo').hover(
 			function() {
-				$('.tidypics-tag').hide();
+				$('.tidypics-tag-wrapper').hide();
 			},
 			function() {
-				$('.tidypics-tag').hide();
+				$('.tidypics-tag-wrapper').hide();
 			}
 		);
 	}
diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php
index e12e96806..175519c16 100644
--- a/views/default/object/image/full.php
+++ b/views/default/object/image/full.php
@@ -49,7 +49,7 @@ $summary = elgg_view_image_block($owner_icon, $list_body, $params);
 
 echo $summary;
 
-echo '<div class="tidypics-wrapper-photo">';
+echo '<div class="tidypics-photo-wrapper center">';
 echo elgg_view('object/image/navigation', $vars);
 echo elgg_view('photos/tagging/help', $vars);
 echo elgg_view('photos/tagging/select', $vars);
diff --git a/views/default/photos/css.php b/views/default/photos/css.php
index 23926adbc..3e18d1908 100644
--- a/views/default/photos/css.php
+++ b/views/default/photos/css.php
@@ -23,13 +23,20 @@
 .tidypics-gallery-widget > li {
 	width: 100%;
 }
-
+/*
+.tidypics-lightbox {
+	margin: 0 auto;
+	display: block;
+	width: auto;
+}
+*/
+/*
 .tidypics-photo {
 	margin: 0 auto;
 	display: block;
 }
-
-.tidypics-wrapper-photo {
+*/
+.tidypics-photo-wrapper {
 	position: relative;
 }
 
@@ -116,10 +123,19 @@
 	max-width: 300px;
 }
 
-.tidypics-tag {
+.tidypics-tag-wrapper {
 	display: none;
 	position: absolute;
+}
+
+.tidypics-tag {
 	border: 2px solid white;
+	clear: both;
+}
+
+.tidypics-tag-label {
+	float: left;
+	margin-top: 5px;
 }
 
 <?php
diff --git a/views/default/photos/tagging/tag.php b/views/default/photos/tagging/tag.php
index 4d3affeb6..93ea16218 100644
--- a/views/default/photos/tagging/tag.php
+++ b/views/default/photos/tagging/tag.php
@@ -3,6 +3,9 @@
  * Photo tag view
  *
  * @uses $vars['tag'] Tag object
+ *
+ * @author Cash Costello
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
  */
 
 $coords = json_decode('{' . $vars['tag']->coords . '}');
@@ -15,10 +18,19 @@ $attributes = elgg_format_attributes(array(
 	'data-height' => $coords->height,
 ));
 
-//var_dump($vars['tag']);
-//$text = "This is a something";
+if ($vars['tag']->type == 'user') {
+	$user = get_entity($vars['tag']->value);
+	$label = elgg_view('output/url', array(
+		'text' => $user->name,
+		'href' => $user->getURL(),
+	));
+} else {
+	$label = $vars['tag']->value;
+}
 
 echo <<<HTML
-<div $attributes>
+<div class="tidypics-tag-wrapper">
+	<div $attributes></div>
+	<div class="elgg-module-popup tidypics-tag-label">$label</div>
 </div>
 HTML;
diff --git a/views/default/photos/tagging/tags.php b/views/default/photos/tagging/tags.php
index 7a4aa3a59..29c9d0efb 100644
--- a/views/default/photos/tagging/tags.php
+++ b/views/default/photos/tagging/tags.php
@@ -3,6 +3,9 @@
  * View the tags for this image
  *
  * @uses $vars['entity']
+ *
+ * @author Cash Costello
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
  */
 
 $tags = $vars['entity']->getPhotoTags();