Removed slideshow from plugin.

diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 0a2595c855179c65dc6e161ee347991914735d4b..83ec3e988401f571ea510a9c1834c68f497150e7 100644 (file)
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -32,14 +32,6 @@ if ($username) {
        }
 }
 
-// allow other plugins to override the slideshow
-$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
-if ($slideshow_link) {
-       add_submenu_item(elgg_echo('album:slideshow'),
-                       $slideshow_link,
-                       'photos' );
-}
-
 // how many do we display
 $max = 12;
 

diff --git a/pages/lists/mostviewedimages.php b/pages/lists/mostviewedimages.php
index eb87bc17c3ec1912b1aadce8b6be293fdf99f7a0..c113c39e2800711bd7a80b937821eaff3670ebef 100644 (file)
--- a/pages/lists/mostviewedimages.php
+++ b/pages/lists/mostviewedimages.php
@@ -50,14 +50,6 @@ $photos = tp_get_entities_from_annotations_calculate_x(
 */
 //error_log("custom query is " . (float)(microtime(true) - $start));
 
-// allow other plugins to override the slideshow
-$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
-if ($slideshow_link) {
-       add_submenu_item(elgg_echo('album:slideshow'),
-                       $slideshow_link,
-                       'photos' );
-}
-
 if ($owner_guid) {
        if ($owner_guid == get_loggedin_userid()) {
                $title = elgg_echo("tidypics:yourmostviewed");

diff --git a/pages/lists/recentlycommented.php b/pages/lists/recentlycommented.php
index f070e856341117aceb5e65ccdf7e630faff79a46..08f69603abc17a6d49e9b228264239d9e5504399 100644 (file)
--- a/pages/lists/recentlycommented.php
+++ b/pages/lists/recentlycommented.php
@@ -13,14 +13,6 @@ if (isloggedin()) {
        set_page_owner(get_loggedin_userid());
 }
 
-// allow other plugins to override the slideshow
-$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
-if ($slideshow_link) {
-       add_submenu_item(elgg_echo('album:slideshow'),
-                       $slideshow_link,
-                       'photos' );
-}
-
 
 global $CONFIG;
 $prefix = $CONFIG->dbprefix;

diff --git a/pages/lists/recentlyviewed.php b/pages/lists/recentlyviewed.php
index 419576d8e7b1ffcaa68c2f92b81832340231920a..851804e99f6228c602f7f631593f629ada5e38bb 100644 (file)
--- a/pages/lists/recentlyviewed.php
+++ b/pages/lists/recentlyviewed.php
@@ -13,14 +13,6 @@ if (isloggedin()) {
        set_page_owner(get_loggedin_userid());
 }
 
-// allow other plugins to override the slideshow
-$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
-if ($slideshow_link) {
-       add_submenu_item(elgg_echo('album:slideshow'),
-                       $slideshow_link,
-                       'photos' );
-}
-
 
 global $CONFIG;
 $prefix = $CONFIG->dbprefix;

diff --git a/start.php b/start.php
index 1e851b8f3ec61c4d57f2b23d017de0dd0c59ce0e..1b487321d269f36073713b9a1fe06e1638268a9a 100644 (file)
--- a/start.php
+++ b/start.php
@@ -45,7 +45,6 @@ function tidypics_init() {
        elgg_register_simplecache_view('js/photos/uploading');
        elgg_register_js('tidypics:uploading', $js, 'footer');
 
-       elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.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');
 
@@ -145,7 +144,6 @@ function tidypics_page_handler($page) {
 
                case "album": // view an album individually
                        set_input('guid', $page[1]);
-                       elgg_load_js('tidypics:slideshow');
                        require "$base/album/view.php";
                        break;
 
@@ -345,17 +343,6 @@ function tidypics_entity_menu_setup($hook, $type, $return, $params) {
 
        // only show these options 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);
-
                if ($entity->canEdit()) {
                        $options = array(
                                'name' => 'sort',