From: Sem <sembrestels@riseup.net>
Date: Thu, 2 Aug 2012 19:15:33 +0000 (+0200)
Subject: Merge branch 'colorbox' of git://github.com/sembrestels/Tidypics
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a7fd00b23708431d9875f1e7cd1743558ff25c5b;p=lorea%2Felgg.git

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

Conflicts:
	manifest.xml
	start.php
---

a7fd00b23708431d9875f1e7cd1743558ff25c5b
diff --cc manifest.xml
index f1fe63581,75a25e4b9..3120d9f96
--- a/manifest.xml
+++ b/manifest.xml
@@@ -13,8 -13,14 +13,18 @@@
  		<type>elgg_release</type>
  		<version>1.8</version>
  	</requires>
 +	<conflicts>
 +		<type>plugin</type>
 +		<name>tidypics</name>
 +	</conflicts>
- </plugin_manifest>
+ 	<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 07100fb8a,b47b71d81..bb841e48f
--- a/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;
  }