2 files changed, 14 insertions, 161 deletions

diff --git a/views/default/js/photos/tagging.php b/views/default/js/photos/tagging.php
deleted file mode 100644
index f444aa44c..000000000
--- a/views/default/js/photos/tagging.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * Photo tagging JavaScript
- *
- * @author Cash Costello
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
- */
-
-?>
-//<script>
-elgg.provide('elgg.tidypics.tagging');
-
-elgg.tidypics.tagging.init = function() {
-	elgg.tidypics.tagging.active = false;
-	$('[rel=photo-tagging]').click(elgg.tidypics.tagging.start);
-
-	$('#tidypics-tagging-quit').click(elgg.tidypics.tagging.stop);
-
-	$('.tidypics-tag').each(elgg.tidypics.tagging.position);
-
-	elgg.tidypics.tagging.tag_hover = false;
-	elgg.tidypics.tagging.toggleTagHover();
-};
-
-/**
- * Start a tagging session
- */
-elgg.tidypics.tagging.start = function(event) {
-
-	if (elgg.tidypics.tagging.active) {
-		elgg.tidypics.tagging.stop(event);
-		return;
-	}
-
-	$('.tidypics-photo').imgAreaSelect({
-		disable      : false,
-		hide         : false,
-		classPrefix  : 'tidypics-tagging',
-		onSelectEnd  : elgg.tidypics.tagging.startSelect,
-		onSelectStart: function() {
-			$('#tidypics-tagging-select').hide();
-		}
-	});
-
-	elgg.tidypics.tagging.toggleTagHover();
-
-	$('.tidypics-photo').css({"cursor" : "crosshair"});
-
-	$('#tidypics-tagging-help').toggle();
-
-	elgg.tidypics.tagging.active = true;
-
-	event.preventDefault();
-};
-
-/**
- * Stop tagging
- *
- * A tagging session could be completed or the user could have quit.
- */
-elgg.tidypics.tagging.stop = function(event) {
-	$('#tidypics-tagging-help').toggle();
-	$('#tidypics-tagging-select').hide();
-
-	$('.tidypics-photo').imgAreaSelect({hide: true, disable: true});
-	$('.tidypics-photo').css({"cursor" : "pointer"});
-
-	elgg.tidypics.tagging.active = false;
-	elgg.tidypics.tagging.toggleTagHover();
-
-	event.preventDefault();
-};
-
-/**
- * Start the selection stage of tagging
- */
-elgg.tidypics.tagging.startSelect = function(img, selection) {
-
-	var coords  = '"x1":"' + selection.x1 + '",';
-	coords += '"y1":"' + selection.y1 + '",';
-	coords += '"width":"' + selection.width + '",';
-	coords += '"height":"' + selection.height + '"';
-	$("input[name=coordinates]").val(coords);
-
-	$('#tidypics-tagging-select').show()
-		.css({
-			'top' : selection.y2 + 10,
-			'left' : selection.x2
-		})
-		.find('input[type=text]').focus();
-
-};
-
-/**
- * Position the tags over the image
- */
-elgg.tidypics.tagging.position = function() {
-	var tag_left = parseInt($(this).data('x1'));
-	var tag_top = parseInt($(this).data('y1'));
-	var tag_width = parseInt($(this).data('width'));
-	var tag_height = parseInt($(this).data('height'));
-
-	// add image offset
-	var image_pos = $('.tidypics-photo').position();
-	tag_left += image_pos.left;
-	tag_top += image_pos.top;
-
-	$(this).parent().css({
-		left: tag_left + 'px',
-		top: tag_top + 'px' /*
-		width: tag_width + 'px',
-		height: tag_height + 'px' */
-	});
-
-	$(this).css({
-		width: tag_width + 'px',
-		height: tag_height + 'px'
-	});
-};
-
-/**
- * Toggle whether tags are shown on hover over the image
- */
-elgg.tidypics.tagging.toggleTagHover = function() {
-	if (elgg.tidypics.tagging.tag_hover == false) {
-		$('.tidypics-photo').hover(
-			function() {
-				$('.tidypics-tag-wrapper').show();
-			},
-			function(event) {
-				// this check handles the tags appearing over the image
-				var mouseX = event.pageX;
-				var mouseY = event.pageY;
-				var offset = $('.tidypics-photo').offset();
-				var width = $('.tidypics-photo').outerWidth() - 1;
-				var height = $('.tidypics-photo').outerHeight() - 1;
-
-				mouseX -= offset.left;
-				mouseY -= offset.top;
-
-				if (mouseX < 0 || mouseX > width || mouseY < 0 || mouseY > height) {
-					$('.tidypics-tag-wrapper').hide();
-				}
-			}
-		);
-	} else {
-		$('.tidypics-photo').hover(
-			function() {
-				$('.tidypics-tag-wrapper').hide();
-			},
-			function() {
-				$('.tidypics-tag-wrapper').hide();
-			}
-		);
-	}
-	elgg.tidypics.tagging.tag_hover = !elgg.tidypics.tagging.tag_hover;
-};
-
-elgg.register_hook_handler('init', 'system', elgg.tidypics.tagging.init);
diff --git a/views/default/js/photos/tidypics.php b/views/default/js/photos/tidypics.php
index c97a1eadb..1ff7b2c40 100644
--- a/views/default/js/photos/tidypics.php
+++ b/views/default/js/photos/tidypics.php
@@ -9,8 +9,20 @@ elgg.provide('elgg.tidypics');
 
 elgg.tidypics.init = function() {
 
-	if ($(".tidypics-lightbox").length) {
-		$(".tidypics-lightbox").fancybox({'type': 'image'});
+	if (elgg.ui.lightbox) {
+		$('.elgg-lightbox, .elgg-lightbox-photo').colorbox({
+			href: function() {
+				if ((new RegExp("photos/image/[0-9]+", 'i')).test($(this).attr('href'))) {
+					var guid = (new RegExp("photos/image/[0-9]+", 'i')).exec($(this).attr('href')).toString().substr("photos/image/".length);
+					return elgg.config.wwwroot + "photos/thumbnail/" + guid + "/large";
+				} else {
+					return $(this).attr('href');
+				}
+			},
+			title: function() {
+				return '<h3 style="display: inline">'+ $(this).find('img').attr('title') +'</h3> - <a href="'+ $(this).attr('href') +'">'+ elgg.echo('comments') +'</a>';
+			}
+		});
 	}
 
 	$("#tidypics-sort").sortable({