diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/lists/mostrecentimages.php | 8 | ||||
| -rw-r--r-- | pages/lists/mostviewedimages.php | 8 | ||||
| -rw-r--r-- | pages/lists/recentlycommented.php | 8 | ||||
| -rw-r--r-- | pages/lists/recentlyviewed.php | 8 | ||||
| -rw-r--r-- | pages/photos/album/view.php | 11 | ||||
| -rw-r--r-- | pages/photos/image/view.php | 5 | ||||
| -rw-r--r-- | pages/tagged.php | 48 |
7 files changed, 11 insertions, 85 deletions
diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php index 0a2595c85..83ec3e988 100644 --- 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 eb87bc17c..c113c39e2 100644 --- 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 f070e8563..08f69603a 100644 --- 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 419576d8e..851804e99 100644 --- 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/pages/photos/album/view.php b/pages/photos/album/view.php index 100cc44c6..6e111ab98 100644 --- a/pages/photos/album/view.php +++ b/pages/photos/album/view.php @@ -42,6 +42,17 @@ if ($album->getContainerEntity()->canWriteToContainer()) { )); } +// only show sort button if there are images +if ($album->canEdit() && $album->getSize() > 0) { + elgg_register_menu_item('title', array( + 'name' => 'sort', + 'href' => "photos/sort/" . $album->getGUID(), + 'text' => elgg_echo('album:sort'), + 'link_class' => 'elgg-button elgg-button-action', + 'priority' => 200, + )); +} + $body = elgg_view_layout('content', array( 'filter' => false, 'content' => $content, diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php index fc4a01320..e30bed70a 100644 --- a/pages/photos/image/view.php +++ b/pages/photos/image/view.php @@ -19,11 +19,6 @@ if (!$photo) { $photo->addView(); -if (elgg_get_plugin_setting('tagging', 'tidypics')) { - elgg_load_js('tidypics:tagging'); - elgg_load_js('jquery.imgareaselect'); -} - // set page owner based on owner of photo album $album = $photo->getContainerEntity(); if ($album) { diff --git a/pages/tagged.php b/pages/tagged.php deleted file mode 100644 index 34ea8a709..000000000 --- a/pages/tagged.php +++ /dev/null @@ -1,48 +0,0 @@ -<?php -/** - * Tidypics Tagged Listing - * - * List all photos tagged with a user - */ - -include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"; - - -// Get user guid -$guid = get_input('guid'); - -$user = get_entity($guid); - -if ($user) { - $title = sprintf(elgg_echo('tidypics:usertag'), $user->name); -} else { - $title = "User does not exist"; -} - - -// create main column -$body = elgg_view_title($title); - -set_context('search'); -set_input('search_viewtype', 'gallery'); // need to force gallery view -$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image', 0, 10, false); - -// Set up submenus -if (isloggedin()) { - add_submenu_item( elgg_echo("album:yours"), - $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, - 'tidypics-b' ); -} -add_submenu_item( elgg_echo('album:all'), - $CONFIG->wwwroot . "pg/photos/world/", - 'tidypics-z'); -add_submenu_item( elgg_echo('tidypics:mostrecent'), - $CONFIG->wwwroot . 'pg/photos/mostrecent', - 'tidypics-z'); - - - -$body = elgg_view_layout('two_column_left_sidebar', '', $body); - - -page_draw($title, $body); |