added lightbox to single images

diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php
index aec48b4744218a3dde79185ede67ae180174ad49..49585fd0c867be844859a066959537422788caca 100644 (file)
--- a/classes/TidypicsImage.php
+++ b/classes/TidypicsImage.php
@@ -307,6 +307,10 @@ class TidypicsImage extends ElggFile {
                return $file->grabFile();
        }
 
+       public function getImage() {
+               return $this->grabFile();
+       }
+
        /**
         * Extract EXIF Data from image
         *

diff --git a/pages/photos/image/thumbnail.php b/pages/photos/image/thumbnail.php
index ae07f27069f0e930826565390a452d51118b6a1c..ed39c616994669354f124ae25a809b58f62d783a 100644 (file)
--- a/pages/photos/image/thumbnail.php
+++ b/pages/photos/image/thumbnail.php
@@ -13,7 +13,11 @@ if (!$image) {
        // @todo
 }
 
-$contents = $image->getThumbnail($size);
+if ($size == 'master') {
+       $contents = $image->getImage();
+} else {
+       $contents = $image->getThumbnail($size);
+}
 if (!$contents) {
        forward("mod/tidypics/graphics/image_error_$size");
 }

diff --git a/views/default/js/photos/tidypics.php b/views/default/js/photos/tidypics.php
index 509d2116ae393c314ca949019430f7e205e001c0..896192eea42d63ddf8701f60c58c64a6b9b91789 100644 (file)
--- a/views/default/js/photos/tidypics.php
+++ b/views/default/js/photos/tidypics.php
@@ -8,6 +8,9 @@
 elgg.provide('elgg.tidypics');
 
 elgg.tidypics.init = function() {
+
+       $(".tidypics-lightbox").fancybox({'type': 'image'});
+
        $("#tidypics-sort").sortable({
                opacity: 0.7,
                revert: true,

diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php
index 48ed40876d7598286caeff5d6b558ac6ba529795..e3a2c700395b0448c1e0c1b7f386da96b4586775 100644 (file)
--- a/views/default/object/image/full.php
+++ b/views/default/object/image/full.php
@@ -11,9 +11,12 @@
 $image = $photo = $vars['entity'];
 
 $img = elgg_view_entity_icon($image, 'large', array(
-       'href' => false,
+       'href' => $image->getIconURL('master'),
        'img_class' => 'tidypics-photo',
+       'link_class' => 'tidypics-lightbox',
 ));
+elgg_load_js('lightbox');
+elgg_load_css('lightbox');
 
 $owner_link = elgg_view('output/url', array(
        'href' => "photos/owner/" . $photo->getOwnerEntity()->username,