profile feeds moved from top tabs

git-svn-id: http://code.elgg.org/elgg/trunk@5641 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/profile/views/default/profile/profile_contents/feeds.php b/mod/profile/views/default/profile/profile_contents/feeds.php
deleted file mode 100644 (file)
index fcc3560..0000000
--- a/mod/profile/views/default/profile/profile_contents/feeds.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php\r
-/**\r
- * Elgg profile feeds page\r
- */\r
-\r
-//$twitter_username = $vars['entity']->twitter;\r
-$page_owner = page_owner();\r
-$feeds = elgg_get_entities(array('types' => 'object', 'subtypes' => 'aggregator_feed_url', 'owner_guids' => $page_owner, 'count' => true));\r
-\r
-// if the twitter username is empty, then do not show\r
-?>\r
-<div id="profile_content">\r
-<?php\r
-if($feeds){\r
-       echo elgg_view('aggregator/profile',array('feeds'=>$feeds));\r
-}else{\r
-       echo "This user has not added any feeds.";\r
-}\r
-?>\r
-</div>
\ No newline at end of file

diff --git a/mod/profile/views/default/profile/profile_navigation.php b/mod/profile/views/default/profile/profile_navigation.php
index a08cd847ddfacb95b5ffc53512de7f6850ca69c8..e4627d37a1bfda0a25872b5ff06a77673386dbfc 100755 (executable)
--- a/mod/profile/views/default/profile/profile_navigation.php
+++ b/mod/profile/views/default/profile/profile_navigation.php
@@ -30,10 +30,6 @@ switch($section){
        case 'commentwall':
                $commentwall = 'class="selected"';
                break;
-       case 'feeds':
-               $feeds = 'class="selected"';
-               break;
-               
        case 'activity':
        default:
                $activity = 'class="selected"';
@@ -48,12 +44,6 @@ switch($section){
        <li <?php echo $friends; ?>><a href="<?php echo $url . 'friends'; ?>">Friends</a></li>
        <li <?php echo $commentwall; ?>><a href="<?php echo $url . 'commentwall'; ?>">Comment Wall</a></li>
        <?php
-               //check to see if the aggregator plugin is enabled
-               if(is_plugin_enabled('aggregator')){
-       ?>
-       <li <?php echo $feeds; ?>><a href="<?php echo $url . 'feeds'; ?>">Feeds</a></li>
-       <?php
-               }
                //check to see if the twitter username is set
                if($vars['entity']->twitter){
        ?>

diff --git a/mod/profile/views/default/profile/profile_ownerblock.php b/mod/profile/views/default/profile/profile_ownerblock.php
index 4a6622fc8129209ec6426ea8a2ac19f44ea9ea7a..eeffffe02d9edba9a9ec6434aa0b8efe8c1c5555 100755 (executable)
--- a/mod/profile/views/default/profile/profile_ownerblock.php
+++ b/mod/profile/views/default/profile/profile_ownerblock.php
@@ -71,27 +71,32 @@ if(isadminloggedin()){
 
 //check tools are enabled
 if(is_plugin_enabled('file')){
-       $file_link = "<li {$file_highlight}><a href=\"{$vars['url']}pg/file/{$username}\">Files</a></li>";
+       $file_link = "<li><a href=\"{$vars['url']}pg/file/{$username}\">Files</a></li>";
 }else{
        $file_link = "";
 }
 if(is_plugin_enabled('blog')){
-       $blog_link = "<li {$blog_highlight}><a href=\"{$vars['url']}pg/blog/{$username}\">Blog</a></li>";
+       $blog_link = "<li><a href=\"{$vars['url']}pg/blog/{$username}\">Blog</a></li>";
 }else{
        $blog_link = "";
 }
-if(is_plugin_enabled('video')){
-       $video_link = "<li {$video_highlight}><a href=\"{$vars['url']}pg/video/{$username}\">Videos</a></li>";
+if(is_plugin_enabled('videolist')){
+       $video_link = "<li><a href=\"{$vars['url']}pg/videolist/{$username}\">Videos</a></li>";
 }else{
        $video_link = "";
 }
+if(is_plugin_enabled('feeds')){
+       $feeds_link = "<li><a href=\"{$vars['url']}pg/feeds/{$username}\">Feeds</a></li>";
+}else{
+       $feeds_link = "";
+}
 if(is_plugin_enabled('pages')){
-       $pages_link = "<li {$pages_highlight}><a href=\"{$vars['url']}pg/pages/owned/{$username}\">Pages</a></li>";
+       $pages_link = "<li><a href=\"{$vars['url']}pg/pages/owned/{$username}\">Pages</a></li>";
 }else{
        $pages_link = "";
 }
 if(is_plugin_enabled('bookmarks')){
-       $bookmark_link = "<li {$bookmarks_highlight}><a href=\"{$vars['url']}pg/bookmarks/{$username}\">Bookmarks</a></li>";
+       $bookmark_link = "<li><a href=\"{$vars['url']}pg/bookmarks/{$username}\">Bookmarks</a></li>";
 }else{
        $bookmark_link = "";
 }
@@ -112,6 +117,7 @@ $display = <<<EOT
                {$file_link}
                {$blog_link}
                {$video_link}
+               {$feeds_link}
                {$bookmark_link}
                {$pages_link}
                </ul>