Merge branch 'colorbox' of git://github.com/sembrestels/Tidypics

Conflicts:
	manifest.xml
	start.php

diff --cc manifest.xml
index f1fe63581cc47dbe82a23fd557ffdce784a4bd5c,75a25e4b92dc2d7f43558fa054c57251942e1bb1..3120d9f969cc4e19d8085d42691d30535c42db03
--- 1/manifest.xml
--- 2/manifest.xml
+++ b/manifest.xml
@@@ -13,8 -13,14 +13,18 @@@
                <type>elgg_release</type>
                <version>1.8</version>
        </requires>
- </plugin_manifest>
 +      <conflicts>
 +              <type>plugin</type>
 +              <name>tidypics</name>
 +      </conflicts>
+       <suggests>
+               <type>plugin</type>
+               <name>colorbox</name>
+               <version>1.8</version>
+       </suggests>
+       <requires>
+               <type>priority</type>
+               <priority>after</priority>
+               <plugin>colorbox</plugin>
+       </requires>
+ </plugin_manifest>

diff --cc start.php
index 07100fb8a08178502b83f30909fc4966e230a878,b47b71d81e8cd095485fc5d4c541752ed7735997..bb841e48f37032772f0cb9acb303e7e92ae4a542
--- 1/start.php
--- 2/start.php
+++ b/start.php
@@@ -38,9 -38,16 +38,7 @@@ function tidypics_init() 
        $js = elgg_get_simplecache_url('js', 'photos/tidypics');
        elgg_register_simplecache_view('js/photos/tidypics');
        elgg_register_js('tidypics', $js, 'footer');
 -      $js = elgg_get_simplecache_url('js', 'photos/tagging');
 -      elgg_register_simplecache_view('js/photos/tagging');
 -      elgg_register_js('tidypics:tagging', $js, 'footer');
 -      $js = elgg_get_simplecache_url('js', 'photos/uploading');
 -      elgg_register_simplecache_view('js/photos/uploading');
 -      elgg_register_js('tidypics:uploading', $js, 'footer');
 -      
 -      elgg_register_js('swfobject', 'mod/tidypics/vendors/uploadify/swfobject.js', 'footer');
 -      elgg_register_js('jquery.uploadify-tp', 'mod/tidypics/vendors/uploadify/jquery.uploadify.v2.1.1.min.js', 'footer');
  
-       elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.js', 'footer');
-       
        // Add photos link to owner block/hover menus
        elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu');
  
@@@ -306,22 -329,33 +303,7 @@@ function tidypics_entity_menu_setup($ho
                        );
                        $return[] = ElggMenuItem::factory($options);
                }
 -
 -              if (elgg_get_plugin_setting('tagging', 'tidypics')) {
 -                      $options = array(
 -                              'name' => 'tagging',
 -                              'text' => elgg_echo('tidypics:actiontag'),
 -                              'href' => '#',
 -                              'title' => elgg_echo('tidypics:tagthisphoto'),
 -                              'rel' => 'photo-tagging',
 -                              'priority' => 80,
 -                      );
 -                      $return[] = ElggMenuItem::factory($options);
 -              }
 -      }
 -
 -      // only show these options if there are images
 -      if (elgg_instanceof($entity, 'object', 'album') && $entity->getSize() > 0) {
 -              if ($entity->canEdit()) {
 -                      $options = array(
 -                              'name' => 'sort',
 -                              'text' => elgg_echo('album:sort'),
 -                              'href' => "photos/sort/" . $entity->getGUID(),
 -                              'priority' => 90,
 -                      );
 -                      $return[] = ElggMenuItem::factory($options);
 -              }
        }
- 
-       // 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);
-               $slideshow_link = "javascript:PicLensLite.start({maxScale:0, feedUrl:'$url'})";
-               $options = array(
-                       'name' => 'slideshow',
-                       'text' => elgg_echo('album:slideshow'),
-                       'href' => $slideshow_link,
-                       'priority' => 80,
-               );
-               $return[] = ElggMenuItem::factory($options);
-       }
--
        return $return;
  }
  

diff --cc views/default/object/image/full.php
Simple merge

diff --cc views/default/photos/css.php
Simple merge